From 50e6b7bee240127ba81cae6fffd3d607cd3d7008 Mon Sep 17 00:00:00 2001
From: Shun Kakinoki <shunkakinoki@gmail.com>
Date: Sat, 8 Nov 2025 10:01:42 +0900
Subject: [PATCH 01/14] refactor(git): restructure configuration for clarity
 and add user settings

- Moved user settings (name and email) under a new 'user' section.
- Consolidated alias settings under a new 'alias' section.
- Added 'enableGitIntegration' to delta configuration.
- Cleaned up the overall structure for better readability.
---
 home-manager/programs/git/default.nix | 51 ++++++++++++++-------------
 1 file changed, 26 insertions(+), 25 deletions(-)

diff --git a/home-manager/programs/git/default.nix b/home-manager/programs/git/default.nix
index a1ca69bce..05bf2e44a 100644
--- a/home-manager/programs/git/default.nix
+++ b/home-manager/programs/git/default.nix
@@ -1,30 +1,26 @@
 { 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 = {
+      lfs = {
+        enable = true;
+      };
+      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";
@@ -80,7 +76,12 @@
       merge = {
         conflictStyle = "zdiff3";
       };
+      };
+      ignores = lib.splitString "\n" (builtins.readFile ./.gitignore.global);
+    };
+    delta = {
+      enable = true;
+      enableGitIntegration = true;
     };
-    ignores = lib.splitString "\n" (builtins.readFile ./.gitignore.global);
   };
 }

From 97d3f4477df1f2aa27a19fcec95711ad69bf4245 Mon Sep 17 00:00:00 2001
From: Shun Kakinoki <shunkakinoki@gmail.com>
Date: Sat, 8 Nov 2025 10:11:24 +0900
Subject: [PATCH 02/14] refactor(git): rename 'extraConfig' to 'settings' for
 consistency

- Updated the configuration key from 'extraConfig' to 'settings' to enhance clarity and maintain consistency with other configuration sections.
---
 named-hosts/galactica/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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;
             };

From cf1f80c64dc12c40f9a3d6ef527977886932dc45 Mon Sep 17 00:00:00 2001
From: Shun Kakinoki <shunkakinoki@gmail.com>
Date: Sat, 8 Nov 2025 10:19:39 +0900
Subject: [PATCH 03/14] feat(atuin): add Atuin configuration and integrate with
 home-manager

- Introduced Atuin configuration in home-manager.
- Updated homebrew configuration to include Atuin desktop application.
- Note: Atuin integration is temporarily disabled due to build issues.
---
 home-manager/programs/atuin/default.nix | 9 +++++++++
 home-manager/programs/default.nix       | 2 ++
 nix-darwin/config/homebrew.nix          | 3 +++
 3 files changed, 14 insertions(+)
 create mode 100644 home-manager/programs/atuin/default.nix

diff --git a/home-manager/programs/atuin/default.nix b/home-manager/programs/atuin/default.nix
new file mode 100644
index 000000000..c8306d705
--- /dev/null
+++ b/home-manager/programs/atuin/default.nix
@@ -0,0 +1,9 @@
+{
+  # Temporarily disabled due to build issue
+  # 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..a46c406af 100644
--- a/home-manager/programs/default.nix
+++ b/home-manager/programs/default.nix
@@ -4,6 +4,7 @@
   sources,
 }:
 let
+  atuin = import ./atuin;
   bash = import ./bash { inherit lib pkgs; };
   bat = import ./bat;
   direnv = import ./direnv;
