users: let user module handle home-manager init

modules/hosts/loptland/default.nix

@@ -19,9 +19,7 @@ topLevel: {
       # TODO: dunno why I need this packge
       environment.systemPackages = [ pkgs.dconf ];
 
-      imports =
+      imports = with topLevel.config.flake.modules.nixos; [
-        with topLevel.config.flake.modules.nixos;
-        [
         (modulesPath + "/profiles/qemu-guest.nix")
         inputs.catppuccin.nixosModules.catppuccin
 
@@ -41,22 +39,6 @@ topLevel: {
 
         # Users
         cholli
-        ]
-        ++ [
-          {
-            home-manager.users.cholli = {
-              imports = with topLevel.config.flake.modules.homeManager; [
-                inputs.catppuccin.homeModules.catppuccin
-
-                # components
-                base
-
-                # Activate all user based config
-                cholli
-              ];
-            };
-          }
-
       ];
 
       services.tailscale = {

modules/hosts/nixberry/default.nix

@@ -52,24 +52,6 @@ topLevel: {
           server
 
           cholli
-        ]
-        ++ [
-          {
-            home-manager.users.cholli = {
-              imports = with topLevel.config.flake.modules.homeManager; [
-                inputs.catppuccin.homeModules.catppuccin
-
-                # components
-                base
-
-                # Activate all user based config
-                cholli
-              ];
-
-              # https://github.com/NixOS/nixpkgs/pull/398456
-              home.enableNixpkgsReleaseCheck = false;
-            };
-          }
         ];
 
       services.tailscale = {

modules/hosts/wsl/default.nix

@@ -12,31 +12,14 @@ topLevel: {
       };
       programs.dconf.enable = true;
 
-      imports =
+      imports = with topLevel.config.flake.modules.nixos; [
-        with topLevel.config.flake.modules.nixos;
-        [
         inputs.nixos-wsl.nixosModules.default
 
         base
         server
         cholli
-        ]
-
-        ++ [
-          {
-            home-manager.users.cholli = {
-              imports = with topLevel.config.flake.modules.homeManager; [
-                inputs.catppuccin.homeModules.catppuccin
-
-                # components
-                base
-
-                # Activate all user based config
-                cholli
-              ];
-            };
-          }
       ];
+
       wsl = {
         enable = true;
         defaultUser = topLevel.config.flake.meta.users.cholli.username;

modules/hosts/yggdrasil/default.nix

@@ -31,7 +31,6 @@ in
 
         termscp
         nixpkgs-review
-        # inputs.nix-gaming.packages.${pkgs.stdenv.hostPlatform.system}.star-citizen
       ];
 
       services.teamviewer.enable = true;
@@ -41,9 +40,7 @@ in
         AddressFamily inet
       '';
 
-      imports =
+      imports = with config.flake.modules.nixos; [
-        with config.flake.modules.nixos;
-        [
         inputs.nixos-hardware.nixosModules.common-cpu-amd
         inputs.nixos-hardware.nixosModules.common-pc
         inputs.nixos-hardware.nixosModules.common-pc-ssd
@@ -69,23 +66,7 @@ in
 
         # Users
         cholli
-        ]
+        root
-        ++ [
-          {
-            home-manager.users.cholli = {
-              imports = with config.flake.modules.homeManager; [
-                inputs.catppuccin.homeModules.catppuccin
-
-                # components
-                base
-                dev
-
-                # Activate all user based config
-                cholli
-              ];
-            };
-          }
-
       ];
 
       nix = {

modules/users/cholli/default.nix

@@ -18,8 +18,30 @@ topLevel: {
 
     modules = {
       nixos.cholli =
-        { config, pkgs, ... }:
         {
+          config,
+          inputs,
+          pkgs,
+          ...
+        }:
+        {
+          imports = [
+            {
+              home-manager.users.cholli = {
+                imports = with topLevel.config.flake.modules.homeManager; [
+                  inputs.catppuccin.homeModules.catppuccin
+
+                  # components
+                  base
+                  dev
+
+                  # Activate all user based config
+                  cholli
+                ];
+              };
+            }
+          ];
+
           programs.fish.enable = true;
           sops.secrets.passwordHash.neededForUsers = true;
 

modules/users/root/default.nix

@@ -1,8 +1,28 @@
 topLevel: {
   flake = {
     modules.nixos.root =
-      { config, pkgs, ... }:
       {
+        config,
+        inputs,
+        pkgs,
+        ...
+      }:
+      {
+        imports = [
+          {
+            home-manager.users.root = {
+              imports = with topLevel.config.flake.modules.homeManager; [
+                inputs.catppuccin.homeModules.catppuccin
+
+                # components
+                base
+
+                # Activate all user based config
+                cholli # TODO: make root based config that makes it clear I am root user right now
+              ];
+            };
+          }
+        ];
         programs.fish.enable = true;
         sops.secrets.passwordHash.neededForUsers = true;