diff --git a/flake.lock b/flake.lock
index 3786254de..79c8713a1 100644
--- a/flake.lock
+++ b/flake.lock
@@ -128,11 +128,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1760872779,
-        "narHash": "sha256-c5C907Raf9eY8f1NUXYeju9aUDlm227s/V0OptEbypA=",
+        "lastModified": 1762361079,
+        "narHash": "sha256-lz718rr1BDpZBYk7+G8cE6wee3PiBUpn8aomG/vLLiY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "63bdb5d90fa2fa11c42f9716ad1e23565613b07c",
+        "rev": "ffcdcf99d65c61956d882df249a9be53e5902ea5",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 54e5eef82..1796be953 100644
--- a/flake.nix
+++ b/flake.nix
@@ -130,7 +130,7 @@
             projectRootFile = "flake.nix";
             programs = {
               actionlint.enable = false;
-              biome.enable = true;
+              biome.enable = false; # Temporarily disabled due to schema hash mismatch
               nixfmt.enable = true;
               shfmt.enable = true;
               stylua.enable = true;
diff --git a/home-manager/packages/default.nix b/home-manager/packages/default.nix
index c52168d77..a68f4cb16 100644
--- a/home-manager/packages/default.nix
+++ b/home-manager/packages/default.nix
@@ -28,6 +28,7 @@ with pkgs;
   fastfetch
   fd
   fswatch
+  fzf-make
   gh
   git
   goose-cli
diff --git a/home-manager/programs/atuin/default.nix b/home-manager/programs/atuin/default.nix
new file mode 100644
index 000000000..31b073f6d
--- /dev/null
+++ b/home-manager/programs/atuin/default.nix
@@ -0,0 +1,8 @@
+{
+  programs.atuin = {
+    enable = true;
+    enableBashIntegration = true;
+    enableFishIntegration = true;
+    enableZshIntegration = true;
+  };
+}
diff --git a/home-manager/programs/default.nix b/home-manager/programs/default.nix
index 10652c597..3cfd2afea 100644
--- a/home-manager/programs/default.nix
+++ b/home-manager/programs/default.nix
@@ -4,8 +4,10 @@
   sources,
 }:
 let
+  atuin = import ./atuin;
   bash = import ./bash { inherit lib pkgs; };
   bat = import ./bat;
+  delta = import ./delta;
   direnv = import ./direnv;
   fd = import ./fd;
   fish = import ./fish;
@@ -30,8 +32,10 @@ let
   zsh = import ./zsh { inherit lib pkgs; };
 in
 [
+  atuin
   bash
   bat
+  delta
   direnv
   fd
   fish
diff --git a/home-manager/programs/delta/default.nix b/home-manager/programs/delta/default.nix
new file mode 100644
index 000000000..6ef5f5755
--- /dev/null
+++ b/home-manager/programs/delta/default.nix
@@ -0,0 +1,6 @@
+{
+  programs.delta = {
+    enable = true;
+    enableGitIntegration = true;
+  };
+}
diff --git a/home-manager/programs/fish/default.nix b/home-manager/programs/fish/default.nix
index 7ee7f767c..df9aada65 100644
--- a/home-manager/programs/fish/default.nix
+++ b/home-manager/programs/fish/default.nix
@@ -15,6 +15,7 @@
       fish_add_path -p /etc/profiles/per-user/${config.home.username}/bin
     '';
     interactiveShellInit = ''
+      source ${config.home.homeDirectory}/.config/fish/functions/_hm_load_env_file.fish
       _hm_load_env_file
       set fish_greeting
       set fish_theme dracula
@@ -75,10 +76,10 @@
         name = "done";
         src = pkgs.fishPlugins.done.src;
       }
