diff --git a/nix/home/programs/git/default.nix b/nix/home/programs/git/default.nix
index f69e983..0fecc84 100644
--- a/nix/home/programs/git/default.nix
+++ b/nix/home/programs/git/default.nix
@@ -3,18 +3,23 @@
 let
 in
 {
+  programs.delta = {
+    enable = true;
+    options = {
+      side-by-side = true;
+      line-numbers = true;
+    };
+    enableGitIntegration = true;
+  };
+
   programs.git = {
     enable = true;
-    userName = "Haak Saxberg";
-    userEmail = "haak.erling@gmail.com";
-    delta = {
-      enable = true;
-      options = {
-        side-by-side = true;
-        line-numbers = true;
+    settings = {
+      user = {
+        name = "Haak Saxberg";
+        email = "haak.erling@gmail.com";
       };
-    };
-    extraConfig = {
+
       rebase = {
         updateRefs = true;
       };
diff --git a/nix/home/programs/yazi/default.nix b/nix/home/programs/yazi/default.nix
index dd26a32..cc71449 100644
--- a/nix/home/programs/yazi/default.nix
+++ b/nix/home/programs/yazi/default.nix
@@ -1,7 +1,9 @@
 { pkgs, ... }:
 {
+  # A command-line file manager
   programs.yazi = {
     enable = true;
     enableZshIntegration = true;
+    shellWrapperName = "y";
   };
 }
diff --git a/nix/home/programs/zsh/default.nix b/nix/home/programs/zsh/default.nix
index 53c4ad1..17bdc7e 100644
--- a/nix/home/programs/zsh/default.nix
+++ b/nix/home/programs/zsh/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, config, ... }:
 
 with builtins; {
 
@@ -22,6 +22,8 @@ with builtins; {
         "vi-mode"
       ];
     };
+
+    dotDir = "${config.xdg.configHome}/zsh";
   };
 
   home.file.".oh-my-zsh/custom/themes/typewritten.zsh-theme" = {
diff --git a/nix/home/universal.nix b/nix/home/universal.nix
index 6485149..a58d0ac 100644
--- a/nix/home/universal.nix
+++ b/nix/home/universal.nix
@@ -45,8 +45,8 @@ with builtins;
     (import ./programs/zsh)
     (import ./programs/tmux)
     (import ./programs/nvim)
-    (import ./programs/helix)
-    (import ./programs/yazi)
+    # (import ./programs/helix)
+    # (import ./programs/yazi)
   ];
 
   home.packages = defaultPkgs;