From e9005d0c923d0473b85f0ac37bf15d3f06d13a3b Mon Sep 17 00:00:00 2001 From: Fabian Becker Date: Thu, 20 May 2021 08:58:27 +0200 Subject: [PATCH] Move more keybindings to lua, remove dashboard --- .config/nvim/init.lua | 1 - .config/nvim/lua/keymappings.lua | 11 ++++------- .config/nvim/lua/lsp/python-ls.lua | 4 ++-- .config/nvim/lua/plugins/which-key.lua | 6 +++++- .config/nvim/vim-plug/plugins.vim | 6 ++---- 5 files changed, 13 insertions(+), 15 deletions(-) diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index 7624f6a..c492626 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -4,7 +4,6 @@ require('settings') -- Convert to lua vim.cmd('source ~/.config/nvim/vim-plug/plugins.vim') - require('colorscheme') require('lsp') diff --git a/.config/nvim/lua/keymappings.lua b/.config/nvim/lua/keymappings.lua index e31c614..6223e12 100644 --- a/.config/nvim/lua/keymappings.lua +++ b/.config/nvim/lua/keymappings.lua @@ -23,14 +23,11 @@ vim.cmd([[ tnoremap ]]) --- TODO fix this -- resize with arrows -vim.cmd([[ - nnoremap :resize -2 - nnoremap :resize +2 - nnoremap :vertical resize +2 - nnoremap :vertical resize -2 -]]) +vim.api.nvim_set_keymap('n', '', ':resize -2', {silent = true}) +vim.api.nvim_set_keymap('n', '', ':resize +2', {silent = true}) +vim.api.nvim_set_keymap('n', '', ':vertical resize -2', {silent = true}) +vim.api.nvim_set_keymap('n', '', ':vertical resize +2', {silent = true}) -- improved keyboard support for navigation (especially terminal) vim.cmd([[ diff --git a/.config/nvim/lua/lsp/python-ls.lua b/.config/nvim/lua/lsp/python-ls.lua index f9af265..b1759ce 100644 --- a/.config/nvim/lua/lsp/python-ls.lua +++ b/.config/nvim/lua/lsp/python-ls.lua @@ -13,8 +13,8 @@ require'lspconfig'.pyright.setup { settings = { python = { analysis = { - typeCheckingMode = O.python.analysis.type_checking, - autoSearchPaths = O.python.analysis.auto_search_paths, + typeCheckingMode = O.python.analysis.type_checking, + autoSearchPaths = O.python.analysis.auto_search_paths, useLibraryCodeForTypes = O.python.analysis.use_library_code_types } } diff --git a/.config/nvim/lua/plugins/which-key.lua b/.config/nvim/lua/plugins/which-key.lua index c6b179f..fbcb62c 100644 --- a/.config/nvim/lua/plugins/which-key.lua +++ b/.config/nvim/lua/plugins/which-key.lua @@ -108,7 +108,11 @@ local mappings = { R = {"Telescope registers", "Registers"}, t = {"Telescope live_grep", "Text"} }, - S = {name = "+Session", s = {"SessionSave", "Save Session"}, l = {"SessionLoad", "Load Session"}} + S = { + name = "+Session", + s = {"SessionSave", "Save Session"}, + l = {"SessionLoad", "Load Session"} + } } local wk = require("which-key") diff --git a/.config/nvim/vim-plug/plugins.vim b/.config/nvim/vim-plug/plugins.vim index 26ed7c6..74f7a5a 100644 --- a/.config/nvim/vim-plug/plugins.vim +++ b/.config/nvim/vim-plug/plugins.vim @@ -43,9 +43,6 @@ call plug#begin() " Easy commenting for Vim Plug 'preservim/nerdcommenter' - " Dashboard - Plug 'glepnir/dashboard-nvim' - " NERD Tree - tree explorer " https://github.com/scrooloose/nerdtree " http://usevim.com/2012/07/18/nerdtree/ @@ -55,7 +52,7 @@ call plug#begin() " nerdtree-git-plugin - show git status in NERD Tree " https://github.com/Xuyuanp/nerdtree-git-plugi - Plug 'Xuyuanp/nerdtree-git-plugin' + " Plug 'Xuyuanp/nerdtree-git-plugin' " Enforce editor settings " https://github.com/editorconfig/editorconfig-vim @@ -65,6 +62,7 @@ call plug#begin() Plug 'neovim/nvim-lspconfig' Plug 'hrsh7th/nvim-compe' Plug 'glepnir/lspsaga.nvim' + Plug 'kabouzeid/nvim-lspinstall' " Terminal in floating window Plug 'voldikss/vim-floaterm'