diff --git a/modules/hosts/loptland/default.nix b/modules/hosts/loptland/default.nix
index 43d7925..ad486d9 100644
--- a/modules/hosts/loptland/default.nix
+++ b/modules/hosts/loptland/default.nix
@@ -19,45 +19,27 @@ topLevel: {
       # TODO: dunno why I need this packge
       environment.systemPackages = [ pkgs.dconf ];
 
-      imports =
-        with topLevel.config.flake.modules.nixos;
-        [
-          (modulesPath + "/profiles/qemu-guest.nix")
-          inputs.catppuccin.nixosModules.catppuccin
+      imports = with topLevel.config.flake.modules.nixos; [
+        (modulesPath + "/profiles/qemu-guest.nix")
+        inputs.catppuccin.nixosModules.catppuccin
 
-          # System modules
-          base
-          server
-          loptland-acme
-          hydra
-          forgejo
-          forgejo-runner
+        # System modules
+        base
+        server
+        loptland-acme
+        hydra
+        forgejo
+        forgejo-runner
 
-          # game server
-          minecraft-server
-          factorio-server
+        # game server
+        minecraft-server
+        factorio-server
 
-          # apps
+        # apps
 
-          # 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
-              ];
-            };
-          }
-
-        ];
+        # Users
+        cholli
+      ];
 
       services.tailscale = {
         enable = true;
diff --git a/modules/hosts/nixberry/default.nix b/modules/hosts/nixberry/default.nix
index c9a9f1c..7ff21d0 100644
--- a/modules/hosts/nixberry/default.nix
+++ b/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 = {
diff --git a/modules/hosts/wsl/default.nix b/modules/hosts/wsl/default.nix
index add96d7..5437cca 100644
--- a/modules/hosts/wsl/default.nix
+++ b/modules/hosts/wsl/default.nix
@@ -12,31 +12,14 @@ topLevel: {
       };
       programs.dconf.enable = true;
 
-      imports =
-        with topLevel.config.flake.modules.nixos;
-        [
-          inputs.nixos-wsl.nixosModules.default
+      imports = with topLevel.config.flake.modules.nixos; [
+        inputs.nixos-wsl.nixosModules.default
 
-          base
-          server
-          cholli
-        ]
+        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;
diff --git a/modules/hosts/yggdrasil/default.nix b/modules/hosts/yggdrasil/default.nix
index aa26ff0..50d0534 100644
--- a/modules/hosts/yggdrasil/default.nix
+++ b/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,52 +40,34 @@ in
         AddressFamily inet
       '';
 
-      imports =
-        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
-          inputs.catppuccin.nixosModules.catppuccin
+      imports = 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
+        inputs.catppuccin.nixosModules.catppuccin
 
-          # System modules
-          base
-          dev
-          desktop
-          games
+        # System modules
+        base
+        dev
+        desktop
+        games
 
-          # hardware
-          audio
-          bluetooth
-          amdgpu
+        # hardware
+        audio
+        bluetooth
+        amdgpu
 
-          # desktops
-          # hyprland
-          niri
+        # desktops
+        # hyprland
+        niri
 
-          # apps
-          _1password
+        # apps
+        _1password
 
-          # Users
-          cholli
-        ]
-        ++ [
-          {
-            home-manager.users.cholli = {
-              imports = with config.flake.modules.homeManager; [
-                inputs.catppuccin.homeModules.catppuccin
-
-                # components
-                base
-                dev
-
-                # Activate all user based config
-                cholli
-              ];
-            };
-          }
-
-        ];
+        # Users
+        cholli
+        root
+      ];
 
       nix = {
         distributedBuilds = true;
diff --git a/modules/users/cholli/default.nix b/modules/users/cholli/default.nix
index 0e01d63..a398e7f 100644
--- a/modules/users/cholli/default.nix
+++ b/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;
 
diff --git a/modules/users/root/default.nix b/modules/users/root/default.nix
index d092718..ac236de 100644
--- a/modules/users/root/default.nix
+++ b/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;