Compare commits

...
Sign in to create a new pull request.

2 commits
main ... work

Author SHA1 Message Date
Mariano Uvalle
8917eae531 Add window movements 2024-04-28 00:31:18 +00:00
Mariano Uvalle
5178f457ec plugin fixes 2024-04-28 00:31:06 +00:00
6 changed files with 37 additions and 16 deletions

View file

@ -1,5 +1,4 @@
require('settings')
require('keymappings')
require('nv-globals')
require('plugins')
require('colorscheme')
@ -10,8 +9,8 @@ require('keymappings')
require('lsp')
require('lsp.typescript-ls')
require('lsp.python-ls')
require('lsp.lua-ls')
require('lsp.elixir-ls')
-- require('lsp.lua-ls')
-- require('lsp.elixir-ls')
require('lsp.go-ls')
require('lsp.ocaml-ls')
-- require('lsp.sml-ls')

View file

@ -33,6 +33,11 @@ vim.api.nvim_set_keymap('t', '<C-g>', '<ESC>', {silent = true})
-- Move right when in insert mode.
vim.api.nvim_set_keymap("i", '<C-l>', '<Right>', {noremap = true, silent = true})
-- Easily move between windows
vim.api.nvim_set_keymap("n", '<Leader>wm', '<C-w>h', {silent = true})
vim.api.nvim_set_keymap("n", '<Leader>wn', '<C-w>j', {silent = true})
vim.api.nvim_set_keymap("n", '<Leader>we', '<C-w>k', {silent = true})
vim.api.nvim_set_keymap("n", '<Leader>wi', '<C-w>l', {silent = true})
-- Quick save.
vim.api.nvim_set_keymap('n', '<Leader>fw', ':w<CR>', {silent = true})

View file

@ -6,7 +6,7 @@ lspconfig.gopls.setup {
-- floating_window = true,
--hint_enable = true,
fix_pos = true,
use_lspsaga = true,
-- use_lspsaga = true,
handler_opts = {
border = "rounded" -- double, single, shadow, none
},
@ -28,7 +28,7 @@ lspconfig.gopls.setup {
}
------ Configre vim-go
------ Configure vim-go
-- Disable autocomplete since we already have it with native lsp.
vim.g.go_code_completion_enabled = 0
-- Disable gopls for the same reasons as above.
@ -39,8 +39,9 @@ vim.g.go_fmt_command = 'gofmt'
vim.g.go_fmt_options = {
gofmt = '-s',
}
vim.g.go_imports_mode = 'goimports'
vim.g.go_mod_fmt_autosave = 1
vim.g.go_imports_autosave = 1
-- Could confilg with lsp saga, should experiment.
vim.g.go_doc_keywordprg_enabled = 0

View file

@ -1,5 +1,6 @@
local lsp = vim.lsp
local handlers = lsp.handlers
local keymap = vim.keymap.set
-- Hover doc popup
local pop_opts = { border = "rounded", max_width = 80 }
@ -10,5 +11,7 @@ vim.api.nvim_set_keymap('n', '<Leader>lgd', '<cmd>lua vim.lsp.buf.definition()<C
vim.api.nvim_set_keymap('n', '<Leader>lgD', '<cmd>lua vim.lsp.buf.declaration()<CR>', {noremap = true, silent = true})
vim.api.nvim_set_keymap('n', '<Leader>lgr', '<cmd>lua vim.lsp.buf.references()<CR>', {noremap = true, silent = true})
vim.api.nvim_set_keymap('n', '<Leader>lgi', '<cmd>lua vim.lsp.buf.implementation()<CR>', {noremap = true, silent = true})
vim.api.nvim_set_keymap('n', '<Leader>lr', '<cmd>lua require("lspsaga.rename").rename()<CR>', {noremap = true, silent = true})
-- vim.api.nvim_set_keymap('n', '<Leader>lr', '<cmd>lua require("lspsaga.rename").rename()<CR>', {noremap = true, silent = true})
-- Rename all occurrences of the hovered word for the selected files
keymap("n", "<Leader>lr", "<cmd>Lspsaga rename ++project<CR>")
vim.api.nvim_set_keymap('n', 'K', '<cmd>lua vim.lsp.buf.hover()<CR>', {noremap = true, silent = true})

View file

@ -15,6 +15,3 @@ require'lspconfig'.tsserver.setup{
filetypes = { "javascript", "javascriptreact", "javascript.jsx", "typescript", "typescriptreact", "typescript.tsx" },
root_dir = require('lspconfig/util').root_pattern("package.json", "tsconfig.json", "jsconfig.json", ".git")
}
local saga = require 'lspsaga'
saga.init_lsp_saga()

View file

@ -14,7 +14,23 @@ return require('packer').startup(function(use)
-- LSP
use 'neovim/nvim-lspconfig'
use 'glepnir/lspsaga.nvim'
use({
'nvimdev/lspsaga.nvim',
after = 'nvim-lspconfig',
config = function()
require("lspsaga").setup({
lightbulb = {
enable = false,
sign = false,
},
})
end,
requires = {
{"nvim-tree/nvim-web-devicons"},
--Please make sure you install markdown and markdown_inline parser
{"nvim-treesitter/nvim-treesitter"}
}
})
use 'kabouzeid/nvim-lspinstall'
-- Autocomplete
use 'hrsh7th/nvim-compe'
@ -27,11 +43,11 @@ return require('packer').startup(function(use)
-- Syntax
use 'sheerun/vim-polyglot'
use {
'prettier/vim-prettier',
run = "yarn install",
ft = {"javascript", "typescript", "json"}
}
-- use {
-- 'prettier/vim-prettier',
-- run = "yarn install",
-- ft = {"javascript", "typescript", "json"}
-- }
use {'styled-components/vim-styled-components', branch = "main"}
use 'dominikduda/vim_current_word'
use {