cleanup

flake.nix

@@ -31,7 +31,7 @@
       nixpkgs,
     }@inputs:
     let
-      lib = nixpkgs.lib;
+      inherit (nixpkgs) lib;
       lib' = import ./lib.nix { inherit lib; };
 
       specialArgs = rec {

home/default.nix

@@ -12,11 +12,13 @@
   ];
 
   config = lib.mkIf config.hd.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-manager = {
+      users."hd" = lib.mkAliasDefinitions options.home;
+      # install to /etc/profiles, not ~/.nix-profile
+      useUserPackages = true;
+      # dont use home.nixpkgs
+      useGlobalPkgs = true;
+    };
 
     home = {
       imports = [

host/solo/default.nix

@@ -1,6 +1,15 @@
 { ... }:
 {
-  networking.hostName = "solo";
+  networking = {
+    hostName = "solo";
+
+    useDHCP = false;
+    interfaces.enp4s0.useDHCP = true;
+
+    firewall = {
+      enable = true;
+    };
+  };
 
   age.identityPaths = [
     "/root/.ssh/id_ed25519"
@@ -19,13 +28,6 @@
 
   hd.desktop.enable = true;
 
-  networking.useDHCP = false;
-  networking.interfaces.enp4s0.useDHCP = true;
-
-  networking.firewall = {
-    enable = true;
-  };
-
   # ====== DON'T CHANGE ======
   system.stateVersion = "25.05";
 }

secrets.nix

@@ -1,7 +1,7 @@
 let
   keys =
     let
-      k = (import ./var/ssh-keys.nix { });
+      k = import ./var/ssh-keys.nix { };
     in
     k.root; # ++ k.hd;
   secrets = [