Skip to content

chore: sync chore-v2 branch with main #397

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shunkakinoki merged 9 commits into from
Dec 6, 2025
Merged

chore: sync chore-v2 branch with main #397

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f2104f6
feat(neovim): add fff.nvim plugin for fast fuzzy file finding
shunkakinoki Dec 6, 2025
93f742e
Merge remote-tracking branch 'origin/main' into chore-v2
shunkakinoki Dec 6, 2025
e283710
feat(makefile): add launchctl targets to restart launchd agents
shunkakinoki Dec 6, 2025
04e2098
feat(neovim): add keymaps for LazyGit and VS Code style diff
shunkakinoki Dec 6, 2025
80859c6
feat(neovim): update keymap for LazyGit to use <leader>lg
shunkakinoki Dec 6, 2025
0e7d9aa
feat(dotfiles-updater): enhance launchd configuration for macOS and i…
shunkakinoki Dec 6, 2025
7044704
feat(neverssl-keepalive): implement keepalive script for macOS and Li…
shunkakinoki Dec 6, 2025
0074707
fix(neverssl-keepalive): simplify PATH variable in macOS launchd conf…
shunkakinoki Dec 6, 2025
85f29de
fix(cliproxyapi): refactor to use inherited lib for consistency in ma…
shunkakinoki Dec 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 42 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ setup: nix-setup ## Basic Nix setup (alias for nix-setup).
setup-dev: nix-setup git-submodule-sync shell-install ## Set up local development environment (Nix + submodules + shell).

.PHONY: switch
switch: nix-switch ## Apply Nix configuration (alias for nix-switch).
switch: nix-switch launchctl ## Apply Nix configuration and restart launchd agents.

Copilot AI Dec 6, 2025

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The switch target now depends on launchctl, which will fail on Linux systems since launchctl is a macOS-specific command. Consider adding OS detection (e.g., [ "$(OS)" = "Darwin" ] && $(MAKE) launchctl || true) or making the launchctl target conditional on Darwin, similar to how nix-connect handles OS-specific logic.

Suggested change
switch: nix-switch launchctl ## Apply Nix configuration and restart launchd agents.
switch: nix-switch ## Apply Nix configuration and restart launchd agents.
@if [ "$(OS)" = "Darwin" ]; then \
$(MAKE) launchctl; \
fi

Copilot uses AI. Check for mistakes.

.PHONY: update
update: nix-update shell-update neovim-update ## Update Nix flake and configurations.
Expand Down Expand Up @@ -567,6 +567,47 @@ lua-check-hammerspoon-dev: ## Run the Hammerspoon Lua check inside the Nix dev s
@echo "🧪 Running Hammerspoon Lua check inside the Nix dev shell..."
@DEVENV_ROOT=$(CURDIR) $(NIX_ALLOW_UNFREE) $(NIX_EXEC) develop $(NIX_FLAGS) .# --command $(MAKE) lua-check-hammerspoon

##@ Launchd Services

.PHONY: launchctl
launchctl: launchctl-brew-upgrader launchctl-cliproxyapi launchctl-code-syncer launchctl-dotfiles-updater launchctl-neverssl-keepalive launchctl-ollama ## Restart all launchd agents.

.PHONY: launchctl-brew-upgrader
launchctl-brew-upgrader: ## Restart brew-upgrader launchd agent.
@echo "🔄 Restarting brew-upgrader..."
@launchctl kickstart -k gui/$$(id -u)/org.nix-community.home.brew-upgrader || true
@echo "✅ brew-upgrader restarted"

.PHONY: launchctl-cliproxyapi
launchctl-cliproxyapi: ## Restart cliproxyapi launchd agent.
@echo "🔄 Restarting cliproxyapi..."
@launchctl kickstart -k gui/$$(id -u)/org.nix-community.home.cliproxyapi || true
@echo "✅ cliproxyapi restarted"

