Skip to content

nvim exclude #372

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 6 commits into from
Nov 26, 2025
Merged

nvim exclude #372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2275ed1
fix: add exclusion for Neovim pack lock file in JSON formatter
shunkakinoki Nov 26, 2025
177a061
fix: remove Neovim pack lock file cleanup from sync process
shunkakinoki Nov 26, 2025
42f18d2
fix: add missing newline at end of nvim-pack-lock.json
shunkakinoki Nov 26, 2025
766a2b2
fix: add exclusion for nvim-pack-lock.json in formatter settings and …
shunkakinoki Nov 26, 2025
da94930
fix: replace Neovim pack lock exclusion with TOML settings in flake.nix
shunkakinoki Nov 26, 2025
b5f91d2
fix: update treefmt settings in flake.nix and ensure newline at end o…
shunkakinoki Nov 26, 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
8 changes: 0 additions & 8 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -489,14 +489,6 @@ neovim-update: ## Update Neovim plugins.
neovim-sync: ## Sync Neovim plugins.
@echo "🔄 Syncing neovim plugins..."
@nvim --headless +"lua vim.cmd('source ' .. vim.fn.stdpath('config') .. '/init.lua')" +qa
@if [ -f "$(PWD)/home-manager/programs/neovim/nvim-pack-lock.json" ]; then \
if [ "$$(uname)" = "Darwin" ]; then \
sed -i '' -e '$$ { /^$$/d; }' "$(PWD)/home-manager/programs/neovim/nvim-pack-lock.json"; \
else \
sed -i -e '$$ { /^$$/d; }' "$(PWD)/home-manager/programs/neovim/nvim-pack-lock.json"; \
fi && \
printf '\n' >> "$(PWD)/home-manager/programs/neovim/nvim-pack-lock.json"; \
fi
@echo "✅ Neovim plugins synced"

##@ Lua
Expand Down
23 changes: 19 additions & 4 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@
...
}:
let
inherit (inputs.nixpkgs) lib;
devenvRoot =
let
envRoot = builtins.getEnv "DEVENV_ROOT";
Expand All @@ -151,6 +152,23 @@
};
overlays = (import ./overlays) { inherit inputs; };
};
treefmtToml = builtins.fromTOML (builtins.readFile ./treefmt.toml);

@mesa-dot-dev mesa-dot-dev Bot Nov 26, 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.

Medium

This approach introduces significant architectural complexity. You're reading treefmt.toml, parsing it, then overriding commands manually with lib.recursiveUpdate. This creates duplication since treefmt.toml already defines these commands. The previous programs.jsonfmt.enable = true pattern was simpler and more maintainable. What specific problem does this refactoring solve?
Agent: 🏛 Architecture

treefmtSettings = lib.recursiveUpdate treefmtToml {
formatter = {
nix = (treefmtToml.formatter.nix or { }) // {
command = lib.getExe pkgs.nixfmt-rfc-style;
};
biome = (treefmtToml.formatter.biome or { }) // {
command = lib.getExe pkgs.biome;
};
json = (treefmtToml.formatter.json or { }) // {
command = lib.getExe pkgs.jsonfmt;
};
shell = (treefmtToml.formatter.shell or { }) // {
command = lib.getExe pkgs.shfmt;
};
};
};
Comment on lines +156 to +171

@gemini-code-assist gemini-code-assist Bot Nov 26, 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

The logic for constructing treefmtSettings can be simplified. Since you are using lib.recursiveUpdate, you don't need to manually merge each formatter's attributes with (treefmtToml.formatter.<name> or { }) // { ... }. The recursiveUpdate function will handle merging the command attribute into the existing formatter definitions from treefmt.toml correctly.

Simplifying this will make the code more concise and easier to read.

          treefmtSettings = lib.recursiveUpdate treefmtToml {
            formatter = {
              nix.command = lib.getExe pkgs.nixfmt-rfc-style;
              biome.command = lib.getExe pkgs.biome;
              json.command = lib.getExe pkgs.jsonfmt;
              shell.command = lib.getExe pkgs.shfmt;
            };
          };

in
{
# Force this attribute so devenv's deprecated helper packages don't surface during flake checks.
Expand All @@ -166,14 +184,11 @@
treefmt = {
projectRootFile = "flake.nix";
programs = {
biome.enable = true;
nixfmt.enable = true;
shfmt.enable = true;
stylua.enable = true;
taplo.enable = true;
jsonfmt.enable = true;
yamlfmt.enable = true;
};
settings = treefmtSettings;
};
};
};
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -174,4 +174,4 @@
"src": "https://github.com/christoomey/vim-tmux-navigator"
}
}
}
}
2 changes: 2 additions & 0 deletions home-manager/programs/zoxide/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
{
programs.zoxide = {
enable = true;
enableBashIntegration = true;
enableFishIntegration = true;
enableZshIntegration = true;
};
}
1 change: 1 addition & 0 deletions treefmt.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ excludes = ["*.json"]
[formatter.json]
command = "jsonfmt"
includes = ["*.json"]
excludes = ["home-manager/programs/neovim/nvim-pack-lock.json"]

[formatter.shell]
command = "shfmt"
Expand Down
Loading