thomasave
/
dotfiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

nvim config fixes

This commit is contained in:
Thomas Avé 2022-07-03 19:56:25 +02:00
parent f0a4e0da61
commit fe6b014271
5 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nvim/init.lua
View File

@ -34,8 +34,8 @@ require('packer').startup(function(use)
use {'glacambre/firenvim', run = function() vim.fn['firenvim#install'](0) end} use {'glacambre/firenvim', run = function() vim.fn['firenvim#install'](0) end}
end) end)
require('settings')
require('mappings') require('mappings')
require('settings')
require('lsp_config') require('lsp_config')
require('telescope-config') require('telescope-config')
require('trim').setup({ require('trim').setup({

4
nvim/lua/lsp_config.lua
View File

@ -123,6 +123,10 @@ require('lspconfig').vimls.setup {
capabilities = capabilities capabilities = capabilities
} }
require('lspconfig').yamlls.setup {
capabilities = capabilities
}
require('lspconfig').cssls.setup { require('lspconfig').cssls.setup {
capabilities = capabilities capabilities = capabilities
} }

4
nvim/lua/mappings.lua
View File

@ -2,6 +2,6 @@ vim.api.nvim_set_keymap("i", "jj", "<Esc>", {})
vim.api.nvim_set_keymap("n", "j", "gj", {}) vim.api.nvim_set_keymap("n", "j", "gj", {})
vim.api.nvim_set_keymap("n", "k", "gk", {}) vim.api.nvim_set_keymap("n", "k", "gk", {})
vim.api.nvim_set_keymap("n", "<S-k>", "<Nop>", {}) vim.api.nvim_set_keymap("n", "<S-k>", "<Nop>", {})
vim.api.nvim_set_keymap("n", "<C-U>", "<C-O>", {}) vim.api.nvim_set_keymap("n", "<C-U>", "<C-O>", { noremap = true })
vim.api.nvim_set_keymap("n", "<C-E>", "<C-U>", {}) vim.api.nvim_set_keymap("n", "<C-E>", "<C-U>", { noremap = true })
vim.api.nvim_set_keymap("n", "<leader><space>", ":noh<cr>", { silent = true }) vim.api.nvim_set_keymap("n", "<leader><space>", ":noh<cr>", { silent = true })

2
nvim/lua/settings.lua
View File

@ -11,7 +11,7 @@ vim.opt.incsearch = true
vim.opt.laststatus = 2 vim.opt.laststatus = 2
vim.opt.lbr = true vim.opt.lbr = true
vim.opt.modelines = 0 vim.opt.modelines = 0
vim.opt.mouse = a vim.opt.mouse = "a"
vim.opt.compatible = false vim.opt.compatible = false
vim.opt.modeline = false vim.opt.modeline = false
vim.opt.number = true vim.opt.number = true

2
nvim/lua/telescope-config.lua
View File

@ -25,6 +25,6 @@ telescope.load_extension('fzf')
vim.api.nvim_set_keymap("n", "<C-p>", "<CMD>lua require'telescope-config'.project_files()<CR>", {noremap = true, silent = true}) vim.api.nvim_set_keymap("n", "<C-p>", "<CMD>lua require'telescope-config'.project_files()<CR>", {noremap = true, silent = true})
vim.api.nvim_set_keymap("n", "<leader>/", "<cmd>lua require('telescope.builtin').live_grep{ cwd = vim.fn.systemlist(\"git rev-parse --show-toplevel 2> /dev/null || pwd\")[1] }<cr>", { silent = true }) vim.api.nvim_set_keymap("n", "<leader>/", "<cmd>lua require('telescope.builtin').live_grep{ cwd = vim.fn.systemlist(\"git rev-parse --show-toplevel 2> /dev/null || pwd\")[1] }<cr>", { silent = true })
vim.api.nvim_set_keymap("n", "<C-o>", "<cmd>Telescope buffers theme=ivy<cr>", { silent = true }) vim.api.nvim_set_keymap("n", "<C-O>", "<cmd>Telescope buffers theme=ivy<cr>", { silent = true, noremap = true })
return M return M