diff --git a/modules/home/caem/core/zsh/default.nix b/modules/home/caem/core/zsh/default.nix
index ea4f6d4..b145b3c 100644
--- a/modules/home/caem/core/zsh/default.nix
+++ b/modules/home/caem/core/zsh/default.nix
@@ -7,13 +7,10 @@
     fd
     ripgrep
     fzf
-    tmux
-    fastfetch
     tre-command
     btop
     zsh-completions
     nix-zsh-completions
-    git
   ];
 
   programs.bat = {
@@ -30,35 +27,12 @@
     };
   };
 
-  programs.fastfetch = {
-    enable = true;
-    settings = {
-      modules = [
-        "title"
-        "separator"
-        "os"
-        "kernel"
-        "initsystem"
-        "uptime"
-        "datetime"
-        "packages"
-        "terminal"
-        "wm"
-        "shell"
-        "cpu"
-        "gpu"
-        "memory"
-        "break"
-        "colors"
-      ];
-    };
-  };
-
   home.file.".zshenv".enable = false;
   home.file.".config/zsh/conf.d" = {
     source = ./conf.d;
     recursive = true;
   };
+
   programs.zsh = {
     enable = true;
     enableCompletion = true;
@@ -98,6 +72,16 @@
           sha256 = "1lzrn0n4fxfcgg65v0qhnj7wnybybqzs4adz7xsrkgmcsr0ii8b7";
         };
       }
+      {
+        name = "fzf-tab";
+        file = "fzf-tab.plugin.zsh";
+        src = pkgs.fetchFromGitHub {
+          owner = "Aloxaf";
+          repo = "fzf-tab";
+          rev = "v1.2.0";
+          sha256 = "sha256-q26XVS/LcyZPRqDNwKKA9exgBByE0muyuNb0Bbar2lY=";
+        };
+      }
     ];
   };
 }
diff --git a/modules/home/caem/default.nix b/modules/home/caem/default.nix
index 367ada9..851dbf7 100644
--- a/modules/home/caem/default.nix
+++ b/modules/home/caem/default.nix
@@ -16,7 +16,7 @@
     enable = true;
     userDirs = {
       enable = true;
-      
+
       documents = "${config.home.homeDirectory}/documents";
       download = "${config.home.homeDirectory}/download";
       music = "${config.home.homeDirectory}/music";
diff --git a/modules/home/caem/development/git.nix b/modules/home/caem/development/git.nix
index eca8086..cd79c94 100644
--- a/modules/home/caem/development/git.nix
+++ b/modules/home/caem/development/git.nix
@@ -1,6 +1,10 @@
-{ ... }:
+{ pkgs, ... }:
 
 {
+  home.packages = with pkgs; [
+    git
+  ];
+
   programs.git = {
     enable = true;
     userName = "caem";
diff --git a/modules/home/caem/development/tmux.nix b/modules/home/caem/development/tmux.nix
index 311874d..6a46112 100644
--- a/modules/home/caem/development/tmux.nix
+++ b/modules/home/caem/development/tmux.nix
@@ -2,6 +2,7 @@
 
 {
   home.packages = with pkgs; [
+    tmux
     wl-clipboard
   ];
 
diff --git a/modules/home/caem/misc/default.nix b/modules/home/caem/misc/default.nix
new file mode 100644
index 0000000..e4fb51f
--- /dev/null
+++ b/modules/home/caem/misc/default.nix
@@ -0,0 +1,5 @@
+{ lib, ... }:
+
+{
+  imports = lib.getModuleImports ./.;
+}
diff --git a/modules/home/caem/misc/fastfetch.nix b/modules/home/caem/misc/fastfetch.nix
new file mode 100644
index 0000000..63f0633
--- /dev/null
+++ b/modules/home/caem/misc/fastfetch.nix
@@ -0,0 +1,31 @@
+{ pkgs, ... }:
+
+{
+  home.packages = with pkgs; [
+    fastfetch
+  ];
+
+  programs.fastfetch = {
+    enable = true;
+    settings = {
+      modules = [
+        "title"
+        "separator"
+        "os"
+        "kernel"
+        "initsystem"
+        "uptime"
+        "datetime"
+        "packages"
+        "terminal"
+        "wm"
+        "shell"
+        "cpu"
+        "gpu"
+        "memory"
+        "break"
+        "colors"
+      ];
+    };
+  };
+}
diff --git a/modules/home/caem/packages.nix b/modules/home/caem/packages.nix
index 2b2ac16..f56f672 100644
--- a/modules/home/caem/packages.nix
+++ b/modules/home/caem/packages.nix
@@ -6,5 +6,6 @@
     ./core
     ./desktop/gnome
     ./multimedia
+    ./misc
   ];
 }