.PHONY: launchctl-code-syncer
launchctl-code-syncer: ## Restart code-syncer launchd agent.
@echo "🔄 Restarting code-syncer..."
@launchctl kickstart -k gui/$$(id -u)/org.nix-community.home.code-syncer || true
@echo "✅ code-syncer restarted"

.PHONY: launchctl-dotfiles-updater
launchctl-dotfiles-updater: ## Restart dotfiles-updater launchd agent.
@echo "🔄 Restarting dotfiles-updater..."
@launchctl kickstart -k gui/$$(id -u)/org.nix-community.home.dotfiles-updater || true
@echo "✅ dotfiles-updater restarted"

.PHONY: launchctl-neverssl-keepalive
launchctl-neverssl-keepalive: ## Restart neverssl-keepalive launchd agent.
@echo "🔄 Restarting neverssl-keepalive..."
@launchctl kickstart -k gui/$$(id -u)/org.nix-community.home.neverssl-keepalive || true
@echo "✅ neverssl-keepalive restarted"

.PHONY: launchctl-ollama
launchctl-ollama: ## Restart ollama launchd agent.
@echo "🔄 Restarting ollama..."
@launchctl kickstart -k gui/$$(id -u)/org.nix-community.home.ollama || true
@echo "✅ ollama restarted"
Comment on lines +577 to +609

Copilot AI Dec 6, 2025

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The launchctl targets execute macOS-specific commands without checking the operating system. These should be guarded with OS detection to prevent errors on Linux systems. Consider adding a check like @if [ "$(OS)" = "Darwin" ]; then ... fi or documenting that these targets are Darwin-only.