@@ -30,6 +31,7 @@ let
   zsh = import ./zsh { inherit lib pkgs; };
 in
 [
+  atuin
   bash
   bat
   direnv
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"

From 9bc6893086c637d7bbc3331a79aec741f72af2c0 Mon Sep 17 00:00:00 2001
From: Shun Kakinoki <shunkakinoki@gmail.com>
Date: Sat, 8 Nov 2025 10:22:21 +0900
Subject: [PATCH 04/14] feat(delta): add Delta configuration to home-manager

- Introduced Delta configuration in home-manager with Git integration enabled.
- Updated default.nix to include Delta in the program imports.
- Removed temporary disablement note for Atuin configuration.
---
 home-manager/programs/atuin/default.nix | 1 -
 home-manager/programs/default.nix       | 2 ++
 home-manager/programs/delta/default.nix | 6 ++++++
 3 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 home-manager/programs/delta/default.nix

diff --git a/home-manager/programs/atuin/default.nix b/home-manager/programs/atuin/default.nix
index c8306d705..1e6262996 100644
--- a/home-manager/programs/atuin/default.nix
+++ b/home-manager/programs/atuin/default.nix
@@ -1,5 +1,4 @@
 {
-  # Temporarily disabled due to build issue
   # programs.atuin = {
   #   enable = true;
   #   enableBashIntegration = true;
diff --git a/home-manager/programs/default.nix b/home-manager/programs/default.nix
index a46c406af..3cfd2afea 100644
--- a/home-manager/programs/default.nix
+++ b/home-manager/programs/default.nix
@@ -7,6 +7,7 @@ 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;
@@ -34,6 +35,7 @@ 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;
+  };
+}

From 9628c16476884de41db6e5836283e3488d1719e4 Mon Sep 17 00:00:00 2001
From: Shun Kakinoki <shunkakinoki@gmail.com>
Date: Sat, 8 Nov 2025 10:26:38 +0900
Subject: [PATCH 05/14] feat(home-manager): add fzf-make to package list and
 comment out yazi

- Included fzf-make in the home-manager package imports.
- Commented out yazi from the package list for potential future re-enablement.
---
 home-manager/packages/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/home-manager/packages/default.nix b/home-manager/packages/default.nix
index c52168d77..a6515f8d3 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
@@ -59,7 +60,7 @@ with pkgs;
   uv
   wget
   yarn
-  yazi
+  # yazi
   yq
   zellij
   zoxide

From 6ebe8c09d79ba0e1f5016bdbd25fb0be246aa68c Mon Sep 17 00:00:00 2001
From: Shun Kakinoki <shunkakinoki@gmail.com>
Date: Sat, 8 Nov 2025 10:28:55 +0900
Subject: [PATCH 06/14] feat(homebrew): add Atuin to the brew list

- Included Atuin in the homebrew configuration to enhance package availability.
---
 nix-darwin/config/homebrew.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nix-darwin/config/homebrew.nix b/nix-darwin/config/homebrew.nix
index 0e96b14e7..0c90a275e 100644
--- a/nix-darwin/config/homebrew.nix
+++ b/nix-darwin/config/homebrew.nix
@@ -16,6 +16,7 @@
       "sst/tap"
     ];
     brews = [
+      "atuin"
       "bun"
       "claude-squad"
       "cmake"

From aa55e57279325de00524105807f956c530ee0ddd Mon Sep 17 00:00:00 2001
From: Shun Kakinoki <shunkakinoki@gmail.com>
Date: Sat, 8 Nov 2025 10:31:04 +0900
Subject: [PATCH 07/14] fix(home-manager): uncomment yazi in package list

---
 home-manager/packages/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/home-manager/packages/default.nix b/home-manager/packages/default.nix
index a6515f8d3..a68f4cb16 100644
--- a/home-manager/packages/default.nix
+++ b/home-manager/packages/default.nix
@@ -60,7 +60,7 @@ with pkgs;
   uv
   wget
   yarn
-  # yazi
+  yazi
   yq
   zellij
   zoxide

From 12aee2288ddc47c6d30ae06f12c930c0e8617acc Mon Sep 17 00:00:00 2001
From: Shun Kakinoki <shunkakinoki@gmail.com>
Date: Sat, 8 Nov 2025 10:33:30 +0900
Subject: [PATCH 08/14] chore(flake.lock): update nixpkgs to latest revision
 and hash

- Updated the nixpkgs lock file with the latest lastModified timestamp, narHash, and revision for improved dependency management.
---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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": {

From 7bf2151a339c640a683a8a8980d99db96720c2d3 Mon Sep 17 00:00:00 2001
From: Shun Kakinoki <shunkakinoki@gmail.com>
Date: Sat, 8 Nov 2025 10:33:57 +0900
Subject: [PATCH 09/14] fix(flake.nix): temporarily disable biome due to schema
 hash mismatch

---
 flake.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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;

From 2e30626b13ee619f657da9d6db986e2cbbdbf8c9 Mon Sep 17 00:00:00 2001
From: Shun Kakinoki <shunkakinoki@gmail.com>
Date: Sat, 8 Nov 2025 10:34:09 +0900
Subject: [PATCH 10/14] refactor(git): standardize formatting in default.nix
 configuration

- Reformatted the Git configuration in default.nix for improved readability and consistency.
- No functional changes were made to the configuration settings.
---
 home-manager/programs/git/default.nix | 110 +++++++++++++-------------
 1 file changed, 55 insertions(+), 55 deletions(-)

diff --git a/home-manager/programs/git/default.nix b/home-manager/programs/git/default.nix
index 05bf2e44a..7011abd38 100644
--- a/home-manager/programs/git/default.nix
+++ b/home-manager/programs/git/default.nix
@@ -21,61 +21,61 @@
           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";
-      };
+          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);
     };

