Get Biz.Dev setup again

Also correctly renamed the files (didn't work the first time thanks to
the macOS filesystem) and moved the default build.os settings to a
OsBase.nix file to be used via imports.

3 files changed, 83 insertions, 46 deletions

diff --git a/Biz/Dev/configuration.nix b/Biz/Dev/Configuration.nix
index 6664163..70c2d36 100644
--- a/Biz/Dev/configuration.nix
+++ b/Biz/Dev/Configuration.nix
@@ -5,6 +5,7 @@ let
   torrents = { from = 6000; to = 6999; };
 in {
   networking = {
+    hostName = "lithium";
     hosts = {
       "::1" = [ "localhost" "ipv6-localhost" "ipv6-loopback" ];
     };
@@ -29,6 +30,24 @@ in {
       checkReversePath = false;
     };
 
+    # The global useDHCP flag is deprecated, therefore explicitly set to false here.
+    # Per-interface useDHCP will be mandatory in the future, so this generated config
+    # replicates the default behaviour.
+    useDHCP = false;
+    interfaces.enp1s0.useDHCP = true;
+    interfaces.wlp0s20f0u4.useDHCP = true;
+
+    wireless.enable = true;  # Enables wireless support via wpa_supplicant.
+    wireless.interfaces = [ "wlp0s20f0u4" ];
+    wireless.networks = {
+      Simanet = {
+        psk = "1123581321";
+      };
+      Simanet-5g = {
+        psk = "1123581321";
+        priority = 1;
+      };
+    };
   };
 
   # Use the systemd-boot EFI boot loader.
@@ -36,13 +55,6 @@ in {
   boot.loader.efi.canTouchEfiVariables = true;
   boot.enableContainers = true;
 
-  boot.initrd.luks.devices = {
-    root = {
-      device = "/dev/disk/by-uuid/a0160f25-e0e3-4af0-8236-3e298eac957a";
-      preLVM = true;
-    };
-  };
-
   powerManagement.enable = false;
 
   time.timeZone = "America/Los_Angeles";
@@ -52,7 +64,10 @@ in {
     fira fira-code fira-code-symbols
   ];
 
-  environment.systemPackages = [ pkgs.wemux pkgs.tmux ];
+  environment.systemPackages = [
+    #pkgs.wemux
+    pkgs.tmux
+  ];
 
   nixpkgs = {
     config = {
@@ -124,14 +139,34 @@ in {
 
     xserver = {
       enable = true;
+      autorun = true;
       layout = "us";
       xkbOptions = "caps:ctrl_modifier";
-      displayManager.sddm.enable = true;
+      displayManager = {
+        sddm = {
+          enable = true;
+          enableHidpi = true;
+        };
+        #startx.enable = true;
+        session = [
+          {
+            manage = "desktop";
+            name = "home-manager";
+            start = ''
+              ${pkgs.runtimeShell} $HOME/.hm-xsession &
+              waitPID=$!
+            '';
+          }
+        ];
+      };
       desktopManager = {
-        kodi.enable = true;
-        plasma5.enable = true;
+        #kodi.enable = false;
+        #plasma5.enable = false;
         xterm.enable = true;
       };
+      windowManager = {
+        xmonad.enable = true;
+      };
     };
 
     jupyter = {
@@ -209,5 +244,5 @@ in {
   # compatible, in order to avoid breaking some software such as database
   # servers. You should change this only after NixOS release notes say you
   # should.
-  system.stateVersion = "17.09"; # Did you read the comment?
+  system.stateVersion = "20.09"; # Did you read the comment?
 }
diff --git a/Biz/Dev/Hardware.nix b/Biz/Dev/Hardware.nix
new file mode 100644
index 0000000..7f87f74
--- /dev/null
+++ b/Biz/Dev/Hardware.nix
@@ -0,0 +1,36 @@
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{ config, lib, pkgs, modulesPath, ... }:
+
+{
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
+
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/f08dd8f9-787c-4e2a-a0cc-7019edc2ce2b";
+      fsType = "ext4";
+    };
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/C67C-D7B5";
+      fsType = "vfat";
+    };
+
+  #fileSystems."/mnt/lake" =
+  #  { device = "/dev/disk/by-uuid/037df3ae-4609-402c-ab1d-4593190d0ee7";
+  #    fsType = "ext4";
+  #  };
+
+  swapDevices = [ ];
+
+  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
+
+  # high-resolution display
+  hardware.video.hidpi.enable = lib.mkDefault true;
+}
diff --git a/Biz/Dev/hardware.nix b/Biz/Dev/hardware.nix
deleted file mode 100644
index fc0e7a0..0000000
--- a/Biz/Dev/hardware.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, ... }:
-
-{
-  imports =
-    [ <nixpkgs/nixos/modules/installer/scan/not-detected.nix>
-    ];
-
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "sd_mod" ];
-  boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [ ];
-
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/0d8b0e52-10de-4af2-bcd9-b36278352e77";
-      fsType = "ext4";
-    };
-
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/9B89-85C7";
-      fsType = "vfat";
-    };
-
-  fileSystems."/mnt/lake" =
-    { device = "/dev/disk/by-uuid/037df3ae-4609-402c-ab1d-4593190d0ee7";
-      fsType = "ext4";
-    };
-
-  swapDevices = [ ];
-
-  nix.maxJobs = lib.mkDefault 4;
-  powerManagement.cpuFreqGovernor = "powersave";
-}