Compare commits

..

3 commits

Author SHA1 Message Date
3418e6600b
Ssh, disable DefaultConfig to supress warning 2026-02-18 16:34:20 -08:00
63340c2aaa
Onizuka, update neovim config to match update 2026-02-18 16:23:26 -08:00
8786575166
Neovim, switch to nixvim and mono file
This merges all the different files into one app.nix using nixvim
instead of the manual home-manager nvim management.

Behavior should be almost unchanged, with the following changes:
- Plugins now have defaults for my own personal sane default experience
- The highlighted line is now 80 instead of 81
- Treesitter plugins may not be integrated correctly
2026-02-18 16:21:03 -08:00

View file

@ -68,11 +68,11 @@
smartcase = true; smartcase = true;
}; };
keymaps = with config.lib.nixvim; [ keymaps = [
{ {
key = "<leader>d"; key = "<leader>d";
mode = "n"; mode = "n";
action = mkRaw "vim.diagnostic.open_float"; action = "vim.diagnostic.open_float()";
} }
# -- Easy Split Navigation # -- Easy Split Navigation
# -- nnoremap <C-J> <C-W><C-J> # -- nnoremap <C-J> <C-W><C-J>
@ -111,19 +111,49 @@
cmp = { cmp = {
enable = nvimcmp.enable; enable = nvimcmp.enable;
autoEnableSources = true; autoEnableSources = true;
settings = { settings.sources = [
sources = [
{ name = "nvim_lsp"; } { name = "nvim_lsp"; }
{ name = "path"; } { name = "path"; }
{ name = "buffer"; } { name = "buffer"; }
] ++ lib.optional luasnip.enable { name = "cmp-luasnip"; }; ] ++ lib.optional luasnip.enable { name = "cmp-luasnip"; };
mapping = with config.lib.nixvim; { mapping = {
"<C-Space>" = mkRaw "cmp.mapping.abort()"; "<C-Space>" = "cmp.mapping.complete {}";
"<Tab>" = mkRaw "<CR>" = "cmp.mapping.confirm {
"cmp.mapping(cmp.mapping.select_next_item(), {'i', 's'})"; behavior = cmp.ConfirmBehavior.Replace,
"<S-Tab>" = mkRaw select = true,
"cmp.mapping(cmp.mapping.select_prev_item(), {'i', 's'})"; }";
"<Tab>" = {
actions = ''
function(fallback)
if cmp.visible() then
cmp.select_next_item()
'' + lib.optionalString luasnip.enable ''
elseif luasnip.expand_or_locally_jumpable() then
luasnip.expand_or_jump()
'' + ''
else
fallback()
end
end
'';
modes = [ "i" "s" ];
};
"<S-Tab>" = {
actions = ''
function(fallback)
if cmp.visible() then
cmp.select_prev_item()
'' + lib.optionalString luasnip.enable ''
elseif luasnip.locally_jumpable(-1) then
luasnip.jump(-1)
'' + ''
else
fallback()
end
end
'';
modes = [ "i" "s" ];
}; };
}; };
}; };
@ -149,7 +179,7 @@
enable = treesitter.enable; enable = treesitter.enable;
highlight.enable = true; highlight.enable = true;
indent.enable = true; indent.enable = true;
folding.enable = false; folding.enable = true;
}; };
vimwiki = { vimwiki = {