Modularized user declarations in flake

flake.nix

@@ -1,5 +1,5 @@
 {
-  description = "Nix Flake Configurations for Bryan";
+  description = "My NixOS Configs";
 
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
@@ -30,11 +30,7 @@
       modules = [
         ./src/systems/desktop
         home-manager.nixosModules.home-manager
-        {
+          (import ./src/systems/desktop/home.nix)
-          home-manager.useGlobalPkgs = true;
-          home-manager.useUserPackages = true;
-          home-manager.users.bryan = import ./src/systems/desktop/home.nix;
-        }
       ];
     };
     nixosConfigurations.windows = nixpkgs.lib.nixosSystem {
@@ -42,27 +38,9 @@
       modules = [
         ./src/systems/wsl
         nixos-wsl.nixosModules.wsl
-        {
+          (import ./src/systems/wsl/wsl.nix)
-          wsl = {
-            enable = true;
-            defaultUser = nixpkgs.lib.mkDefault "bryan";
-            nativeSystemd = true;
-
-            wslConf = {
-              boot.command = "cd";
-              network = {
-                hostname = "plato";
-                generateHosts = true;
-              };
-            };
-          };
-        }
         home-manager.nixosModules.home-manager
-        {
+          (import ./src/systems/wsl/home.nix)
-          home-manager.useGlobalPkgs = true;
-          home-manager.useUserPackages = true;
-          home-manager.users.bryan = import ./src/systems/wsl/home.nix;
-        }
       ];
     };
   };

src/systems/desktop/home.nix

@@ -1,16 +1,19 @@
 { config, ... }:
 
 {
+  home-manager.useGlobalPkgs = true;
+  home-manager.useUserPackages = true;
+  home-manager.users.${config.user.name} = {
+    imports = [
+      ../../user
+      ../../modules
+    ];
+
     programs.home-manager.enable = true;
     programs.bash.shellAliases = {
       nixup = "sudo nixos-rebuild switch --flake /etc/nixos/.#desktop";
     };
 
-  imports = [
-    ../../modules 
-    ../../user 
-  ];
-
     home.stateVersion = "22.11";
 
     home.username = "${config.user.name}";
@@ -40,4 +43,5 @@
         writing.enable = true;
       };
     };
+  };
 }

src/systems/wsl/home.nix

@@ -1,6 +1,9 @@
 { config, ... }:
 
 {
+  home-manager.useGlobalPkgs = true;
+  home-manager.useUserPackages = true;
+  home-manager.users.${config.user.name} = {
     programs.home-manager.enable = true;
     programs.bash.shellAliases = {
       nixup = "sudo nixos-rebuild switch --flake /etc/nixos/.#windows";
@@ -30,4 +33,5 @@
         vim.enable = true;
       };
     };
+  };
 }

src/systems/wsl/wsl.nix

@@ -0,0 +1,21 @@
+{ pkgs, config, ... }:
+
+{
+  imports = [
+    ../../user
+  ];
+
+  wsl = {
+    enable = true;
+    defaultUser = pkgs.lib.mkDefault "${config.user.name}";
+    nativeSystemd = true;
+
+    wslConf = {
+      boot.command = "cd";
+      network = {
+        hostname = "plato";
+        generateHosts = true;
+      };
+    };
+  };
+}