diff --git a/home/configs/ivand/default.nix b/home/configs/ivand/default.nix
index b1fdb66..5764966 100644
--- a/home/configs/ivand/default.nix
+++ b/home/configs/ivand/default.nix
@@ -8,9 +8,6 @@ toplevel@{ inputs, withSystem, config, ... }:
           mods = config.flake.homeManagerModules;
         in
         [
-          {
-            home.stateVersion = config.flake.stateVersion;
-          }
           inputs.nid.hmModules.nix-index
           inputs.catppuccin.homeManagerModules.catppuccin
           mods.all
diff --git a/home/modules/packages/default.nix b/home/modules/packages/default.nix
index 816d0b0..1b638ce 100644
--- a/home/modules/packages/default.nix
+++ b/home/modules/packages/default.nix
@@ -1,5 +1,5 @@
-{ moduleWithSystem, ... }: {
-  flake.homeManagerModules = {
+{ moduleWithSystem, config, inputs, ... }: {
+  flake.homeManagerModules = rec {
     dev = moduleWithSystem (
       top@{ ... }:
       perSystem@{ pkgs, ... }: {
@@ -34,23 +34,20 @@
         ];
       }
     );
-    all = moduleWithSystem
+    general = moduleWithSystem
       (
         top@{ ... }:
         perSystem@{ pkgs, ... }:
         rec {
           imports = [ ../programs ];
           programs.home-manager.enable = true;
-          catppuccin = {
-            enable = true;
-            flavor = "mocha";
-          };
 
           gtk = {
             enable = true;
           };
 
           home = rec {
+            stateVersion = config.flake.stateVersion;
             username = "ivand";
             homeDirectory = "/home/ivand";
             sessionPath = [
@@ -120,6 +117,7 @@
 
           xdg = {
             enable = true;
+            cacheHome = "${home.homeDirectory}/.cache";
             userDirs = {
               enable = true;
               createDirectories = true;
@@ -187,5 +185,28 @@
         ];
       }
     );
+    ivand-nixos-home = moduleWithSystem (
+      top@{ ... }:
+      perSystem@{ ... }:
+      let
+        home-manager = inputs.home-manager.nixosModules.home-manager;
+      in
+      {
+        imports = [ home-manager ];
+        home-manager = {
+          useUserPackages = true;
+          useGlobalPkgs = true;
+        };
+        home-manager.users.ivand = {
+          imports = [
+            general
+            dev
+            essential
+            random
+            reminders
+          ];
+        };
+      }
+    );
   };
 }
diff --git a/home/modules/programs/bat/default.nix b/home/modules/programs/bat/default.nix
index e772849..4cb0b03 100644
--- a/home/modules/programs/bat/default.nix
+++ b/home/modules/programs/bat/default.nix
@@ -1,6 +1,5 @@
 {
   programs.bat = {
     enable = true;
-    catppuccin.enable = true;
   };
 }
diff --git a/home/modules/programs/bottom/default.nix b/home/modules/programs/bottom/default.nix
index 7bdab0b..2887531 100644
--- a/home/modules/programs/bottom/default.nix
+++ b/home/modules/programs/bottom/default.nix
@@ -1,7 +1,6 @@
 {
   programs.bottom = {
     enable = true;
-    catppuccin.enable = true;
     settings = {
       flags = {
         rate = "250ms";
diff --git a/home/modules/programs/comma/default.nix b/home/modules/programs/comma/default.nix
index 90945bb..86bca66 100644
--- a/home/modules/programs/comma/default.nix
+++ b/home/modules/programs/comma/default.nix
@@ -1,6 +1,6 @@
 {
   programs = {
-    nix-index-database.comma.enable = true;
-    nix-index.enable = true;
+    # nix-index-database.comma.enable = true;
+    # nix-index.enable = true;
   };
 }
diff --git a/home/modules/programs/imv/default.nix b/home/modules/programs/imv/default.nix
index 8225e13..6dbd9a9 100644
--- a/home/modules/programs/imv/default.nix
+++ b/home/modules/programs/imv/default.nix
@@ -1,6 +1,5 @@
 {
   programs.imv = {
     enable = true;
-    catppuccin.enable = true;
   };
 }
diff --git a/home/modules/programs/kitty/default.nix b/home/modules/programs/kitty/default.nix
index 2fe0228..22cf7a1 100644
--- a/home/modules/programs/kitty/default.nix
+++ b/home/modules/programs/kitty/default.nix
@@ -1,7 +1,6 @@
 { pkgs, ... }: {
   programs.kitty = {
     enable = true;
-    catppuccin.enable = true;
     font = {
       package = pkgs.fira-code;
       name = "FiraCodeNFM-Reg";
diff --git a/home/modules/programs/mako/default.nix b/home/modules/programs/mako/default.nix
index e330d30..880838e 100644
--- a/home/modules/programs/mako/default.nix
+++ b/home/modules/programs/mako/default.nix
@@ -1,6 +1,5 @@
 {
   services.mako = {
     enable = true;
-    catppuccin.enable = true;
   };
 }
diff --git a/home/modules/programs/mpv/default.nix b/home/modules/programs/mpv/default.nix
index a526ba2..8c80492 100644
--- a/home/modules/programs/mpv/default.nix
+++ b/home/modules/programs/mpv/default.nix
@@ -1,6 +1,5 @@
 {
   programs.mpv = {
     enable = true;
-    catppuccin.enable = true;
   };
 }
diff --git a/home/modules/programs/rofi/default.nix b/home/modules/programs/rofi/default.nix
index 89b8465..1aaef71 100644
--- a/home/modules/programs/rofi/default.nix
+++ b/home/modules/programs/rofi/default.nix
@@ -1,7 +1,6 @@
 { pkgs, ... }: {
   programs.rofi = {
     enable = true;
-    catppuccin.enable = true;
     package = pkgs.rofi-wayland.override {
       plugins = with pkgs; [
         (
diff --git a/home/modules/programs/starship/default.nix b/home/modules/programs/starship/default.nix
index 13c9ee4..6a6b942 100644
--- a/home/modules/programs/starship/default.nix
+++ b/home/modules/programs/starship/default.nix
@@ -1,7 +1,6 @@
 {
   programs.starship = {
     enable = true;
-    catppuccin.enable = true;
     enableNushellIntegration = true;
     enableZshIntegration = true;
   };
diff --git a/home/modules/programs/sway/default.nix b/home/modules/programs/sway/default.nix
index 9a6cc8a..2a1fd04 100644
--- a/home/modules/programs/sway/default.nix
+++ b/home/modules/programs/sway/default.nix
@@ -1,7 +1,6 @@
-{ pkgs, ... }: {
+perSystem@{ pkgs, ... }: {
   wayland.windowManager.sway = {
     enable = true;
-    catppuccin.enable = true;
     systemd.enable = true;
     config = rec {
       menu = "rofi -show run";
diff --git a/home/modules/programs/swaylock/default.nix b/home/modules/programs/swaylock/default.nix
index 44a71c4..841dae2 100644
--- a/home/modules/programs/swaylock/default.nix
+++ b/home/modules/programs/swaylock/default.nix
@@ -1,7 +1,6 @@
 { config, ... }: {
   programs.swaylock = {
     enable = true;
-    catppuccin.enable = true;
     settings = {
       show-failed-attempts = true;
       image = config.home.homeDirectory + "/pic/bg.png";
diff --git a/home/modules/programs/waybar/default.nix b/home/modules/programs/waybar/default.nix
index 564d011..cd03b55 100644
--- a/home/modules/programs/waybar/default.nix
+++ b/home/modules/programs/waybar/default.nix
@@ -1,7 +1,6 @@
 {
   programs.waybar = {
     enable = true;
-    catppuccin.enable = true;
     settings = {
       mainBar =
         let
diff --git a/nixos/modules/default.nix b/nixos/modules/default.nix
index 589fc96..0293ded 100644
--- a/nixos/modules/default.nix
+++ b/nixos/modules/default.nix
@@ -191,31 +191,36 @@ top@{ moduleWithSystem, ... }: {
         };
       };
     };
-    ivand = moduleWithSystem (toplevel@{ ... }: perSystem@{ pkgs, ... }: {
-      users = {
-        defaultUserShell = pkgs.zsh;
+    ivand = moduleWithSystem (toplevel@{ ... }: perSystem@{ pkgs, ... }:
+      let
+        mods = top.config.flake.homeManagerModules;
+      in
+      {
+        imports = [ mods.ivand-nixos-home ];
         users = {
-          ivand = {
-            isNormalUser = true;
-            createHome = true;
-            extraGroups = [
-              "adbusers"
-              "adm"
-              "audio"
-              "bluetooth"
-              "dialout"
-              "flatpak"
-              "kvm"
-              "mlocate"
-              "render"
-              "video"
-              "wheel"
-            ];
+          defaultUserShell = pkgs.zsh;
+          users = {
+            ivand = {
+              isNormalUser = true;
+              createHome = true;
+              extraGroups = [
+                "adbusers"
+                "adm"
+                "audio"
+                "bluetooth"
+                "dialout"
+                "flatpak"
+                "kvm"
+                "mlocate"
+                "render"
+                "video"
+                "wheel"
+              ];
+            };
           };
+          extraGroups = { mlocate = { }; };
         };
-        extraGroups = { mlocate = { }; };
-      };
-    });
+      });
     testUser = moduleWithSystem (toplevel@{ ... }: perSystem@{ pkgs, ... }: {
       users = {
         defaultUserShell = pkgs.zsh;