user/neovim-minimal: further minimise
This commit is contained in:
parent
a4a38b4a8b
commit
3502a31065
2 changed files with 5 additions and 57 deletions
|
|
@ -11,9 +11,8 @@
|
|||
withNodeJs = false;
|
||||
|
||||
plugins = with pkgs.vimPlugins; [
|
||||
ctrlp-vim
|
||||
fzf-vim
|
||||
lualine-nvim
|
||||
nerdtree
|
||||
tokyonight-nvim
|
||||
vim-fugitive
|
||||
vim-nix
|
||||
|
|
@ -21,14 +20,7 @@
|
|||
vim-signify
|
||||
vim-surround
|
||||
|
||||
nvim-cmp
|
||||
nvim-lspconfig
|
||||
cmp-nvim-lsp
|
||||
cmp_luasnip
|
||||
luasnip
|
||||
|
||||
(nvim-treesitter.withPlugins (p: with p; [
|
||||
tree-sitter-comment
|
||||
tree-sitter-json
|
||||
tree-sitter-lua
|
||||
tree-sitter-nix
|
||||
|
|
|
|||
|
|
@ -5,11 +5,14 @@ map('n', '<C-J>', '<C-W>j', { noremap = true })
|
|||
map('n', '<C-K>', '<C-W>k', { noremap = true })
|
||||
map('n', '<C-L>', '<C-W>l', { noremap = true })
|
||||
map('n', '<C-Q>', ':q<CR>', { noremap = true })
|
||||
map('n', '<C-P>', ':Files<CR>', { noremap = true })
|
||||
|
||||
-- Autocommands
|
||||
vim.cmd('au BufEnter * set noro')
|
||||
vim.cmd('au CursorHold * lua vim.diagnostic.open_float(0, { scope = "line", focusable = false })')
|
||||
|
||||
-- Settings
|
||||
vim.opt.mouse = ""
|
||||
vim.opt.relativenumber = true
|
||||
vim.opt.number = true
|
||||
vim.opt.cursorline = true
|
||||
|
|
@ -43,56 +46,9 @@ vim.g.signify_sign_delete_first_line = '┏━'
|
|||
vim.g.signify_sign_change = vim.g.signify_sign_add
|
||||
vim.g.signify_sign_change_delete = vim.g.signify_sign_delete
|
||||
|
||||
-- Theming
|
||||
vim.g.tokyonight_style = 'night'
|
||||
vim.cmd[[
|
||||
syntax enable
|
||||
colorscheme tokyonight
|
||||
]]
|
||||
local colors = require("tokyonight.colors").setup {}
|
||||
vim.cmd("highlight SignifySignAdd guifg="..colors.green)
|
||||
vim.cmd("highlight SignifySignChange guifg="..colors.orange)
|
||||
vim.cmd("highlight SignifySignDelete guifg="..colors.red)
|
||||
vim.cmd("highlight SignifySignDeleteFirstLine guifg="..colors.red)
|
||||
vim.cmd("highlight SignifySignChangeDelete guifg="..colors.red)
|
||||
|
||||
-- Plugins
|
||||
require('nvim-treesitter.configs').setup {
|
||||
highlight = { enable = true },
|
||||
indent = { enable = false }
|
||||
}
|
||||
require('lualine').setup {
|
||||
options = {
|
||||
theme = 'tokyonight'
|
||||
}
|
||||
}
|
||||
|
||||
-- LSP
|
||||
local nvim_lsp = require('lspconfig')
|
||||
|
||||
local on_attach = function(client, bufnr)
|
||||
local function buf_set_keymap(...) vim.api.nvim_buf_set_keymap(bufnr, ...) end
|
||||
local function buf_set_option(...) vim.api.nvim_buf_set_option(bufnr, ...) end
|
||||
|
||||
buf_set_option('omnifunc', 'v:lua.vim.lsp.omnifunc')
|
||||
|
||||
local opts = { noremap = true, silent = true }
|
||||
|
||||
buf_set_keymap('n', 'gD', '<cmd>lua vim.lsp.buf.declaration()<CR>', opts)
|
||||
buf_set_keymap('n', 'gd', '<cmd>lua vim.lsp.buf.definition()<CR>', opts)
|
||||
buf_set_keymap('n', 'K', '<cmd>lua vim.lsp.buf.hover()<CR>', opts)
|
||||
buf_set_keymap('n', 'gi', '<cmd>lua vim.lsp.buf.implementation()<CR>', opts)
|
||||
buf_set_keymap('n', '<C-k>', '<cmd>lua vim.lsp.buf.signature_help()<CR>', opts)
|
||||
buf_set_keymap('n', '<space>wa', '<cmd>lua vim.lsp.buf.add_workspace_folder()<CR>', opts)
|
||||
buf_set_keymap('n', '<space>wr', '<cmd>lua vim.lsp.buf.remove_workspace_folder()<CR>', opts)
|
||||
buf_set_keymap('n', '<space>wl', '<cmd>lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))<CR>', opts)
|
||||
buf_set_keymap('n', '<space>D', '<cmd>lua vim.lsp.buf.type_definition()<CR>', opts)
|
||||
buf_set_keymap('n', '<space>rn', '<cmd>lua vim.lsp.buf.rename()<CR>', opts)
|
||||
buf_set_keymap('n', '<space>ca', '<cmd>lua vim.lsp.buf.code_action()<CR>', opts)
|
||||
buf_set_keymap('n', 'gr', '<cmd>lua vim.lsp.buf.references()<CR>', opts)
|
||||
buf_set_keymap('n', '<space>e', '<cmd>lua vim.diagnostic.open_float(0, { scope = "line" })<CR>', opts)
|
||||
buf_set_keymap('n', '[d', '<cmd>lua vim.lsp.diagnostic.goto_prev()<CR>', opts)
|
||||
buf_set_keymap('n', ']d', '<cmd>lua vim.lsp.diagnostic.goto_next()<CR>', opts)
|
||||
buf_set_keymap('n', '<space>q', '<cmd>lua vim.lsp.diagnostic.set_loclist()<CR>', opts)
|
||||
buf_set_keymap('n', '<space>f', '<cmd>lua vim.lsp.buf.formatting()<CR>', opts)
|
||||
end
|
||||
require('lualine').setup { }
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue