diff --git a/flake.nix b/flake.nix
index 8746f11..63f48c5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -30,7 +30,6 @@
     darwin,
     ...
   }: let
-    # TODO replace with your own username, system and hostname
     username = "poby";
     system = "aarch64-darwin";
     hostname = "pobys-macbook-pro";
diff --git a/modules/apps.nix b/modules/apps.nix
index 75fd023..0b4cc0b 100644
--- a/modules/apps.nix
+++ b/modules/apps.nix
@@ -36,6 +36,8 @@
     tree
     zoxide
     zsh-powerlevel10k
+    zsh-fzf-tab
+    commitizen
 
     # GUI
     alt-tab-macos
diff --git a/modules/system.nix b/modules/system.nix
index 75ee146..335f952 100644
--- a/modules/system.nix
+++ b/modules/system.nix
@@ -210,6 +210,7 @@
     enableFzfHistory = true;
     promptInit = ''
     source ${pkgs.zsh-powerlevel10k}/share/zsh-powerlevel10k/powerlevel10k.zsh-theme
+    source ${pkgs.zsh-fzf-tab}/share/fzf-tab/fzf-tab.plugin.zsh
     '';
   };
 
@@ -218,7 +219,17 @@
       pkgs.zsh
     ];
     shellAliases = {
-      rebuild = "darwin-rebuild switch --flake ~/.config/nix-darwin";
+      ls = "lsd --color=auto";
+      l = "lsd -lhG";
+      ll = "lsd -alhG";
+      lh = "lsd -dl .*";
+      lsd = "lsd --group-directories-first";
+      filecount="find . -type f | wc -l";
+      cat = "bat --color=always";
+      man = "tldr";
+      nixrebuild = "darwin-rebuild switch --flake ~/.config/nix-darwin";
+      nixconfig = "code ~/.config/nix-darwin";
+      sshconfig = "code ~/.ssh/config";
     };
   };