diff --git a/modules/server/home/default.nix b/modules/server/home/default.nix
index 1c877a2..a35a03a 100644
--- a/modules/server/home/default.nix
+++ b/modules/server/home/default.nix
@@ -1,18 +1,24 @@
 { ... }: {
-  imports = [
-    ../../system/home/direnv
-    ../../system/home/editor
-    ../../system/home/git
-    ../../system/home/shell
-    ./server-utils
-  ];
+  home-manager = {
+    useGlobalPkgs = true;
+    useUserPackages = true;
+    users.twoneis = {
+      imports = [
+        ../../system/home/direnv
+        ../../system/home/editor
+        ../../system/home/git
+        ../../system/home/shell
+        ./server-utils
+      ];
 
-  home = {
-    username = "twoneis";
-    homeDirectory = "/home/twoneis";
+      home = {
+        username = "twoneis";
+        homeDirectory = "/home/twoneis";
 
-    stateVersion = "22.11";
+        stateVersion = "22.11";
+      };
+
+      programs.home-manager.enable = true;
+    };
   };
-
-  programs.home-manager.enable = true;
 }
diff --git a/modules/system/default.nix b/modules/system/default.nix
index 9edc202..d97ee30 100644
--- a/modules/system/default.nix
+++ b/modules/system/default.nix
@@ -14,6 +14,11 @@
     ./virt.nix
   ];
 
+  # Overlays for nixpkgs
+  nixpkgs.overlays = [
+    inputs.nur.overlay
+  ];
+
   # Needed for some nautilus features like auto-mount and trash
   services.gvfs.enable = true;
 
diff --git a/modules/system/home/default.nix b/modules/system/home/default.nix
index ca4f7a6..e4050d0 100644
--- a/modules/system/home/default.nix
+++ b/modules/system/home/default.nix
@@ -1,38 +1,44 @@
 { ... }: {
-  imports = [
-    ./art
-    ./browser
-    ./chat
-    ./cursor
-    ./discord
-    ./direnv
-    ./editor
-    ./email
-    ./gdb
-    ./git
-    ./media
-    ./niri-setup
-    ./notes
-    ./shell
-    ./terminal
-    ./themes
-    ./utils
-  ];
+  home-manager = {
+    useGlobalPkgs = true;
+    useUserPackages = true;
+    users.twoneis = {
+      imports = [
+        ./art
+        ./browser
+        ./chat
+        ./cursor
+        ./discord
+        ./direnv
+        ./editor
+        ./email
+        ./gdb
+        ./git
+        ./media
+        ./niri-setup
+        ./notes
+        ./shell
+        ./terminal
+        ./themes
+        ./utils
+      ];
 
-  home = {
-    username = "twoneis";
-    homeDirectory = "/home/twoneis";
+      home = {
+        username = "twoneis";
+        homeDirectory = "/home/twoneis";
 
-    stateVersion = "22.11";
-  };
+        stateVersion = "22.11";
+      };
 
-  programs.home-manager.enable = true;
+      programs.home-manager.enable = true;
 
-  dconf = {
-    enable = true;
-    settings = {
-      "org/gnome/desktop/interface" = {
-        color-scheme = "prefer-dark";
+      dconf = {
+        enable = true;
+        settings = {
+          "org/gnome/desktop/interface" = {
+            color-scheme = "prefer-dark";
+          };
+        };
       };
     };
   };
diff --git a/modules/system/persist/default.nix b/modules/system/persist/default.nix
index af0e317..fbab874 100644
--- a/modules/system/persist/default.nix
+++ b/modules/system/persist/default.nix
@@ -3,5 +3,6 @@
   users.users.twoneis.initialHashedPassword = "$y$j9T$0pmWE8A2JWcr2BDqqZ2u./$Km7K1hml9Gy0fc9DzBsDTvpyCKZ9DW0GOkD.lDcyYw0";
   users.users.root.initialHashedPassword = "$y$j9T$U8fvYSDoZxqVrkjlZM2Db.$qvkT9GIbVJ23EtB7KcqyI8u7RKJ99pYSXNu8IhVcDx9";
   environment.persistence."/persist" = {
+    
   };
 }
diff --git a/outputs.nix b/outputs.nix
index 4cca5e6..f028f6a 100644
--- a/outputs.nix
+++ b/outputs.nix
@@ -10,18 +10,12 @@
       modules = [
         ./devices/ellaca
         ./modules/system
+        ./modules/system/home
         ./modules/system/persist
         ./options.nix
         niri.nixosModules.niri
         impermanence.nixosModules.impermanence
-        home-manager.nixosModules.home-manager {
-          nixpkgs.overlays = [ nur.overlay ];
-          home-manager = {
-            useGlobalPkgs = true;
-            useUserPackages = true;
-            users.twoneis = import ./modules/system/home;
-          };
-        }
+        home-manager.nixosModules.home-manager
       ];
     };
 
@@ -34,17 +28,11 @@
       modules = [
         ./devices/akarso
         ./modules/system
+        ./modules/system/home
         ./options.nix
         nixos-hardware.nixosModules.microsoft-surface-pro-intel
         niri.nixosModules.niri
-        home-manager.nixosModules.home-manager {
-          nixpkgs.overlays = [ nur.overlay ];
-          home-manager = {
-            useGlobalPkgs = true;
-            useUserPackages = true;
-            users.twoneis = import ./modules/system/home;
-          };
-        }
+        home-manager.nixosModules.home-manager
       ];
     };
 
@@ -58,14 +46,7 @@
       modules = [
         ./devices/creosote
         ./modules/server
-        ./options.nix
-        home-manager.nixosModules.home-manager {
-          home-manager = {
-            useGlobalPkgs = true;
-            useUserPackages = true;
-            users.twoneis = import ./modules/server/home;
-          };
-        }
+        home-manager.nixosModules.home-manager
       ];
     };
   };