Changes on atom

defaults.nix

@@ -82,7 +82,7 @@
     yubikey-manager
   ];
 
-  system.stateVersion = "19.09";
+  system.stateVersion = "20.03";
 
   system.autoUpgrade.enable = true;
 
@@ -92,7 +92,15 @@
   krb5.libdefaults.default_realm = "FUDO.ORG";
   krb5.kerberos = pkgs.heimdalFull;
 
-  console.keyMap = "dvp";
+  services.xserver = {
+    layout = "us";
+    xkbVariant = "dvp";
+    xkbOptions = "ctrl:nocaps";
+  };
+
+  console = {
+    useXkbConfig = true;
+  };
 
   i18n = {
     defaultLocale = "en_US.UTF-8";

fudo/profiles/common-ui.nix

@@ -4,8 +4,24 @@ with lib;
 let
   profile = config.fudo.common.profile;
 
-in mkIf ((profile == "desktop") || (profile == "laptop")) {
-  environment.systemPackages = with pkgs; [
+in {
+  options.fudo.ui = {
+    console-only = mkOption {
+      type = types.bool;
+      description = "Don't install X, only console stuff.";
+      default = false;
+    };
+  };
+
+  config = mkIf ((profile == "desktop") || (profile == "laptop")) {
+    environment.systemPackages = with pkgs;
+      [
+        libfixposix
+        python37Packages.youtube-dl
+        sqlite
+        virtmanager
+        xzgv
+      ] ++ (if (config.fudo.ui.console-only) then [] else [
         cool-retro-term
         corefonts
         chrome-gnome-shell
@@ -67,12 +83,13 @@ in mkIf ((profile == "desktop") || (profile == "laptop")) {
         xorg.xev
         xzgv
         virtmanager-qt
-  ];
+      ]);
 
     nixpkgs.config.allowBroken = true;
 
     # Splash screen
-  boot.plymouth.enable = true;
+    boot.plymouth.enable =
+      if (config.fudo.ui.console-only) then false else true;
 
     services.avahi = {
       enable = true;
@@ -82,8 +99,14 @@ in mkIf ((profile == "desktop") || (profile == "laptop")) {
 
     boot.tmpOnTmpfs = true;
 
-  services.xserver = {
-    # enable = true;
+    services.xserver = if (config.fudo.ui.console-only) then {
+      enable = false;
+
+      layout = "us";
+      xkbVariant = "dvp";
+      xkbOptions = "ctrl:nocaps";
+    } else {
+      enable = true;
 
       layout = "us";
       xkbVariant = "dvp";
@@ -104,7 +127,7 @@ in mkIf ((profile == "desktop") || (profile == "laptop")) {
       };
     };
 
-  services.gnome3 = {
+    services.gnome3 = mkIf (! config.fudo.ui.console-only) {
       evolution-data-server.enable = pkgs.lib.mkForce false;
       gnome-user-share.enable = pkgs.lib.mkForce false;
     };
@@ -119,7 +142,7 @@ in mkIf ((profile == "desktop") || (profile == "laptop")) {
 
     hardware.pulseaudio.enable = true;
 
-  fonts = {
+    fonts = mkIf (! config.fudo.ui.console-only) {
       enableFontDir = true;
       #fontconfig.antialias = true;
       fontconfig.enable = true;
@@ -182,4 +205,5 @@ in mkIf ((profile == "desktop") || (profile == "laptop")) {
         xlibs.fontxfree86type1
       ];
     };
+  };
 }

fudo/profiles/default.nix

@@ -2,6 +2,7 @@
 
 {
   imports = [
+    ./common-ui.nix
     ./desktop.nix
     ./laptop.nix
     ./server.nix

fudo/profiles/laptop.nix

@@ -1,15 +1,26 @@
 { config, lib, pkgs, ... }:
 
 with lib;
-mkIf (config.fudo.common.profile == "laptop") {
+
+{
+  options.fudo.laptop = {
+    use-network-manager = mkOption {
+      type = types.bool;
+      description = "Use NetworkManager instead of wpa_supplicant.";
+      default = false;
+    };
+  };
+  config = mkIf (config.fudo.common.profile == "laptop") {
     environment.systemPackages = with pkgs; [
       acpi
       upower
       wpa_supplicant
     ];
 
-  networking = {
-    # networkmanager.enable = true;
+    networking = if (config.fudo.laptop.use-network-manager) then {
+      networkmanager.enable = true;
+    } else {
+      networkmanager.enable = false;
       wireless = {
         enable = true;
         userControlled = {
@@ -20,6 +31,10 @@ mkIf (config.fudo.common.profile == "laptop") {
           "sea.fudo.org" = {
             psk = "DahHaocheiD5";
           };
+          "Pixel_9041" = {
+            psk = "ea72027e4e6";
+          };
+        };
       };
     };
   };

hosts/atom.nix

@@ -33,10 +33,8 @@ in {
     bash.enableCompletion = true;
   };
 
-  services.xserver = {
-    # videoDrivers = ["nvidia"];
-    # displayManager.gdm.wayland = false;
-  };
+  fudo.laptop.use-network-manager = false;
+  fudo.ui.console-only = true;
 
   hardware.opengl.driSupport32Bit = true;
   hardware.opengl.extraPackages32 = with pkgs.pkgsi686Linux; [ libva ];
@@ -45,5 +43,4 @@ in {
   hardware.pulseaudio.support32Bit = true;
 
   hardware.bluetooth.enable = true;
-
 }