neovim: port to wrapNeovimUnstable

This commit is contained in:
Colin 2023-11-25 05:02:48 +00:00
parent 10aea555dd
commit 4c4a8a0897

View File

@ -87,57 +87,53 @@ in
{ {
sane.programs.neovim = { sane.programs.neovim = {
# package = config.programs.neovim.finalPackage; # package = config.programs.neovim.finalPackage;
package = pkgs.wrapNeovim pkgs.neovim-unwrapped { package = pkgs.wrapNeovimUnstable pkgs.neovim-unwrapped (pkgs.neovimUtils.makeNeovimConfig {
withRuby = false; #< doesn't cross-compile w/o binfmt withRuby = false; #< doesn't cross-compile w/o binfmt
viAlias = true; viAlias = true;
vimAlias = true; vimAlias = true;
configure = { plugins = plugin-packages;
packages.plugins = { customRC = ''
start = plugin-packages; " let the terminal handle mouse events, that way i get OS-level ctrl+shift+c/etc
}; " this used to be default, until <https://github.com/neovim/neovim/pull/19290>
customRC = '' set mouse=
" let the terminal handle mouse events, that way i get OS-level ctrl+shift+c/etc
" this used to be default, until <https://github.com/neovim/neovim/pull/19290>
set mouse=
" copy/paste to system clipboard " copy/paste to system clipboard
set clipboard=unnamedplus set clipboard=unnamedplus
" screw tabs; always expand them into spaces " screw tabs; always expand them into spaces
set expandtab set expandtab
" at least don't open files with sections folded by default " at least don't open files with sections folded by default
set nofoldenable set nofoldenable
" allow text substitutions for certain glyphs. " allow text substitutions for certain glyphs.
" higher number = more aggressive substitution (0, 1, 2, 3) " higher number = more aggressive substitution (0, 1, 2, 3)
" i only make use of this for tex, but it's unclear how to " i only make use of this for tex, but it's unclear how to
" apply that *just* to tex and retain the SyntaxRange stuff. " apply that *just* to tex and retain the SyntaxRange stuff.
set conceallevel=2 set conceallevel=2
" horizontal rule under the active line " horizontal rule under the active line
" set cursorline " set cursorline
" highlight trailing space & related syntax errors (doesn't seem to work??) " highlight trailing space & related syntax errors (doesn't seem to work??)
" let c_space_errors=1 " let c_space_errors=1
" let python_space_errors=1 " let python_space_errors=1
" enable highlighting of leading/trailing spaces, " enable highlighting of leading/trailing spaces,
" and especially tabs " and especially tabs
" source: https://www.reddit.com/r/neovim/comments/chlmfk/highlight_trailing_whitespaces_in_neovim/ " source: https://www.reddit.com/r/neovim/comments/chlmfk/highlight_trailing_whitespaces_in_neovim/
set list set list
set listchars=tab:\·,trail:·,extends:,precedes:,nbsp: set listchars=tab:\·,trail:·,extends:,precedes:,nbsp:
""""" PLUGIN CONFIG (vim) """"" PLUGIN CONFIG (vim)
${plugin-config-viml} ${plugin-config-viml}
""""" PLUGIN CONFIG (lua) """"" PLUGIN CONFIG (lua)
lua <<EOF lua <<EOF
${plugin-config-lua} ${plugin-config-lua}
EOF EOF
''; '';
}; });
};
# private because there could be sensitive things in the swap # private because there could be sensitive things in the swap
persist.byStore.private = [ ".cache/vim-swap" ]; persist.byStore.private = [ ".cache/vim-swap" ];