From 101fb1d4f742be3249b41d295d06668ee6cd5cc5 Mon Sep 17 00:00:00 2001 From: inkch Date: Wed, 23 Jul 2025 19:02:46 +0900 Subject: [PATCH 1/3] Revert "chore(fish): delete unused environment variables" This reverts commit 723d3d63a83cfb64c87c94573d191b39735b6bd7. --- dot_config/private_fish/env.fish.tmpl | 1 + 1 file changed, 1 insertion(+) diff --git a/dot_config/private_fish/env.fish.tmpl b/dot_config/private_fish/env.fish.tmpl index 6e0e828..e6802d7 100644 --- a/dot_config/private_fish/env.fish.tmpl +++ b/dot_config/private_fish/env.fish.tmpl @@ -79,6 +79,7 @@ set -x PATH "$VOLTA_HOME/bin" $PATH set -x PYLINTHOME "$XDG_CACHE_HOME"/pylint # golang +set -x GOPATH "$XDG_DATA_HOME/go" set -ax PATH /usr/local/go/bin # Rust From d3e9f68879aa2c1693c86e056c65b271257eed4e Mon Sep 17 00:00:00 2001 From: inkch Date: Wed, 23 Jul 2025 19:08:17 +0900 Subject: [PATCH 2/3] feat(fish): add $GOPATH/bin to $PATH --- dot_config/private_fish/env.fish.tmpl | 1 + 1 file changed, 1 insertion(+) diff --git a/dot_config/private_fish/env.fish.tmpl b/dot_config/private_fish/env.fish.tmpl index e6802d7..32b9af2 100644 --- a/dot_config/private_fish/env.fish.tmpl +++ b/dot_config/private_fish/env.fish.tmpl @@ -80,6 +80,7 @@ set -x PYLINTHOME "$XDG_CACHE_HOME"/pylint # golang set -x GOPATH "$XDG_DATA_HOME/go" +set -ax PATH "$GOPATH"/bin set -ax PATH /usr/local/go/bin # Rust From df7e2468b8a073d266b9473f4deca79ea3d6d840 Mon Sep 17 00:00:00 2001 From: inkch Date: Wed, 23 Jul 2025 19:57:27 +0900 Subject: [PATCH 3/3] fix(nvim): restrict *.tmpl filetype detection to files under */chezmoi/ Limit autocmd pattern to only match *.tmpl files located directly inside a `chezmoi/` directory. This prevents unintended filetype assignments for similarly named files (e.g. Go template) --- dot_config/nvim/lua/utils/chezmoi-tmpl.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dot_config/nvim/lua/utils/chezmoi-tmpl.lua b/dot_config/nvim/lua/utils/chezmoi-tmpl.lua index 068646a..380bbbe 100644 --- a/dot_config/nvim/lua/utils/chezmoi-tmpl.lua +++ b/dot_config/nvim/lua/utils/chezmoi-tmpl.lua @@ -1 +1 @@ -vim.cmd([[ autocmd BufNewFile,BufRead *.tmpl execute 'set filetype='..matchlist(expand(''), '.*\.\(.*\)\.tmpl$')[1] ]]) +vim.cmd([[ autocmd BufNewFile,BufRead */chezmoi/*.tmpl execute 'set filetype='..matchlist(expand(''), '.*\.\(.*\)\.tmpl$')[1] ]])