From 6faa768a2c004e751cbf9cbc81f9438f3f515242 Mon Sep 17 00:00:00 2001
From: Shun Kakinoki <shunkakinoki@gmail.com>
Date: Sat, 8 Nov 2025 10:36:29 +0900
Subject: [PATCH 11/14] refactor(fish): comment out fzf plugin in default.nix

- Temporarily commented out the fzf plugin configuration in default.nix for clarity and potential future re-enablement.
- No functional changes were made to other plugins.
---
 home-manager/programs/fish/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/home-manager/programs/fish/default.nix b/home-manager/programs/fish/default.nix
index 7ee7f767c..97ee5c428 100644
--- a/home-manager/programs/fish/default.nix
+++ b/home-manager/programs/fish/default.nix
@@ -75,10 +75,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;

From 9e8f2a2aa2a5c57730419e48edfd7bc0cbea0ce4 Mon Sep 17 00:00:00 2001
From: Shun Kakinoki <shunkakinoki@gmail.com>
Date: Sat, 8 Nov 2025 10:37:41 +0900
Subject: [PATCH 12/14] enable Atuin configuration in default.nix

- Uncommented the Atuin program configuration to enable Bash, Fish, and Zsh integrations.
- This change restores the functionality that was previously commented out for clarity.
---
 home-manager/programs/atuin/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/home-manager/programs/atuin/default.nix b/home-manager/programs/atuin/default.nix
index 1e6262996..31b073f6d 100644
--- a/home-manager/programs/atuin/default.nix
+++ b/home-manager/programs/atuin/default.nix
@@ -1,8 +1,8 @@
 {
-  # programs.atuin = {
-  #   enable = true;
-  #   enableBashIntegration = true;
-  #   enableFishIntegration = true;
-  #   enableZshIntegration = true;
-  # };
+  programs.atuin = {
+    enable = true;
+    enableBashIntegration = true;
+    enableFishIntegration = true;
+    enableZshIntegration = true;
+  };
 }

From 38951621525ee4c5db71758b048984cbe300008d Mon Sep 17 00:00:00 2001
From: Shun Kakinoki <shunkakinoki@gmail.com>
Date: Sat, 8 Nov 2025 10:43:14 +0900
Subject: [PATCH 13/14] remove Atuin from homebrew package list

---
 nix-darwin/config/homebrew.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nix-darwin/config/homebrew.nix b/nix-darwin/config/homebrew.nix
index 0c90a275e..0e96b14e7 100644
--- a/nix-darwin/config/homebrew.nix
+++ b/nix-darwin/config/homebrew.nix
@@ -16,7 +16,6 @@
       "sst/tap"
     ];
     brews = [
-      "atuin"
       "bun"
       "claude-squad"
       "cmake"

From 0bcd3ff9f03c237df9484cac70f2dc50757b59c9 Mon Sep 17 00:00:00 2001
From: Shun Kakinoki <shunkakinoki@gmail.com>
Date: Sat, 8 Nov 2025 10:44:53 +0900
Subject: [PATCH 14/14] feat(fish): load environment file in interactive shell
 initialization

- Added a line to source the _hm_load_env_file.fish function in the interactiveShellInit section of default.nix.
- This change ensures that the environment variables are loaded correctly when starting an interactive Fish shell.
---
 home-manager/programs/fish/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/home-manager/programs/fish/default.nix b/home-manager/programs/fish/default.nix
index 97ee5c428..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