Merge pull request #41 from DoomHammer/move-system-manager

chore: Move system-manager to its own subdir

Author: DoomHammer

.config/nix/flake.nix

@@ -151,18 +151,8 @@
         };
         # nix run 'github:numtide/system-manager' --accept-flake-config -- switch --flake ~/.config/nix --sudo
         systemConfigs = {
-          "precision" = inputs.system-manager.lib.makeSystemConfig {
-            modules = [
-              inputs.nix-apt.systemManagerModules.default
-              ./system-manager/default.nix
-            ];
-            extraSpecialArgs = {
-              inherit
-                inputs
-                outputs
-                stateVersion
-                ;
-            };
+          "precision" = helper.mkSysMan {
+            hostname = "precision";
           };
         };
         # Custom packages and modifications, exported as overlays

.config/nix/parts/lib/helpers.nix

@@ -118,6 +118,38 @@
       ];
     };
 
+  mkSysMan =
+    {
+      hostname,
+      username ? "doomhammer",
+      desktop ? null,
+      platform ? "x86_64-linux",
+    }:
+    let
+      isISO = false;
+      isInstall = true;
+      isLima = false;
+      isWorkstation = true;
+    in
+    inputs.system-manager.lib.makeSystemConfig {
+      specialArgs = {
+        inherit
+          inputs
+          outputs
+          desktop
+          hostname
+          platform
+          username
+          stateVersion
+          isInstall
+          isLima
+          isISO
+          isWorkstation
+          ;
+      };
+      modules = [ ../../systems/linux ];
+    };
+
   forAllSystems = inputs.nixpkgs.lib.genAttrs [
     "aarch64-linux"
     "x86_64-linux"

.config/nix/system-manager/default.nix .config/nix/systems/linux/default.nix.config/nix/system-manager/default.nix renamed to .config/nix/systems/linux/default.nix

@@ -1,8 +1,16 @@
 {
   inputs,
+  pkgs,
+  username,
+  hostname,
   ...
 }:
 {
+  imports = [
+    inputs.nix-apt.systemManagerModules.default
+
+    ./${hostname}
+  ];
   config = {
     nixpkgs.hostPlatform = "x86_64-linux";
 
@@ -40,5 +48,12 @@
         "openssh-server"
       ];
     };
+
+    users.users.${username} = {
+      isNormalUser = true;
+      shell = pkgs.zsh;
+      ignoreShellProgramCheck = true;
+    };
+
   };
 }

.config/nix/systems/linux/precision/default.nix

@@ -0,0 +1 @@
+_: { }