update nixpkgs + fixes

flake.lock

@@ -148,11 +148,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1749794982,
-        "narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=",
+        "lastModified": 1751792365,
+        "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81",
+        "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb",
         "type": "github"
       },
       "original": {

flake.nix

@@ -45,6 +45,7 @@
             ./host/solo
             ./host
             ./mod
+            ./mod-hm
             overlays
           ];
         };
@@ -58,6 +59,7 @@
             ./host/c2
             ./host
             ./mod
+            ./mod-hm
             overlays
           ];
         };

host/boot.nix

@@ -14,7 +14,7 @@
     # builds in /tmp but I think my swap is large enough...
     tmp.useTmpfs = true;
 
-    kernelPackages = pkgs.linuxPackages_6_13;
+    kernelPackages = pkgs.linuxPackages_6_12;
     kernel.sysctl."kernel.sysrq" = 1;
 
     initrd.systemd.network.wait-online.enable = false;

host/c2/default.nix

@@ -10,6 +10,7 @@
   ];
 
   boot.loader.efi.efiSysMountPoint = "/boot/efi";
+  boot.resumeDevice = "/dev/disk/by-label/nixswap";
 
   powerManagement = {
     enable = true;

host/roam/default.nix

@@ -5,7 +5,6 @@
   imports = [
     ./hardware-configuration.nix
     ./networking.nix
-    ./security.nix
     ./services.nix
   ];
 

mod-hm/default.nix

@@ -1,7 +1,30 @@
-{ ... }:
+# This is a NixOS module, not a home-manager module!
+{
+  lib,
+  inputs,
+  config,
+  options,
+  ...
+}:
 {
   imports = [
-    ./unison.nix
-    ./protonmail-bridge.nix
+    inputs.home-manager.nixosModules.home-manager
   ];
+
+  config = lib.mkIf config.desktop.enable {
+    home-manager.users."hd" = lib.mkAliasDefinitions options.home;
+    # install to /etc/profiles, not ~/.nix-profile
+    home-manager.useUserPackages = true;
+    # dont use home.nixpkgs
+    home-manager.useGlobalPkgs = true;
+
+    home = {
+      imports = [
+        ./unison.nix
+        ./protonmail-bridge.nix
+      ];
+
+      home.stateVersion = config.system.stateVersion;
+    };
+  };
 }

mod/desktop/default.nix

@@ -20,15 +20,6 @@ in
     ./software
     ./window-manager.nix
     inputs.nixos-config-hidden.nixosModules.pc
-    inputs.home-manager.nixosModules.home-manager
-    {
-      home-manager.users."hd" = lib.mkAliasDefinitions options.home;
-      # install to /etc/profiles, not ~/.nix-profile
-      home-manager.useUserPackages = true;
-      # dont use home.nixpkgs
-      home-manager.useGlobalPkgs = true;
-    }
-
   ];
 
   options = {
@@ -67,10 +58,5 @@ in
       ];
 
     programs.nix-ld.enable = true;
-
-    home = {
-      home.stateVersion = config.system.stateVersion;
-      imports = [ ../../mod-hm ];
-    };
   };
 }

mod/desktop/software/default.nix

@@ -26,7 +26,7 @@ in
       signal-desktop
       spotify
       tor-browser
-      vesktop
+      # vesktop
       vlc
       wireguard-tools
       zotero