added home-manager modules as an output in flake.nix, allowing for machine-specific home-manager configs

modules/default.nix

@@ -1,31 +0,0 @@
-{
-  inputs,
-  nixpkgs,
-  config,
-  self,
-  username,
-  host,
-  lib,
-  ...
-}: {
-  imports = [
-    ./sys/hardware
-    ./sys/software
-    ./sys/environment
-    ./home/home-manager.nix
-  ];
-
-  networkModule.enable = lib.mkDefault true;
-  nixSettings.enable = lib.mkDefault true;
-  bootLoader.enable = lib.mkDefault true;
-  issue.enable = lib.mkDefault true;
-  sddmOpts.enable = lib.mkDefault true;
-  stylixOpts.enable = lib.mkDefault true;
-  gamingPkgs.enable = lib.mkDefault true;
-  steamOpts.enable = lib.mkDefault true;
-  sysPkgs.enable = lib.mkDefault true;
-  sysProgs.enable = lib.mkDefault true;
-  sysServices.enable = lib.mkDefault true;
-  virtOpts.enable = lib.mkDefault true;
-  powerProfiles.enable = lib.mkDefault false;
-}

modules/home/home-manager.nix

@@ -1,57 +0,0 @@
-{
-  host,
-  pkgs,
-  self,
-  inputs,
-  username,
-  wallpaper,
-  scheme,
-  config,
-  ...
-}: let
-  nur = config.nur;
-  desktop = (host == "oganesson");
-in {
-  imports = [inputs.home-manager.nixosModules.home-manager];
-  home-manager = {
-    useUserPackages = true;
-    useGlobalPkgs = true;
-    backupFileExtension = "backup";
-    extraSpecialArgs = {inherit self inputs host wallpaper scheme username nur;};
-    users.${username} = {
-      dconf.settings = if desktop then {
-        "org/virt-manager/virt-manager/connections" = {
-          autoconnect = ["qemu:///system"];
-          uris = ["qemu:///system"];
-        };
-      } else {};
-      programs.home-manager.enable = true;
-      imports = [
-        inputs.spicetify-nix.homeManagerModules.default
-        ./hm-modules.nix
-      ];
-      home = {
-        username = "${username}";
-        homeDirectory = "/home/${username}";
-        stateVersion = "24.05";
-      };
-    };
-  };
-
-  users = {
-    groups.persist = {};
-    users = {
-      root.initialPassword = "1234";
-      ${username} = {
-        isNormalUser = true;
-        initialPassword = "1234";
-        shell = pkgs.zsh;
-        extraGroups = ["wheel" "persist" "libvirtd"];
-      };
-    };
-  };
-  security.sudo.extraConfig = ''
-    ${username} ALL=(ALL) NOPASSWD: /etc/profiles/per-user/${username}/bin/rebuild
-  '';
-  nix.settings.allowed-users = ["${username}"];
-}

modules/sys/default.nix

@@ -5,12 +5,26 @@
   self,
   username,
   host,
+  lib,
   ...
 }: {
   imports = [
     ./hardware
     ./software
     ./environment
-    ../home/home-manager.nix
   ];
+
+  networkModule.enable = lib.mkDefault true;
+  nixSettings.enable = lib.mkDefault true;
+  bootLoader.enable = lib.mkDefault true;
+  issue.enable = lib.mkDefault true;
+  sddmOpts.enable = lib.mkDefault true;
+  stylixOpts.enable = lib.mkDefault true;
+  gamingPkgs.enable = lib.mkDefault true;
+  steamOpts.enable = lib.mkDefault true;
+  sysPkgs.enable = lib.mkDefault true;
+  sysProgs.enable = lib.mkDefault true;
+  sysServices.enable = lib.mkDefault true;
+  virtOpts.enable = lib.mkDefault true;
+  powerProfiles.enable = lib.mkDefault false;
 }

modules/sys/environment/default.nix

@@ -11,5 +11,6 @@
   imports =
     [(import ./sddm.nix)]
     ++ [(import ./issue.nix)]
+    ++ [(import ./nix.nix)]
     ++ [(import ./stylix.nix)];
 }

modules/sys/hardware/powerprofiles.nix

@@ -49,3 +49,4 @@
       };
     };
   };
+}