dannydannydanny/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(neovim): guard NixOS module to Linux for nix-darwin compatibility 🔧

Browse source 
- wrap Neovim module in `lib.mkIf pkgs.stdenv.isLinux` (no-op on macOS)
- add `lib` to module args
- fix Lua message var: use `config_file` instead of undefined `file`
- keep existing plugins and customRC on Linux unchanged
This commit is contained in:
DannyDannyDanny 2025-09-08 19:46:49 +02:00
parent ecade3a03e
commit b7f63f305d
2 changed files with 73 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

1
nixos/hosts/macos.nix
View file

@ -62,6 +62,7 @@
fzf fzf
cowsay cowsay
lolcat lolcat
neovim
]; ];
# Keep for darwin as well (tracks defaults across upgrades) # Keep for darwin as well (tracks defaults across upgrades)

17
nixos/neovim.nix
View file

@ -1,9 +1,12 @@
{ config, pkgs, ... }: { lib, config, pkgs, ... }:
{ {
# Only apply the Neovim NixOS module options on Linux.
config = lib.mkIf pkgs.stdenv.isLinux {
programs.neovim = { programs.neovim = {
enable = true; enable = true;
defaultEditor = true; defaultEditor = true;
configure = { configure = {
customRC = '' customRC = ''
set title set title
@ -18,7 +21,6 @@
local f = io.open(config_file, "r") local f = io.open(config_file, "r")
if f ~= nil then if f ~= nil then
local system_theme = f:read() local system_theme = f:read()
-- f:close()
io.close(f) io.close(f)
if system_theme == 'dark' then if system_theme == 'dark' then
vim.cmd("set bg=dark") vim.cmd("set bg=dark")
@ -27,11 +29,11 @@
else else
print('warning: expected value "light" or "dark"') print('warning: expected value "light" or "dark"')
print(' got:', system_theme) print(' got:', system_theme)
print(' expected path:', file) print(' expected path:', config_file)
end end
else else
print('warning: nvim color scheme not found') print('warning: nvim color scheme not found')
print(' expected path:', file) print(' expected path:', config_file)
end end
EOF EOF
@ -56,14 +58,15 @@
set spell spelllang=en_us set spell spelllang=en_us
setlocal spell! spelllang=en_us setlocal spell! spelllang=en_us
''; '';
# vimPlugins inspired from Alexnortung # vimPlugins inspired from Alexnortung
# https://discourse.nixos.org/t/neovim-no-longer-uses-config-or-plugins/13399/4 # https://discourse.nixos.org/t/neovim-no-longer-uses-config-or-plugins/13399/4
packages.nix = with pkgs.vimPlugins; { packages.nix = with pkgs.vimPlugins; {
start = [ start = [
vim-surround # shortcuts for setting () {} etc. vim-surround # shortcuts for setting () {} etc.
vim-gitgutter # git diff in sign column vim-gitgutter # git diff in sign column
# vim-airline # nice and light status bar # doesn't work nicely with tmux # vim-airline # nice and light status bar (disabled for tmux)
# coc-nvim coc-git coc-highlight coc-python coc-rls coc-vetur coc-vimtex coc-yaml coc-html coc-json # auto completion # coc-nvim coc-* plugins (disabled for now)
vim-nix # nix highlight vim-nix # nix highlight
vimtex # latex stuff vimtex # latex stuff
fzf-vim # fuzzy finder through vim fzf-vim # fuzzy finder through vim
@ -78,5 +81,5 @@
}; };
}; };
}; };
};
} }