caspervk/nixos
1
0
Fork 0
Code Actions Activity

Compare commits

base: caspervk:0a4c9f20481d33dd51d4878c145038fe5bf88f52
Branches Tags
caspervk:master
caspervk:dev
..
compare: caspervk:231705fb607e03f3fe9af636468bbdbb21003ec7
Branches Tags
caspervk:master
caspervk:dev

No commits in common. "0a4c9f20481d33dd51d4878c145038fe5bf88f52" and "231705fb607e03f3fe9af636468bbdbb21003ec7" have entirely different histories.
0a4c9f2048 ... 231705fb60

1 changed files with 9 additions and 15 deletions
Show stats Expand all files Collapse all files

24
modules/base/vim.nix
View file

@ -60,7 +60,7 @@
-- gitsigns or LSP diagnostics. -- gitsigns or LSP diagnostics.
vim.opt.signcolumn = "yes" vim.opt.signcolumn = "yes"
-- Send CursorHold autocommand event after 100ms (instead of 4000ms -- Send CursorHold autocommend event after 100ms (instead of 4000ms
-- by default). Used, among other things, to highlight definitions -- by default). Used, among other things, to highlight definitions
-- with treesitter faster. -- with treesitter faster.
vim.opt.updatetime = 100 vim.opt.updatetime = 100
@ -180,10 +180,6 @@
overrides = function(colors) overrides = function(colors)
local theme = colors.theme local theme = colors.theme
return { return {
-- Transparent Floating Windows
NormalFloat = { bg = "none" },
FloatBorder = { bg = "none" },
FloatTitle = { bg = "none" },
-- Less pronounced cursorline -- Less pronounced cursorline
CursorLine = { bg = theme.ui.bg_p1 }, CursorLine = { bg = theme.ui.bg_p1 },
-- More pronounced window borders -- More pronounced window borders
@ -321,8 +317,12 @@
'' ''
local cmp = require("cmp") local cmp = require("cmp")
cmp.setup({ cmp.setup({
experimental = { snippet = {
ghost_text = true, -- Configuring a snippet engine is required. Configure
-- neovom's native one.
expand = function(args)
vim.snippet.expand(args.body)
end,
}, },
mapping = cmp.mapping.preset.insert({ mapping = cmp.mapping.preset.insert({
-- Use CTRL-{JK} to navigate and CTRL-L to confirm like -- Use CTRL-{JK} to navigate and CTRL-L to confirm like
@ -330,9 +330,7 @@
["<C-j>"] = cmp.mapping.select_next_item(), ["<C-j>"] = cmp.mapping.select_next_item(),
["<C-k>"] = cmp.mapping.select_prev_item(), ["<C-k>"] = cmp.mapping.select_prev_item(),
["<C-l>"] = cmp.mapping.confirm({ select = true }), ["<C-l>"] = cmp.mapping.confirm({ select = true }),
-- Also confirm with <Tab> -- Scroll documentatiion
["<Tab>"] = cmp.mapping.confirm({ select = true }),
-- Scroll documentation
["<C-u>"] = cmp.mapping.scroll_docs(-4), ["<C-u>"] = cmp.mapping.scroll_docs(-4),
["<C-d>"] = cmp.mapping.scroll_docs(4), ["<C-d>"] = cmp.mapping.scroll_docs(4),
-- Close completion menu -- Close completion menu
@ -344,11 +342,7 @@
}), }),
sources = cmp.config.sources({ sources = cmp.config.sources({
{ name = "nvim_lsp" }, { name = "nvim_lsp" },
}), })
window = {
completion = cmp.config.window.bordered(),
documentation = cmp.config.window.bordered(),
},
}) })
-- Add parentheses after selecting function or method item (nvim-autopairs). -- Add parentheses after selecting function or method item (nvim-autopairs).