more neovim config

This commit is contained in:
Ivan Dimitrov 2023-07-13 22:05:53 +03:00
parent ecb5ae8f16
commit 0a752ee6f5
2 changed files with 52 additions and 13 deletions

View File

@ -1,12 +1,43 @@
vim.wo.number = true vim.wo.number = true
local nmap = function(keys, cmd) vim.keymap.set('n', keys, cmd, {noremap = true, silent = true}) end local nmap = function(keys, cmd)
vim.keymap.set('n', keys, cmd, {noremap = true, silent = true})
end
nmap('<Tab>', '<cmd>BufferNext<cr>') nmap('<Tab>', '<cmd>BufferNext<cr>')
nmap('<S-Tab>', '<cmd>BufferPrevious<cr>') nmap('<S-Tab>', '<cmd>BufferPrevious<cr>')
nmap('<C-t>', '<cmd>NvimTreeToggle<cr>')
-- START LSP
local cmp = require 'cmp'
local lspconfig = require('lspconfig')
local servers = {tsserver = {}, pylsp = {}, lua_ls = {}, rnix = {}}
local cmp_capabilities = require('cmp_nvim_lsp').default_capabilities()
cmp.setup({
snippet = {
expand = function(args) require('luasnip').lsp_expand(args.body) end
},
mapping = cmp.mapping.preset.insert({
['<C-Space>'] = cmp.mapping.complete(),
['<CR>'] = cmp.mapping.confirm({select = true})
}),
sources = cmp.config.sources({{name = 'nvim_lsp'}, {name = 'luasnip'}},
{{name = 'buffer'}})
})
for server, settings in pairs(servers) do
lspconfig[server].setup {
settings = settings,
capabilities = cmp_capabilities
}
end
-- END LSP
require("autoclose").setup()
require("nvim-tree").setup() require("nvim-tree").setup()
nmap('<C-t>', '<cmd>NvimTreeToggle<cr>')
require("catppuccin").setup({flavour = "mocha", transparent_background = true}) require("catppuccin").setup({flavour = "mocha", transparent_background = true})
vim.cmd.colorscheme "catppuccin" vim.cmd.colorscheme "catppuccin"

View File

@ -41,20 +41,28 @@
viAlias = true; viAlias = true;
extraPackages = with pkgs; [ extraPackages = with pkgs; [
alejandra alejandra
lua
luaformatter
lua-language-server
libclang libclang
lua
lua-language-server
nodePackages_latest.typescript-language-server
python311Packages.python-lsp-black
python311Packages.python-lsp-server
rnix-lsp rnix-lsp
stylua
]; ];
plugins = with pkgs.vimPlugins; [ plugins = with pkgs.vimPlugins; [
nvim-cmp autoclose-nvim
nvim-treesitter.withAllGrammars
nvim-tree-lua
telescope-nvim
catppuccin-nvim
nvim-web-devicons
barbar-nvim barbar-nvim
catppuccin-nvim
cmp-nvim-lsp
luasnip
nvim-cmp
nvim-cmp
nvim-lspconfig
nvim-tree-lua
nvim-treesitter.withAllGrammars
nvim-web-devicons
telescope-nvim
]; ];
extraLuaConfig = lib.fileContents ./cfg/nvim/init.lua; extraLuaConfig = lib.fileContents ./cfg/nvim/init.lua;
}; };