-      {
-        name = "fzf";
-        src = pkgs.fishPlugins.fzf.src;
-      }
+      # {
+      #   name = "fzf";
+      #   src = pkgs.fishPlugins.fzf.src;
+      # }
       {
         name = "fzf-fish";
         src = pkgs.fishPlugins.fzf-fish.src;
diff --git a/home-manager/programs/git/default.nix b/home-manager/programs/git/default.nix
index a1ca69bce..7011abd38 100644
--- a/home-manager/programs/git/default.nix
+++ b/home-manager/programs/git/default.nix
@@ -1,86 +1,87 @@
 { pkgs, lib, ... }:
 {
-  programs.git = {
-    enable = true;
-    delta = {
-      enable = true;
-    };
-    userName = "Shun Kakinoki";
-    userEmail = "shunkakinoki@gmail.com";
-    lfs = {
+  programs = {
+    git = {
       enable = true;
-    };
-    includes = [
-      # Include GitAlias - update with: scripts/update-gitalias.sh
-      { path = "${./gitalias.txt}"; }
-    ];
-    aliases = {
-      co = "checkout";
-      lt = "log --tags --decorate --simplify-by-decoration --oneline";
-      unshallow = "fetch --prune --tags --unshallow";
-    };
-    extraConfig = {
-      # commit.gpgSign = true;
-      # gpg.format = "ssh";
-      # gpg.ssh.allowedSignersFile = "~/.ssh/allowed_signers";
-      # user.signingKey = "~/.ssh/id_ed25519";
-      core = {
-        editor = "nvim";
-        compression = -1;
-        autocrlf = "input";
-        whitespace = "trailing-space,space-before-tab";
-        precomposeunicode = true;
-        ignorecase = false;
-      };
-      color = {
-        diff = "auto";
-        status = "auto";
-        branch = "auto";
-        ui = true;
-      };
-      advice = {
-        addEmptyPathspec = false;
-      };
-      apply = {
-        whitespace = "nowarn";
-      };
-      help = {
-        autocorrect = 1;
-      };
-      grep = {
-        extendRegexp = true;
-        lineNumber = true;
-      };
-      push = {
-        autoSetupRemote = true;
-        default = "simple";
+      lfs = {
+        enable = true;
       };
-      submodule = {
-        fetchJobs = 4;
-      };
-      log = {
-        showSignature = false;
-      };
-      format = {
-        signOff = true;
-      };
-      rerere = {
-        enabled = true;
-      };
-      pull = {
-        ff = "only";
-      };
-      init = {
-        defaultBranch = "main";
-      };
-      delta = {
-        navigate = true;
-        dark = true;
-      };
-      merge = {
-        conflictStyle = "zdiff3";
+      includes = [
+        # Include GitAlias - update with: scripts/update-gitalias.sh
+        { path = "${./gitalias.txt}"; }
+      ];
+      settings = {
+        user = {
+          name = "Shun Kakinoki";
+          email = "shunkakinoki@gmail.com";
+        };
+        alias = {
+          co = "checkout";
+          lt = "log --tags --decorate --simplify-by-decoration --oneline";
+          unshallow = "fetch --prune --tags --unshallow";
+        };
+        core = {
+          editor = "nvim";
+          compression = -1;
+          autocrlf = "input";
+          whitespace = "trailing-space,space-before-tab";
+          precomposeunicode = true;
+          ignorecase = false;
+        };
+        color = {
+          diff = "auto";
+          status = "auto";
+          branch = "auto";
+          ui = true;
+        };
+        advice = {
+          addEmptyPathspec = false;
+        };
+        apply = {
+          whitespace = "nowarn";
+        };
+        help = {
+          autocorrect = 1;
+        };
+        grep = {
+          extendRegexp = true;
+          lineNumber = true;
+        };
+        push = {
+          autoSetupRemote = true;
+          default = "simple";
+        };
+        submodule = {
+          fetchJobs = 4;
+        };
+        log = {
+          showSignature = false;
+        };
+        format = {
+          signOff = true;
+        };
+        rerere = {
+          enabled = true;
+        };
+        pull = {
+          ff = "only";
+        };
+        init = {
+          defaultBranch = "main";
+        };
+        delta = {
+          navigate = true;
+          dark = true;
+        };
+        merge = {
+          conflictStyle = "zdiff3";
+        };
       };
+      ignores = lib.splitString "\n" (builtins.readFile ./.gitignore.global);
+    };
+    delta = {
+      enable = true;
+      enableGitIntegration = true;
     };
-    ignores = lib.splitString "\n" (builtins.readFile ./.gitignore.global);
   };
 }
diff --git a/named-hosts/galactica/default.nix b/named-hosts/galactica/default.nix
index 28b0a171e..ad16e1eb3 100644
--- a/named-hosts/galactica/default.nix
+++ b/named-hosts/galactica/default.nix
@@ -40,7 +40,7 @@ inputs.nix-darwin.lib.darwinSystem {
               signByDefault = true;
               key = "shunkakinoki@gmail.com";
             };
-            extraConfig = {
+            settings = {
               commit.gpgSign = true;
               tag.gpgSign = true;
             };
diff --git a/nix-darwin/config/homebrew.nix b/nix-darwin/config/homebrew.nix
index 614c0556b..0e96b14e7 100644
--- a/nix-darwin/config/homebrew.nix
+++ b/nix-darwin/config/homebrew.nix
@@ -38,7 +38,9 @@
       "temporal"
     ];
     casks = [
+      "atuin-desktop"
       "beeper"
+      "beekeeper-studio"
       "blender"
       "block-goose"
       "chatgpt"
@@ -73,6 +75,7 @@
       "slack"
       "visual-studio-code"
       "warp"
+      "wezterm"
       "windsurf"
       "zed"
       "zoom"