Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
19a2fe4
fix(nvim): resolve healthcheck warnings and add missing formatter tools
shunkakinoki Apr 23, 2026
ff6f39a
fix(go,nix): resolve gotools bundle conflict and nixfmt deprecation w…
shunkakinoki Apr 23, 2026
4db1900
fix(nvim): enable copilot suggestions, add LSP servers and image tools
shunkakinoki Apr 23, 2026
03d3479
fix(nvim): fix overlapping keymaps and add keymap conflict check
shunkakinoki Apr 23, 2026
b1819df
fix(nvim): restore <leader>h as kill terminal, move hunks to <leader>H
shunkakinoki Apr 23, 2026
0402b47
chore: update claude plugins overrides
shunkakinoki Apr 23, 2026
7342b52
fix(nix): rename dockerfile-language-server-nodejs to dockerfile-lang…
shunkakinoki Apr 23, 2026
b8ef088
fix(shell): declare local before assign to satisfy SC2155
shunkakinoki Apr 23, 2026
bb2524d
chore: apply formatting
shunkakinoki Apr 23, 2026
8cd290f
refactor(docker): move docker packages into programs/docker
shunkakinoki Apr 23, 2026
b25bf3e
fix(nvim): move leader>dl to leader>xd, enforce keymap overlap check …
shunkakinoki Apr 23, 2026
fe1fcc5
fix(nvim): eliminate all keymap overlaps and enforce zero-overlap che…
shunkakinoki Apr 23, 2026
4419590
fix(nvim): remove duplicate nvim-surround setup from treesitter.lua
shunkakinoki Apr 23, 2026
0259c2b
fix(nvim): open temp file in keymap check to trigger BufEnter, remove…
shunkakinoki Apr 23, 2026
887ba68
fix(nvim): rename nvim-tree y/d/c to Y/D/C to eliminate which-key ove…
shunkakinoki Apr 23, 2026
6411fa3
fix(nvim): migrate nvim-surround to v4 keymap API
shunkakinoki Apr 23, 2026
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
5 changes: 5 additions & 0 deletions home-manager/packages/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ with pkgs;
kustomize
(if stdenv.isLinux && isDesktop then llama-cpp.override { vulkanSupport = true; } else llama-cpp)
llm
lsof
mariadb
mise
mkcert
Expand All @@ -94,6 +95,7 @@ with pkgs;
tmuxinator
tokei
tree
tree-sitter
turso-cli
uv
victorialogs
Expand Down Expand Up @@ -163,6 +165,7 @@ with pkgs;
ffmpeg
file-roller
gedit
ghostscript
ghostty
github-desktop
gnome-calculator
Expand All @@ -187,9 +190,11 @@ with pkgs;
hyprshell
hyprshot
hyprsunset
imagemagick
libnotify
linux-wallpaperengine
loupe
mermaid-cli
mpv
nautilus
networkmanagerapplet
Expand Down
2 changes: 2 additions & 0 deletions home-manager/programs/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ let
cass = import ./cass;
clang = import ./clang;
dart = import ./dart;
docker = import ./docker;
delta = import ./delta;
direnv = import ./direnv;
elixir = import ./elixir;
Expand Down Expand Up @@ -59,6 +60,7 @@ in
cass
clang
dart
docker
delta
direnv
elixir
Expand Down
6 changes: 6 additions & 0 deletions home-manager/programs/docker/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{ pkgs, ... }:
{
home.packages = with pkgs; [
dockerfile-language-server-nodejs
];
}
3 changes: 2 additions & 1 deletion home-manager/programs/go/default.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{ pkgs, ... }:
{ pkgs, lib, ... }:
{
home.packages = with pkgs; [
go
(lib.lowPrio gotools)
gopls
];
}
1 change: 1 addition & 0 deletions home-manager/programs/lua/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
home.packages = with pkgs; [
lua
lua-language-server
stylua
];
}
2 changes: 1 addition & 1 deletion home-manager/programs/neovim/lua/config/completion.lua
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ cmp.setup.cmdline(":", {
-- GitHub Copilot helper with inline suggestions disabled by default.
-- From: https://github.com/zbirenbaum/copilot.lua
require("copilot").setup({
suggestion = { enabled = false },
suggestion = { enabled = true },

@cubic-dev-ai cubic-dev-ai Bot Apr 23, 2026 •

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.

P2: Keep copilot.lua inline suggestions disabled when using copilot-cmp; enabling them can interfere with cmp completions.

Prompt for AI agents
Check if this issue is valid — if so, understand the root cause and fix it. At home-manager/programs/neovim/lua/config/completion.lua, line 76:

<comment>Keep copilot.lua inline suggestions disabled when using copilot-cmp; enabling them can interfere with cmp completions.</comment>

<file context>
@@ -73,7 +73,7 @@ cmp.setup.cmdline(":", {
 -- From: https://github.com/zbirenbaum/copilot.lua
 require("copilot").setup({
-	suggestion = { enabled = false },
+	suggestion = { enabled = true },
 	panel = { enabled = false },
 })
</file context>
Suggested change
suggestion = { enabled = true },
suggestion = { enabled = false },
Fix with Cubic

panel = { enabled = false },
})
Comment on lines 73 to 78

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 | 🟠 Major

🧩 Analysis chain

🌐 Web query:

copilot-cmp README recommendation on copilot.lua suggestion.enabled setting

💡 Result:

The copilot-cmp README recommends disabling the suggestion module in copilot.lua when using copilot-cmp. Specifically, set suggestion.enabled = false (along with panel.enabled = false) in the copilot.lua setup to prevent interference with completions appearing properly in the nvim-cmp menu provided by copilot-cmp.

Citations:


🏁 Script executed:

# Check if the file exists and examine lines 73-78
if [ -f "home-manager/programs/neovim/lua/config/completion.lua" ]; then
  echo "=== completion.lua lines 70-80 ==="
  sed -n '70,80p' "home-manager/programs/neovim/lua/config/completion.lua"
else
  find . -name "completion.lua" -type f | head -5
fi

Repository: shunkakinoki/dotfiles

Length of output: 377


🏁 Script executed:

# Check the test file for assertion about suggestion.enabled
if [ -f "home-manager/programs/neovim/tests/completion_spec.lua" ]; then
  echo "=== completion_spec.lua lines 135-145 ==="
  sed -n '135,145p' "home-manager/programs/neovim/tests/completion_spec.lua"
else
  find . -name "completion_spec.lua" -type f | head -5
fi

Repository: shunkakinoki/dotfiles

Length of output: 447


🏁 Script executed:

# Check for copilot-cmp configuration at lines 6 and 39 in completion.lua
if [ -f "home-manager/programs/neovim/lua/config/completion.lua" ]; then
  echo "=== completion.lua lines 1-50 (to find copilot-cmp usage) ==="
  sed -n '1,50p' "home-manager/programs/neovim/lua/config/completion.lua"
fi

Repository: shunkakinoki/dotfiles

Length of output: 1640


Stale comment, failing test, and configuration conflicts with copilot-cmp upstream guidance.

Three issues with suggestion.enabled = true:

  1. Stale comment: Line 73 claims inline suggestions are "disabled by default" but the code enables them.
  2. Test will fail: completion_spec.lua:139-140 asserts suggestion.enabled = false; this assertion fails with the current code.
  3. Upstream conflict: copilot-cmp README recommends disabling suggestion.enabled when using copilot-cmp to prevent ghost text and menu suggestions from conflicting. The code sets copilot_cmp.setup() (line 6) and includes { name = "copilot" } in cmp.config.sources (line 39), making the dual activation problematic.
🔧 Proposed fix
-- GitHub Copilot helper with inline suggestions disabled by default.
+-- GitHub Copilot helper configured for nvim-cmp.
 -- From: https://github.com/zbirenbaum/copilot.lua
 require("copilot").setup({
-	suggestion = { enabled = true },
+	suggestion = { enabled = false },
 	panel = { enabled = false },
 })

Ensure completion_spec.lua:139-140 test expectations align with this change.

🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.

In `@home-manager/programs/neovim/lua/config/completion.lua` around lines 73 - 78,
The current copilot setup enables inline suggestions (suggestion.enabled = true)
which contradicts the comment, breaks the test (completion_spec.lua assertions
expecting false) and conflicts with copilot-cmp usage; change the copilot
configuration in copilot.setup to set suggestion.enabled = false, update or
remove the stale comment about "disabled by default", and ensure
copilot_cmp.setup() + the { name = "copilot" } entry in cmp.config.sources
remain compatible (i.e., disable inline(gottxt) suggestions via
suggestion.enabled so only copilot-cmp provides completions) and then adjust
completion_spec.lua expectations if you intend to keep inline suggestions
enabled in a different test setup.


Expand Down
8 changes: 7 additions & 1 deletion home-manager/programs/neovim/lua/config/ui.lua
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,13 @@ require("which-key").setup({})

-- Shows non-blocking LSP progress spinners in the corner.
-- From: https://github.com/j-hui/fidget.nvim
require("fidget").setup({})
require("fidget").setup({
notification = {
window = {
avoid = { "NvimTree" },
},
},
})

-- Makes directories editable as buffers for quick navigation.
-- From: https://github.com/stevearc/oil.nvim
Expand Down
16 changes: 8 additions & 8 deletions home-manager/programs/neovim/nvim-pack-lock.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"plugins": {
"LuaSnip": {
"rev": "3732756842a2f7e0e76a7b0487e9692072857277",
"rev": "dae4f5aaa3574bd0c2b9dd20fb9542a02c10471c",
"src": "https://github.com/L3MON4D3/LuaSnip"
},
"auto-dark-mode.nvim": {
Expand Down Expand Up @@ -54,7 +54,7 @@
"src": "https://github.com/zbirenbaum/copilot-cmp"
},
"copilot.lua": {
"rev": "4383e05a47493d7ff77b058c0548129eb38ec7fb",
"rev": "8e2a91828210d6043744468f6d7027d256a41f42",
"src": "https://github.com/zbirenbaum/copilot.lua"
},
"dracula.nvim": {
Expand Down Expand Up @@ -90,7 +90,7 @@
"src": "https://github.com/lewis6991/gitsigns.nvim"
},
"grug-far.nvim": {
"rev": "b58b2d65863f4ebad88b10a1ddd519e5380466e0",
"rev": "dc4684e163971bb1f5bfb93fbd4bb3e892bf9b15",
"src": "https://github.com/MagicDuck/grug-far.nvim"
},
"gruvbox.nvim": {
Expand Down Expand Up @@ -142,15 +142,15 @@
"src": "https://github.com/kylechui/nvim-surround"
},
"nvim-tree.lua": {
"rev": "3fb91e18a727ecc0385637895ec397dea90be42a",
"rev": "b3772adec8db61ba9098c5624a0823a77be3a23d",
"src": "https://github.com/nvim-tree/nvim-tree.lua"
},
"nvim-treesitter": {
"rev": "42fc28ba918343ebfd5565147a42a26580579482",
"rev": "2f5d4c3f3c675962242096bcc8e586d76dd72eb2",
"src": "https://github.com/nvim-treesitter/nvim-treesitter"
},
"nvim-treesitter-context": {
"rev": "660861b1849256398f70450afdf93908d28dc945",
"rev": "9a8e39993e3b895601bf8227124a48ea8268149e",
"src": "https://github.com/nvim-treesitter/nvim-treesitter-context"
},
"nvim-treesitter-endwise": {
Expand Down Expand Up @@ -194,7 +194,7 @@
"src": "https://github.com/folke/sidekick.nvim"
},
"snacks.nvim": {
"rev": "fe7cfe9800a182274d0f868a74b7263b8c0c020b",
"rev": "a049339328e2599ad6e85a69fa034ac501e921b2",
"src": "https://github.com/folke/snacks.nvim"
},
"telescope-fzf-native.nvim": {
Expand All @@ -210,7 +210,7 @@
"src": "https://github.com/nvim-telescope/telescope-ui-select.nvim"
},
"telescope.nvim": {
"rev": "83a3a713d6b2d2a408491a1b959e55a7fa8678e8",
"rev": "5255aa27c422de944791318024167ad5d40aad20",
"src": "https://github.com/nvim-telescope/telescope.nvim"
},
"todo-comments.nvim": {
Expand Down
1 change: 1 addition & 0 deletions home-manager/programs/nix/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
{
home.packages = with pkgs; [
nixd
nixfmt
];

}
2 changes: 2 additions & 0 deletions home-manager/programs/node/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,7 @@
home.packages = with pkgs; [
nodejs
typescript-language-server
vscode-langservers-extracted
vtsls
];
}
1 change: 1 addition & 0 deletions home-manager/programs/python/default.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{ pkgs, ... }:
{
home.packages = with pkgs; [
black
python3
pyright
];
Expand Down
Loading