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)

141
nixos/neovim.nix
View file

@ -1,82 +1,85 @@
{ config, pkgs, ... }: { lib, config, pkgs, ... }:
{ {
programs.neovim = { # Only apply the Neovim NixOS module options on Linux.
enable = true; config = lib.mkIf pkgs.stdenv.isLinux {
defaultEditor = true; programs.neovim = {
configure = { enable = true;
customRC = '' defaultEditor = true;
set title
set go=a
set mouse=a
set nohlsearch
set number
let mapleader=","
lua << EOF configure = {
local config_file = os.getenv("HOME")..'/.local/share/nvim_color_scheme' customRC = ''
local f=io.open(config_file, "r") set title
if f~=nil then set go=a
local system_theme = f:read() set mouse=a
-- f:close() set nohlsearch
io.close(f) set number
if system_theme == 'dark' then let mapleader=","
vim.cmd("set bg=dark")
elseif system_theme == 'light' then
vim.cmd("set bg=light")
else
print('warning: expected value "light" or "dark"')
print(' got:', system_theme)
print(' expected path:', file)
end
else
print('warning: nvim color scheme not found')
print(' expected path:', file)
end
EOF
colorscheme catppuccin " catppuccin-latte, catppuccin-frappe, catppuccin-macchiato, catppuccin-mocha lua << EOF
local config_file = os.getenv("HOME")..'/.local/share/nvim_color_scheme'
local f = io.open(config_file, "r")
if f ~= nil then
local system_theme = f:read()
io.close(f)
if system_theme == 'dark' then
vim.cmd("set bg=dark")
elseif system_theme == 'light' then
vim.cmd("set bg=light")
else
print('warning: expected value "light" or "dark"')
print(' got:', system_theme)
print(' expected path:', config_file)
end
else
print('warning: nvim color scheme not found')
print(' expected path:', config_file)
end
EOF
" netrw (dir listing) settings colorscheme catppuccin " catppuccin-latte, catppuccin-frappe, catppuccin-macchiato, catppuccin-mocha
let g:netrw_liststyle = 3
let g:netrw_banner = 0
let g:netrw_browse_split = 3
let g:netrw_winsize = 25 " % of page
set listchars=tab:→\ ,space:·,nbsp:␣,trail:•,eol:,precedes:«,extends:» " netrw (dir listing) settings
set clipboard+=unnamedplus let g:netrw_liststyle = 3
let g:netrw_banner = 0
let g:netrw_browse_split = 3
let g:netrw_winsize = 25 " % of page
" Replace-all is aliased to S. set listchars=tab:→\ ,space:·,nbsp:␣,trail:•,eol:,precedes:«,extends:»
nnoremap S :%s//g<Left><Left> set clipboard+=unnamedplus
" save file with ,w " Replace-all is aliased to S.
map <leader>w :w<cr><Space> nnoremap S :%s//g<Left><Left>
" spellcheck " save file with ,w
set spell spelllang=en_us map <leader>w :w<cr><Space>
setlocal spell! spelllang=en_us
''; " spellcheck
# vimPlugins inspired from Alexnortung set spell spelllang=en_us
# https://discourse.nixos.org/t/neovim-no-longer-uses-config-or-plugins/13399/4 setlocal spell! spelllang=en_us
packages.nix = with pkgs.vimPlugins; { '';
start = [
vim-surround # shortcuts for setting () {} etc. # vimPlugins inspired from Alexnortung
vim-gitgutter # git diff in sign column # https://discourse.nixos.org/t/neovim-no-longer-uses-config-or-plugins/13399/4
# vim-airline # nice and light status bar # doesn't work nicely with tmux packages.nix = with pkgs.vimPlugins; {
# coc-nvim coc-git coc-highlight coc-python coc-rls coc-vetur coc-vimtex coc-yaml coc-html coc-json # auto completion start = [
vim-nix # nix highlight vim-surround # shortcuts for setting () {} etc.
vimtex # latex stuff vim-gitgutter # git diff in sign column
fzf-vim # fuzzy finder through vim # vim-airline # nice and light status bar (disabled for tmux)
nerdtree # file structure inside nvim # coc-nvim coc-* plugins (disabled for now)
rainbow # color parenthesis vim-nix # nix highlight
# gruvbox-nvim # theme vimtex # latex stuff
catppuccin-nvim # theme fzf-vim # fuzzy finder through vim
goyo-vim # write prose nerdtree # file structure inside nvim
limelight-vim # prose paragraph highlighter rainbow # color parenthesis
]; # gruvbox-nvim # theme
opt = []; catppuccin-nvim # theme
goyo-vim # write prose
limelight-vim # prose paragraph highlighter
];
opt = [];
};
}; };
}; };
}; };
} }