Suggested change
@echo "🔄 Restarting brew-upgrader..."
@launchctl kickstart -k gui/$$(id -u)/org.nix-community.home.brew-upgrader || true
@echo "✅ brew-upgrader restarted"
.PHONY: launchctl-cliproxyapi
launchctl-cliproxyapi: ## Restart cliproxyapi launchd agent.
@echo "🔄 Restarting cliproxyapi..."
@launchctl kickstart -k gui/$$(id -u)/org.nix-community.home.cliproxyapi || true
@echo "✅ cliproxyapi restarted"
.PHONY: launchctl-code-syncer
launchctl-code-syncer: ## Restart code-syncer launchd agent.
@echo "🔄 Restarting code-syncer..."
@launchctl kickstart -k gui/$$(id -u)/org.nix-community.home.code-syncer || true
@echo "✅ code-syncer restarted"
.PHONY: launchctl-dotfiles-updater
launchctl-dotfiles-updater: ## Restart dotfiles-updater launchd agent.
@echo "🔄 Restarting dotfiles-updater..."
@launchctl kickstart -k gui/$$(id -u)/org.nix-community.home.dotfiles-updater || true
@echo "✅ dotfiles-updater restarted"
.PHONY: launchctl-neverssl-keepalive
launchctl-neverssl-keepalive: ## Restart neverssl-keepalive launchd agent.
@echo "🔄 Restarting neverssl-keepalive..."
@launchctl kickstart -k gui/$$(id -u)/org.nix-community.home.neverssl-keepalive || true
@echo "✅ neverssl-keepalive restarted"
.PHONY: launchctl-ollama
launchctl-ollama: ## Restart ollama launchd agent.
@echo "🔄 Restarting ollama..."
@launchctl kickstart -k gui/$$(id -u)/org.nix-community.home.ollama || true
@echo "✅ ollama restarted"
@if [ "$(OS)" = "Darwin" ]; then \
echo "🔄 Restarting brew-upgrader..."; \
launchctl kickstart -k gui/$$(id -u)/org.nix-community.home.brew-upgrader || true; \
echo "✅ brew-upgrader restarted"; \
else \
echo "❌ brew-upgrader restart is only supported on macOS (Darwin)."; \
fi
.PHONY: launchctl-cliproxyapi
launchctl-cliproxyapi: ## Restart cliproxyapi launchd agent.
@if [ "$(OS)" = "Darwin" ]; then \
echo "🔄 Restarting cliproxyapi..."; \
launchctl kickstart -k gui/$$(id -u)/org.nix-community.home.cliproxyapi || true; \
echo "✅ cliproxyapi restarted"; \
else \
echo "❌ cliproxyapi restart is only supported on macOS (Darwin)."; \
fi
.PHONY: launchctl-code-syncer
launchctl-code-syncer: ## Restart code-syncer launchd agent.
@if [ "$(OS)" = "Darwin" ]; then \
echo "🔄 Restarting code-syncer..."; \
launchctl kickstart -k gui/$$(id -u)/org.nix-community.home.code-syncer || true; \
echo "✅ code-syncer restarted"; \
else \
echo "❌ code-syncer restart is only supported on macOS (Darwin)."; \
fi
.PHONY: launchctl-dotfiles-updater
launchctl-dotfiles-updater: ## Restart dotfiles-updater launchd agent.
@if [ "$(OS)" = "Darwin" ]; then \
echo "🔄 Restarting dotfiles-updater..."; \
launchctl kickstart -k gui/$$(id -u)/org.nix-community.home.dotfiles-updater || true; \
echo "✅ dotfiles-updater restarted"; \
else \
echo "❌ dotfiles-updater restart is only supported on macOS (Darwin)."; \
fi
.PHONY: launchctl-neverssl-keepalive
launchctl-neverssl-keepalive: ## Restart neverssl-keepalive launchd agent.
@if [ "$(OS)" = "Darwin" ]; then \
echo "🔄 Restarting neverssl-keepalive..."; \
launchctl kickstart -k gui/$$(id -u)/org.nix-community.home.neverssl-keepalive || true; \
echo "✅ neverssl-keepalive restarted"; \
else \
echo "❌ neverssl-keepalive restart is only supported on macOS (Darwin)."; \
fi
.PHONY: launchctl-ollama
launchctl-ollama: ## Restart ollama launchd agent.
@if [ "$(OS)" = "Darwin" ]; then \
echo "🔄 Restarting ollama..."; \
launchctl kickstart -k gui/$$(id -u)/org.nix-community.home.ollama || true; \
echo "✅ ollama restarted"; \
else \
echo "❌ ollama restart is only supported on macOS (Darwin)."; \
fi

Copilot uses AI. Check for mistakes.

##@ Git Submodule

.PHONY: git-submodule-sync
Expand Down
6 changes: 6 additions & 0 deletions home-manager/programs/neovim/lua/keymaps.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,12 @@ keymap({ "n", "v" }, "<leader>d", '"_d', opts)
keymap("n", "<leader>gs", ":tab Git<cr>", opts)
-- @keymap <F9>: Open Git mergetool in new tab
keymap("n", "<F9>", ":tab Git mergetool<cr>", opts)
-- @keymap <leader>gg: Open LazyGit

Copilot AI Dec 6, 2025

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The comment says <leader>gg but the actual keymap uses <leader>lg. The comment should be updated to match the keymap: -- @keymap <leader>lg: Open LazyGit

Suggested change
-- @keymap <leader>gg: Open LazyGit
-- @keymap <leader>lg: Open LazyGit

Copilot uses AI. Check for mistakes.
keymap("n", "<leader>lg", ":LazyGit<cr>", opts)
-- @keymap <leader>gD: Open VS Code style diff
keymap("n", "<leader>gD", function()
require("vscode-diff").diff()
end, opts)
Comment on lines +120 to +125

@coderabbitai coderabbitai Bot Dec 6, 2025

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟡 Minor

Fix @keymap annotation to match <leader>lg mapping

The doc comment advertises <leader>gg while the actual mapping is <leader>lg, which will confuse any tooling that parses these @keymap annotations.

