diff --git a/lua/config/keymaps.lua b/lua/config/keymaps.lua index 3537147..0431737 100644 --- a/lua/config/keymaps.lua +++ b/lua/config/keymaps.lua @@ -30,3 +30,12 @@ vim.keymap.set('n', '', ':tabclose') -- jump to definition in new tab vim.keymap.set('n', '', 'tab split | lua vim.lsp.buf.definition()', {}) + +-- change split window +vim.keymap.set('n', '', ':wincmd k') +vim.keymap.set('n', '', ':wincmd j') +vim.keymap.set('n', '', ':wincmd h') +vim.keymap.set('n', '', ':wincmd l') + +-- move split to tab +vim.keymap.set('n', '', ':tab split') diff --git a/lua/config/plugin/lsp_config.lua b/lua/config/plugin/lsp_config.lua index 090d10a..e0989bc 100644 --- a/lua/config/plugin/lsp_config.lua +++ b/lua/config/plugin/lsp_config.lua @@ -1,7 +1,8 @@ require("mason").setup() require("mason-lspconfig").setup({ }) -require("lspconfig").phpactor.setup({ +--require("lspconfig").phpactor.setup({ +vim.lsp.config.phpactor.setup({ on_attach = on_attach, init_options = { ["language_server_phpstan.enabled"] = false, diff --git a/lua/plugins/init.lua b/lua/plugins/init.lua index cda63ab..2359b75 100644 --- a/lua/plugins/init.lua +++ b/lua/plugins/init.lua @@ -50,7 +50,8 @@ return { --# deadcolumn, shows line limit when coming close 'Bekaboo/deadcolumn.nvim', --# colorizer, show hex and other colors e.g: #ADADBF - 'norcalli/nvim-colorizer.lua', + --'norcalli/nvim-colorizer.lua', looks unmaintained + 'NiklasV1/nvim-colorizer.lua', --# SyntaxAttr, display syntax highlighting 'vim-scripts/SyntaxAttr.vim', --# rainbow-delimiters, colors braces etc @@ -78,27 +79,34 @@ return { --# lsp, the lazy way { "dundalek/lazy-lsp.nvim", - commit="0ccc0238be37351d53e64c2f6c7f9e106e2bdb68", - dependencies = { - "neovim/nvim-lspconfig", - {"VonHeikemen/lsp-zero.nvim", branch = "v3.x"}, - "hrsh7th/cmp-nvim-lsp", - "hrsh7th/nvim-cmp", - }, + dependencies = { "neovim/nvim-lspconfig" }, config = function() - local lsp_zero = require("lsp-zero") - - lsp_zero.on_attach(function(client, bufnr) - -- see :help lsp-zero-keybindings to learn the available actions - lsp_zero.default_keymaps({ - buffer = bufnr, - preserve_mappings = false - }) - end) - require("lazy-lsp").setup {} - end, + end }, + --{ + -- "dundalek/lazy-lsp.nvim", + -- commit="0ccc0238be37351d53e64c2f6c7f9e106e2bdb68", + -- dependencies = { + -- "neovim/nvim-lspconfig", + -- {"VonHeikemen/lsp-zero.nvim", branch = "v3.x"}, + -- "hrsh7th/cmp-nvim-lsp", + -- "hrsh7th/nvim-cmp", + -- }, + -- config = function() + -- local lsp_zero = require("lsp-zero") + + -- lsp_zero.on_attach(function(client, bufnr) + -- -- see :help lsp-zero-keybindings to learn the available actions + -- lsp_zero.default_keymaps({ + -- buffer = bufnr, + -- preserve_mappings = false + -- }) + -- end) + + -- require("lazy-lsp").setup {} + -- end, + --}, -- Add scrollbar 'petertriho/nvim-scrollbar', } diff --git a/nvim.appimage b/nvim.appimage index 91a5bc7..50eee40 100755 Binary files a/nvim.appimage and b/nvim.appimage differ diff --git a/nvim.appimage.v10 b/nvim.appimage.v10 new file mode 100755 index 0000000..91a5bc7 Binary files /dev/null and b/nvim.appimage.v10 differ