diff options
Diffstat (limited to '.config/nvim/lua/configs')
| -rw-r--r-- | .config/nvim/lua/configs/basic.lua | 1 | ||||
| -rw-r--r-- | .config/nvim/lua/configs/filetype.lua | 7 | ||||
| -rw-r--r-- | .config/nvim/lua/configs/lazyvim.lua | 40 | ||||
| -rw-r--r-- | .config/nvim/lua/configs/lsp.lua | 48 | ||||
| -rw-r--r-- | .config/nvim/lua/configs/vim-plug.lua | 8 |
5 files changed, 56 insertions, 48 deletions
diff --git a/.config/nvim/lua/configs/basic.lua b/.config/nvim/lua/configs/basic.lua index f4ccce1..b39412c 100644 --- a/.config/nvim/lua/configs/basic.lua +++ b/.config/nvim/lua/configs/basic.lua @@ -61,7 +61,6 @@ vim.keymap.set('n', '<A-k>', '<cmd>wincmd k<CR>', { desc = 'Move cursor to windo vim.keymap.set('n', '<A-j>', '<cmd>wincmd j<CR>', { desc = 'Move cursor to window below' }) vim.keymap.set('n', '<A-h>', '<cmd>wincmd h<CR>', { desc = 'Move cursor to window left' }) vim.keymap.set('n', '<A-l>', '<cmd>wincmd l<CR>', { desc = 'Move cursor to window right' }) --------------------------------------------- ----------------- -- Diagnostics -- diff --git a/.config/nvim/lua/configs/filetype.lua b/.config/nvim/lua/configs/filetype.lua deleted file mode 100644 index 82725e2..0000000 --- a/.config/nvim/lua/configs/filetype.lua +++ /dev/null @@ -1,7 +0,0 @@ -vim.filetype.add({ - extension = { - mq4 = "c", - mq5 = "cpp", - mqh = "cpp", - } -}) diff --git a/.config/nvim/lua/configs/lazyvim.lua b/.config/nvim/lua/configs/lazyvim.lua deleted file mode 100644 index 0b643b4..0000000 --- a/.config/nvim/lua/configs/lazyvim.lua +++ /dev/null @@ -1,40 +0,0 @@ -local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" -if not vim.loop.fs_stat(lazypath) then - vim.fn.system({ - "git", - "clone", - "--filter=blob:none", - "https://github.com/folke/lazy.nvim.git", - "--branch=stable", -- latest stable release - lazypath, - }) -end -vim.opt.rtp:prepend(lazypath) - --- Rename Tmux Window to File Opened by Neovim --- https://github.com/Dyslectric/neovim-tmux-window-rename -if vim.env.TMUX ~= nil then - -- Define an autocommand for BufEnter and FocusGained events - vim.api.nvim_create_autocmd({"BufEnter", "FocusGained"}, { - pattern = "*", - callback = function() - local file_name = vim.fn.expand("%:t") - local folder_name = vim.fn.expand("%:p:h:t") - local tmux_command = string.format( - "tmux rename-window 'Nv:%s/%s'", folder_name, file_name - ) - vim.fn.system(tmux_command) - end - }) - - -- Define an autocommand for the VimLeave event - vim.api.nvim_create_autocmd("VimLeave", { - pattern = "*", - callback = function() - local shell = vim.env.SHELL or "sh" - vim.fn.system("tmux set-window-option automatic-rename on") - end - }) -end - -require("lazy").setup("plugins") diff --git a/.config/nvim/lua/configs/lsp.lua b/.config/nvim/lua/configs/lsp.lua new file mode 100644 index 0000000..7acbeba --- /dev/null +++ b/.config/nvim/lua/configs/lsp.lua @@ -0,0 +1,48 @@ +-- Language server for specified languages +-- Hover with 'K' +-- Goto definition with :Goto +-- Open code action with :Codeact + +local servers = { + "lua_ls", "bashls", "clangd", "marksman", "pyright", "lemminx", +} + +vim.pack.add({ + { + src = "https://github.com/mason-org/mason.nvim.git", + version = 'main', + }, + { + src = "https://github.com/mason-org/mason-lspconfig.nvim.git", + version = 'main', + }, +}) + +require("mason").setup({}) +require("mason-lspconfig").setup({ + ensure_installed = servers, + automatic_installation = true, + automatic_enable = true, +}) + +-- Key mapping +-- Hover for definition +vim.keymap.set('n', 'K', vim.lsp.buf.hover, {}) + +-- Move to definition +vim.api.nvim_create_user_command( + "Goto", + function() + vim.lsp.buf.definition() + end, + {} +) + +-- Code action +vim.api.nvim_create_user_command( + "Codeact", + function() + vim.lsp.buf.code_action() + end, + {} +) diff --git a/.config/nvim/lua/configs/vim-plug.lua b/.config/nvim/lua/configs/vim-plug.lua new file mode 100644 index 0000000..01620e1 --- /dev/null +++ b/.config/nvim/lua/configs/vim-plug.lua @@ -0,0 +1,8 @@ +vim.api.nvim_create_user_command( + "Update", + function() + vim.pack.update() + end, + {} +) + |