- -- @keymap <leader>gg: Open LazyGit
-keymap("n", "<leader>lg", ":LazyGit<cr>", opts)
+-- @keymap <leader>lg: Open LazyGit
+keymap("n", "<leader>lg", ":LazyGit<cr>", opts)
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
-- @keymap <leader>gg: Open LazyGit
keymap("n", "<leader>lg", ":LazyGit<cr>", opts)
-- @keymap <leader>gD: Open VS Code style diff
keymap("n", "<leader>gD", function()
require("vscode-diff").diff()
end, opts)
-- @keymap <leader>lg: Open LazyGit
keymap("n", "<leader>lg", ":LazyGit<cr>", opts)
-- @keymap <leader>gD: Open VS Code style diff
keymap("n", "<leader>gD", function()
require("vscode-diff").diff()
end, opts)
🤖 Prompt for AI Agents 
In home-manager/programs/neovim/lua/keymaps.lua around lines 120 to 125, the
@keymap docstring incorrectly documents "<leader>gg" while the actual mapping is
"<leader>lg"; update the annotation to "@keymap <leader>lg: Open LazyGit" so the
comment matches the mapping and any tooling parsing these annotations will be
correct.

-- @keymap <leader>gd: Preview hunk inline
keymap("n", "<leader>gd", ":Gitsigns preview_hunk_inline<cr>", opts)
-- @keymap <leader>hs: Stage hunk (Gitsigns)
Expand Down
4 changes: 4 additions & 0 deletions home-manager/programs/neovim/lua/plugins.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,10 @@ vim.pack.add({

-- TERMINAL
{ src = "https://github.com/akinsho/toggleterm.nvim" },

-- GIT
{ src = "https://github.com/kdheepak/lazygit.nvim" },
{ src = "https://github.com/esmuellert/vscode-diff.nvim" },
})

require("other-nvim").setup({ mappings = { "golang" } })
Expand Down
4 changes: 4 additions & 0 deletions home-manager/programs/neovim/nvim-pack-lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,10 @@
"rev": "2d7c2db2507fa3c4956142ee607431ddb2828639",
"src": "https://github.com/stevearc/dressing.nvim"
},
"fff.nvim": {
"rev": "9edf195c8fe71f1ab8f84e863fb27b469d2342bf",
"src": "https://github.com/dmtrKovalenko/fff.nvim"
},
Comment on lines +68 to +71

Copilot AI Dec 6, 2025

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The lazygit.nvim and vscode-diff.nvim plugins are referenced in lua/plugins.lua (lines 93-94) and lua/keymaps.lua (lines 121, 123-125), but they are missing from this lock file. This will cause runtime errors when trying to use the keymaps. These plugins need to be added to the lock file with their respective repository URLs and commit hashes.

