diff --git a/homes/x86_64-linux/rafiq/default.nix b/homes/x86_64-linux/rafiq/default.nix
index 2fa0710..377a436 100644
--- a/homes/x86_64-linux/rafiq/default.nix
+++ b/homes/x86_64-linux/rafiq/default.nix
@@ -6,19 +6,15 @@
   cli.git.name = "Mohammad Rafiq";
   cli.git.email = "rafiq@rrv.sh";
   cli.git.defaultBranch = "prime";
- desktop.windowManager = "hyprland";
- desktop.browser = "firefox";
- desktop.terminal = "kitty";
+  desktop.windowManager = "hyprland";
+  desktop.browser = "firefox";
+  desktop.terminal = "kitty";
 
-  home.shellAliases.v = "nvim";
   home.shellAliases = {
+    v = "nvim";
     edit = "nvim $(fzf)";
   };
 
-  programs.zoxide.enable = true;
-  programs.nix-index.enable = true;
-  programs.nix-index-database.comma.enable = true;
-
   home.packages = with pkgs; [
     ripgrep
     fzf
@@ -26,13 +22,13 @@
     pantheon.rebuild
   ];
 
+  home.persistence."/persist/home/rafiq".directories = [
+	"repos" 
+	];
+
     programs.direnv = {
       enable = true;
       nix-direnv.enable = true;
     };
 
-  home.persistence."/persist/home/rafiq".directories = [
-	"repos" 
-        ".local/share/zoxide" 
-	];
 }
diff --git a/modules/home/cli/default.nix b/modules/home/cli/default.nix
index 0653214..86e9a4e 100644
--- a/modules/home/cli/default.nix
+++ b/modules/home/cli/default.nix
@@ -4,10 +4,21 @@
     shell = lib.pantheon.mkStrOption;
     editor = lib.pantheon.mkStrOption;
     file-browser = lib.pantheon.mkStrOption;
-git = {
-    name = lib.pantheon.mkStrOption;
-    email = lib.pantheon.mkStrOption;
-    defaultBranch = lib.pantheon.mkStrOption;
-  };
+    git = {
+      name = lib.pantheon.mkStrOption;
+      email = lib.pantheon.mkStrOption;
+      defaultBranch = lib.pantheon.mkStrOption;
+    };
   };
+
+  config = lib.mkMerge [
+    {
+      programs.zoxide.enable = true;
+      home.persistence."/persist/home/${config.snowfallorg.user.name}".directories = [ "./local/share/zoxide" ];
+    }
+    {
+      programs.nix-index.enable = true;
+      programs.nix-index-database.comma.enable = true;
+    }
+  ];
 }