diff --git a/flake.lock b/flake.lock
index 2542638..9becc66 100644
--- a/flake.lock
+++ b/flake.lock
@@ -61,11 +61,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1707683400,
-        "narHash": "sha256-Zc+J3UO1Xpx+NL8UB6woPHyttEy9cXXtm+0uWwzuYDc=",
+        "lastModified": 1708031129,
+        "narHash": "sha256-EH20hJfNnc1/ODdDVat9B7aKm0B95L3YtkIRwKLvQG8=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "21b078306a2ab68748abf72650db313d646cf2ca",
+        "rev": "3d6791b3897b526c82920a2ab5f61d71985b3cf8",
         "type": "github"
       },
       "original": {
@@ -93,11 +93,11 @@
     "homebrew-cask": {
       "flake": false,
       "locked": {
-        "lastModified": 1707851852,
-        "narHash": "sha256-jtPZ1kX9AADwqbAjqPDWvX+FKJwbwCV1/2MTbtbe7Zo=",
+        "lastModified": 1708094012,
+        "narHash": "sha256-vAnsVMWFp/QsvCwjsRLWt2n94e+YFJS94B/1h4Ui+4M=",
         "owner": "homebrew",
         "repo": "homebrew-cask",
-        "rev": "30c5b09cf49e884848c65ce96dcdcda288c28fa1",
+        "rev": "4d6359ba4d899f7f556616f35d23f15997821d6f",
         "type": "github"
       },
       "original": {
@@ -109,11 +109,11 @@
     "homebrew-cask-fonts": {
       "flake": false,
       "locked": {
-        "lastModified": 1707690230,
-        "narHash": "sha256-xYNkZCxVshAn1s+r55JAhi33j7I7KUjKNx0VsuVzCNI=",
+        "lastModified": 1707957157,
+        "narHash": "sha256-RjcJgrLJ9Zed6XsRTYuq/yXOBm+K5AMGycOWWW8QIUI=",
         "owner": "homebrew",
         "repo": "homebrew-cask-fonts",
-        "rev": "c8a9ad8e349bcf1d7a7c30f1b178b746591aa160",
+        "rev": "3c9d137956343e190e0feb319613de9ab50cd8c0",
         "type": "github"
       },
       "original": {
@@ -125,11 +125,11 @@
     "homebrew-core": {
       "flake": false,
       "locked": {
-        "lastModified": 1707858278,
-        "narHash": "sha256-e5W+1ckGgu65qxAInxLB+oaB62/vtB5abR1JuRm/7b0=",
+        "lastModified": 1708093005,
+        "narHash": "sha256-5QQ2uWOvxD18wXibzcEWeq64yW8WR2QJ5aX4clghuZE=",
         "owner": "homebrew",
         "repo": "homebrew-core",
-        "rev": "d6f2f04b025d67eeaea800a070b669d23bae549c",
+        "rev": "aae3d319403f66ef7e46bc13c05313ff489460a0",
         "type": "github"
       },
       "original": {
@@ -224,11 +224,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1707689078,
-        "narHash": "sha256-UUGmRa84ZJHpGZ1WZEBEUOzaPOWG8LZ0yPg1pdDF/yM=",
+        "lastModified": 1707956935,
+        "narHash": "sha256-ZL2TrjVsiFNKOYwYQozpbvQSwvtV/3Me7Zwhmdsfyu4=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "f9d39fb9aff0efee4a3d5f4a6d7c17701d38a1d8",
+        "rev": "a4d4fe8c5002202493e87ec8dbc91335ff55552c",
         "type": "github"
       },
       "original": {
diff --git a/shared/home-manager.nix b/shared/home-manager.nix
index af9d409..a60dc1c 100644
--- a/shared/home-manager.nix
+++ b/shared/home-manager.nix
@@ -15,6 +15,10 @@ in
     nix-direnv.enable = true;
   };
 
+  eza = {
+    enable = true;
+  };
+
   gh = {
     enable = true;
     settings = {
@@ -75,7 +79,6 @@ in
     settings = {
       cursor_shape = "underline";
       confirm_os_window_close = 0;
-      shell = "/Users/dekker1/.nix-profile/bin/nu";
     };
     theme = "GitHub Light";
   };
@@ -183,7 +186,6 @@ in
 
   starship = {
     enable = true;
-    enableNushellIntegration = true;
     settings = (with builtins; fromTOML (readFile ./config/starship-tokyo-night.toml)) // {
       # Overrides
     };
@@ -213,13 +215,44 @@ in
     };
   };
 
+  vscode = {
+    enable = false;
+    package = pkgs.vscodium;
+  };
+
   zoxide = {
     enable = true;
     enableNushellIntegration = true;
   };
 
-  vscode = {
-    enable = false;
-    package = pkgs.vscodium;
+  zsh = {
+    enable = true;
+    autocd = true;
+    defaultKeymap = "viins";
+    shellAliases = {
+      edit = "$VISUAL";
+      start = "open";
+      less = "bat";
+      ls = "eza";
+      set-light-theme = "kitty +kitten themes GitHub Dark";
+      set-dark-theme = "kitty +kitten themes GitHub Light";
+      brew-backup = "brew bundle dump --global --no-lock --formula --cask --mas --tap --force";
+      brew-cleanup = "brew bundle cleanup --global --no-lock --force --zap";
+      brew-restore = "brew bundle install --global --no-lock";
+    };
+    sessionVariables = {
+      # Set default editor
+      EDITOR = "nvim";
+      VISUAL = "codium";
+      # CMake settings
+      CMAKE_EXPORT_COMPILE_COMMANDS = "1"; # output compile-commands.json for clangd
+      CMAKE_GENERATOR = "Ninja Multi-Config"; # use Ninja generator by default
+      CMAKE_C_COMPILER_LAUNCHER = "ccache";
+      CMAKE_CXX_COMPILER_LAUNCHER = "ccache";
+    };
+    initExtra = "zstyle ':completion:*' matcher-list 'm:{a-z}={A-Za-z}'";
+    historySubstringSearch = {
+      enable = true;
+    };
   };
 }