Copilot uses AI. Check for mistakes.
"fidget.nvim": {
"rev": "e32b672d8fd343f9d6a76944fedb8c61d7d8111a",
"src": "https://github.com/j-hui/fidget.nvim"
Expand Down
2 changes: 1 addition & 1 deletion home-manager/services/brew-upgrader/upgrade.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

set -euo pipefail

brew upgrade
/opt/homebrew/bin/brew upgrade

@gemini-code-assist gemini-code-assist Bot Dec 6, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

Hardcoding the path to the brew executable to /opt/homebrew/bin/brew makes this script specific to Apple Silicon Macs and will cause it to fail on Intel-based Macs where Homebrew is typically installed in /usr/local/bin. To make the script more portable across different architectures, it's better to dynamically determine the path to the brew executable.

Suggested change
/opt/homebrew/bin/brew upgrade
if [ -x "/opt/homebrew/bin/brew" ]; then
/opt/homebrew/bin/brew upgrade
elif [ -x "/usr/local/bin/brew" ]; then
/usr/local/bin/brew upgrade
else
echo "Error: Homebrew not found" >&2
exit 1
fi

@coderabbitai coderabbitai Bot Dec 6, 2025

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🔴 Critical

Homebrew path is hardcoded to Apple Silicon Macs only.

The absolute path /opt/homebrew/bin/brew only works on Apple Silicon Macs. Intel Macs use /usr/local/bin/brew, and the script will fail silently on unsupported architectures due to set -e. This breaks portability.

Consider using a more robust approach that detects the correct Homebrew path:

-/opt/homebrew/bin/brew upgrade
+if command -v brew &> /dev/null; then
+  brew upgrade
+else
+  echo "Error: brew not found in PATH" >&2
+  exit 1
+fi

Alternatively, if the script is intentionally Apple Silicon-only, document this constraint clearly in a comment or README.

🤖 Prompt for AI Agents 
In home-manager/services/brew-upgrader/upgrade.sh around line 5, the script
hardcodes /opt/homebrew/bin/brew which only exists on Apple Silicon and will
fail on Intel Macs; replace the hardcoded path with logic that locates Homebrew
dynamically (e.g., use command -v brew or check common locations like
/opt/homebrew/bin/brew and /usr/local/bin/brew) and fail with a clear error if
not found, or if the script is intended to be Apple Silicon–only, add a top-line
comment and README note documenting that constraint.

@cubic-dev-ai cubic-dev-ai Bot Dec 6, 2025 •
edited
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P3: Hardcoded Homebrew path is specific to Apple Silicon Macs. On Intel Macs, Homebrew is at /usr/local/bin/brew. Consider using a conditional or checking for the path existence, though this may be intentional if only targeting ARM Macs.

Prompt for AI agents 
Check if this issue is valid — if so, understand the root cause and fix it. At home-manager/services/brew-upgrader/upgrade.sh, line 5:

<comment>Hardcoded Homebrew path is specific to Apple Silicon Macs. On Intel Macs, Homebrew is at `/usr/local/bin/brew`. Consider using a conditional or checking for the path existence, though this may be intentional if only targeting ARM Macs.</comment>

<file context>
@@ -2,4 +2,4 @@
 set -euo pipefail
 
-brew upgrade
+/opt/homebrew/bin/brew upgrade
</file context>
Suggested change
/opt/homebrew/bin/brew upgrade
BREW_PATH="/opt/homebrew/bin/brew"
[ -x "$BREW_PATH" ] || BREW_PATH="/usr/local/bin/brew"
"$BREW_PATH" upgrade
Fix with Cubic

Copilot AI Dec 6, 2025

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The hardcoded path /opt/homebrew/bin/brew only works on Apple Silicon Macs. Intel Macs install Homebrew to /usr/local/bin/brew.

Consider using a fallback pattern like other scripts in this codebase:

if [ -x /opt/homebrew/bin/brew ]; then
  /opt/homebrew/bin/brew upgrade
elif [ -x /usr/local/bin/brew ]; then
  /usr/local/bin/brew upgrade
else
  echo "brew binary not found" >&2
  exit 1
fi

This pattern is used in home-manager/services/ollama/default.nix:11-14 and home-manager/services/cliproxyapi/start.sh:33-36.

Suggested change
/opt/homebrew/bin/brew upgrade
if [ -x /opt/homebrew/bin/brew ]; then
/opt/homebrew/bin/brew upgrade
elif [ -x /usr/local/bin/brew ]; then
/usr/local/bin/brew upgrade
else
echo "brew binary not found" >&2
exit 1
fi

Copilot uses AI. Check for mistakes.

Copilot AI Dec 6, 2025

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The hardcoded path /opt/homebrew/bin/brew assumes Homebrew is installed at the default Apple Silicon location. This will fail on Intel Macs where Homebrew is at /usr/local/bin/brew. Consider checking both locations or using the PATH from the launchd agent configuration which already includes both paths.

Suggested change
/opt/homebrew/bin/brew upgrade
PATH="/opt/homebrew/bin:/usr/local/bin:$PATH"
brew upgrade

Copilot uses AI. Check for mistakes.
Loading