diff --git a/home-manager/home.nix b/home-manager/home.nix
index 9cb53e8..6374106 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -17,11 +17,10 @@
 
     ./IDEs
 
+    ./tools
+
     ./git
     ./zsh
-
-    ./fzf.nix
-    ./tmux.nix
   ];
 
   nixpkgs = {
diff --git a/home-manager/tools/bat.nix b/home-manager/tools/bat.nix
new file mode 100644
index 0000000..ded7a61
--- /dev/null
+++ b/home-manager/tools/bat.nix
@@ -0,0 +1,7 @@
+{ pkgs, inputs, ... }:
+
+{
+  programs.bat = {
+    enable = true;
+  };
+}
diff --git a/home-manager/tools/default.nix b/home-manager/tools/default.nix
new file mode 100644
index 0000000..6af9a51
--- /dev/null
+++ b/home-manager/tools/default.nix
@@ -0,0 +1,11 @@
+{ ... }:
+
+{
+  imports = [
+    ./bat.nix
+    ./eza.nix
+    ./fzf.nix
+    ./ripgrep.nix
+    ./tmux.nix
+  ];
+}
diff --git a/home-manager/tools/eza.nix b/home-manager/tools/eza.nix
new file mode 100644
index 0000000..08abd36
--- /dev/null
+++ b/home-manager/tools/eza.nix
@@ -0,0 +1,16 @@
+{ pkgs, inputs, ... }:
+
+{
+  programs.eza = {
+    enable = true;
+    enableZshIntegration = true;
+
+    colors = "always";
+    icons = "always";
+    git = true;
+
+    extraOptions = [
+      "--group-directories-first"
+    ];
+  };
+}
diff --git a/home-manager/fzf.nix b/home-manager/tools/fzf.nix
similarity index 100%
rename from home-manager/fzf.nix
rename to home-manager/tools/fzf.nix
diff --git a/home-manager/tools/ripgrep.nix b/home-manager/tools/ripgrep.nix
new file mode 100644
index 0000000..510a0a3
--- /dev/null
+++ b/home-manager/tools/ripgrep.nix
@@ -0,0 +1,7 @@
+{ pkgs, inputs, ... }:
+
+{
+  programs.ripgrep = {
+    enable = true;
+  };
+}
diff --git a/home-manager/tmux.nix b/home-manager/tools/tmux.nix
similarity index 100%
rename from home-manager/tmux.nix
rename to home-manager/tools/tmux.nix
diff --git a/home-manager/zsh/zsh.nix b/home-manager/zsh/zsh.nix
index d5bdd9a..f5a289b 100644
--- a/home-manager/zsh/zsh.nix
+++ b/home-manager/zsh/zsh.nix
@@ -5,9 +5,24 @@
     enable = true;
 
     autosuggestion.enable = true;
+    enableCompletion = true;
 
     history = {
       append = true;
     };
+
+
+    shellAliases = {
+      ls = "eza";
+      ll = "eza -lh";
+      lal = "eza -lah";
+
+      cd = "z";
+
+      grep = "ripgrep";
+
+      cat = "bat";
+      less = "bat --pager=less";
+    };
   };
 }
\ No newline at end of file