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
-        {
-          home-manager.useGlobalPkgs = true;
-          home-manager.useUserPackages = true;
-          home-manager.users.bryan = import ./src/systems/desktop/home.nix;
-        }
+          (import ./src/systems/desktop/home.nix)
       ];
     };
     nixosConfigurations.windows = nixpkgs.lib.nixosSystem {
@@ -42,27 +38,9 @@
       modules = [
         ./src/systems/wsl
         nixos-wsl.nixosModules.wsl
-        {
-          wsl = {
-            enable = true;
-            defaultUser = nixpkgs.lib.mkDefault "bryan";
-            nativeSystemd = true;
-
-            wslConf = {
-              boot.command = "cd";
-              network = {
-                hostname = "plato";
-                generateHosts = true;
-              };
-            };
-          };
-        }
+          (import ./src/systems/wsl/wsl.nix)
         home-manager.nixosModules.home-manager
-        {
-          home-manager.useGlobalPkgs = true;
-          home-manager.useUserPackages = true;
-          home-manager.users.bryan = import ./src/systems/wsl/home.nix;
-        }
+          (import ./src/systems/wsl/home.nix)
       ];
     };
   };

src/systems/desktop/home.nix

@@ -1,43 +1,47 @@
 { config, ... }:
 
 {
-  programs.home-manager.enable = true;
-  programs.bash.shellAliases = {
-    nixup = "sudo nixos-rebuild switch --flake /etc/nixos/.#desktop";
-  };
+  home-manager.useGlobalPkgs = true;
+  home-manager.useUserPackages = true;
+  home-manager.users.${config.user.name} = {
+    imports = [
+      ../../user
+      ../../modules
+    ];
 
-  imports = [
-    ../../modules 
-    ../../user 
-  ];
-
-  home.stateVersion = "22.11";
-
-  home.username = "${config.user.name}";
-  home.homeDirectory = "/home/${config.user.name}";
-
-  modules = {
-    bash.enable = true;
-    git.enable = true;
-    gpg.enable = true;
-    security.enable = true;
-
-    utils = {
-      enable = true;
-      dev.enable = true;
-      irc.enable = true;
-      vim.enable = false;
+    programs.home-manager.enable = true;
+    programs.bash.shellAliases = {
+      nixup = "sudo nixos-rebuild switch --flake /etc/nixos/.#desktop";
     };
 
-    gui = {
-      enable = true;
-      alacritty.enable = true;
-      browsers.enable = true;
-      corn.enable = true;
-      fun.enable = true;
-      neovim.enable = true;
-      utils.enable = true;
-      writing.enable = true;
+    home.stateVersion = "22.11";
+
+    home.username = "${config.user.name}";
+    home.homeDirectory = "/home/${config.user.name}";
+
+    modules = {
+      bash.enable = true;
+      git.enable = true;
+      gpg.enable = true;
+      security.enable = true;
+
+      utils = {
+        enable = true;
+        dev.enable = true;
+        irc.enable = true;
+        vim.enable = false;
+      };
+
+      gui = {
+        enable = true;
+        alacritty.enable = true;
+        browsers.enable = true;
+        corn.enable = true;
+        fun.enable = true;
+        neovim.enable = true;
+        utils.enable = true;
+        writing.enable = true;
+      };
     };
   };
 }

src/systems/wsl/home.nix

@@ -1,33 +1,37 @@
 { config, ... }:
 
 {
-  programs.home-manager.enable = true;
-  programs.bash.shellAliases = {
-    nixup = "sudo nixos-rebuild switch --flake /etc/nixos/.#windows";
-  };
+  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";
+    };
 
-  imports = [
-    ../../modules
-    ../../user
-  ];
+    imports = [
+      ../../modules
+      ../../user
+    ];
 
-  home.stateVersion = "23.11";
+    home.stateVersion = "23.11";
 
-  home.username = "${config.user.name}";
-  home.homeDirectory = "/home/${config.user.name}";
+    home.username = "${config.user.name}";
+    home.homeDirectory = "/home/${config.user.name}";
 
-  modules = {
-    bash.enable = true;
-    git.enable = true;
-    gpg.enable = true;
-    gui.enable = false;
-    security.enable = true;
-    utils = {
-      enable = true;
-      dev.enable = true;
-      email.enable = true;
-      irc.enable = true;
-      vim.enable = true;
+    modules = {
+      bash.enable = true;
+      git.enable = true;
+      gpg.enable = true;
+      gui.enable = false;
+      security.enable = true;
+      utils = {
+        enable = true;
+        dev.enable = true;
+        email.enable = true;
+        irc.enable = true;
+        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;
+      };
+    };
+  };
+}