2022-08-02 10:14:47 -04:00
|
|
|
vim.opt.syntax = 'on'
|
2022-09-09 15:03:24 -04:00
|
|
|
vim.cmd("filetype plugin indent on")
|
2022-08-02 10:14:47 -04:00
|
|
|
vim.opt.number = true
|
|
|
|
-- set relativenumber
|
2022-09-09 13:58:41 -04:00
|
|
|
vim.opt.relativenumber = false
|
2022-08-02 10:14:47 -04:00
|
|
|
--vim.opt.path += "**"
|
|
|
|
vim.opt.swapfile = false
|
|
|
|
vim.opt.wildmenu = true
|
|
|
|
vim.opt.backspace = "indent,eol,start"
|
|
|
|
vim.opt.undodir = "/home/ateijelo/.cache/nvim/undo"
|
|
|
|
vim.opt.undofile = true
|
|
|
|
vim.opt.incsearch = true
|
|
|
|
vim.opt.smartindent = true
|
|
|
|
vim.opt.ic = true
|
|
|
|
-- set colorcolumn=88
|
|
|
|
vim.opt.et = true
|
|
|
|
vim.opt.ts = 4
|
|
|
|
vim.opt.sw = 4
|
|
|
|
--set showmatch
|
|
|
|
vim.opt.hlsearch = true
|
|
|
|
--incsearch
|
2022-09-09 15:03:24 -04:00
|
|
|
vim.cmd("highlight ColorColumn ctermbg=9")
|
|
|
|
vim.cmd("autocmd FileType yaml,yaml.ansible setlocal indentkeys-=0#")
|
2022-08-02 10:14:47 -04:00
|
|
|
|
2022-08-16 15:23:30 -04:00
|
|
|
-- don't use NeoVim's thin cursor
|
|
|
|
vim.opt.guicursor = ""
|
|
|
|
|
2022-10-07 00:04:13 -04:00
|
|
|
require('plugins')
|
2022-08-17 08:05:34 -04:00
|
|
|
require("colorschemes")
|
2022-08-16 15:23:30 -04:00
|
|
|
|
2022-09-09 15:03:24 -04:00
|
|
|
vim.cmd("hi MatchParen cterm=bold,underline gui=bold,underline")
|
2022-09-09 13:58:41 -04:00
|
|
|
|
2022-08-16 15:23:30 -04:00
|
|
|
vim.api.nvim_set_keymap("n", "<SPACE>", "<Nop>", { noremap = true })
|
|
|
|
vim.g.mapleader = " "
|
|
|
|
|
2022-10-09 11:14:51 -04:00
|
|
|
local harpoon_ui = require("harpoon.ui")
|
|
|
|
local harpoon_mark = require("harpoon.mark")
|
|
|
|
for _, mode in ipairs({"n", "i", "v"}) do
|
|
|
|
vim.keymap.set(mode, '<A-h>', harpoon_ui.toggle_quick_menu)
|
|
|
|
vim.keymap.set(mode, '<A-m>', harpoon_mark.add_file)
|
|
|
|
vim.keymap.set(mode, '<A-a>', function() harpoon_ui.nav_file(1) end, { noremap = true })
|
|
|
|
vim.keymap.set(mode, '<A-s>', function() harpoon_ui.nav_file(2) end, { noremap = true })
|
|
|
|
vim.keymap.set(mode, '<A-d>', function() harpoon_ui.nav_file(3) end, { noremap = true })
|
|
|
|
vim.keymap.set(mode, '<A-f>', function() harpoon_ui.nav_file(4) end, { noremap = true })
|
|
|
|
vim.keymap.set(mode, '<A-g>', function() harpoon_ui.nav_file(5) end, { noremap = true })
|
|
|
|
end
|
|
|
|
|
|
|
|
for _, mode in ipairs({"n", "v"}) do
|
2022-08-02 10:14:47 -04:00
|
|
|
vim.api.nvim_set_keymap(mode, "<Up>", "g<Up>", { noremap = true })
|
|
|
|
vim.api.nvim_set_keymap(mode, "<Down>", "g<Down>", { noremap = true })
|
|
|
|
vim.api.nvim_set_keymap(mode, "<Left>", "<Nop>", { noremap = true })
|
|
|
|
vim.api.nvim_set_keymap(mode, "<Right>", "<Nop>", { noremap = true })
|
|
|
|
vim.api.nvim_set_keymap(mode, "<Down>", "<Nop>", { noremap = true })
|
|
|
|
vim.api.nvim_set_keymap(mode, "<Up>", "<Nop>", { noremap = true })
|
|
|
|
end
|
|
|
|
|
2022-10-09 11:14:51 -04:00
|
|
|
vim.api.nvim_set_keymap('v', "<M-j>", ":MoveBlock(1)<CR>", { noremap = true })
|
|
|
|
vim.api.nvim_set_keymap('v', "<M-k>", ":MoveBlock(-1)<CR>", { noremap = true })
|
|
|
|
|
2022-08-16 15:23:30 -04:00
|
|
|
vim.api.nvim_set_keymap("n", "<Leader>o", "<Cmd>lua vim.diagnostic.open_float()<CR>", { noremap = true })
|
2022-09-09 13:58:41 -04:00
|
|
|
vim.api.nvim_set_keymap("n", "<M-o>", "<Cmd>lua vim.diagnostic.open_float()<CR>", { noremap = true })
|
|
|
|
vim.api.nvim_set_keymap("n", "<Leader>i", "<Cmd>lua vim.lsp.buf.code_action()<CR>", { noremap = true })
|
|
|
|
vim.api.nvim_set_keymap("n", "<M-i>", "<Cmd>lua vim.lsp.buf.code_action()<CR>", { noremap = true })
|
2022-08-16 15:23:30 -04:00
|
|
|
|
2022-10-09 11:14:51 -04:00
|
|
|
require('telescope').setup({
|
|
|
|
initial_mode = "normal"
|
|
|
|
})
|
|
|
|
local builtin = require('telescope.builtin')
|
|
|
|
vim.keymap.set('n', '<Leader>p', builtin.find_files, {})
|
|
|
|
|
|
|
|
-- toggle numbers with Alt+N
|
|
|
|
vim.keymap.set(
|
|
|
|
"n",
|
|
|
|
"<M-n>",
|
|
|
|
function()
|
|
|
|
vim.o.number = not vim.o.number;
|
|
|
|
end
|
|
|
|
)
|
|
|
|
|
|
|
|
|
2022-08-16 15:23:30 -04:00
|
|
|
-- require'lspconfig'.pyright.setup{}
|
|
|
|
local nvim_lsp = require'lspconfig'
|
|
|
|
nvim_lsp.pyright.setup{}
|
|
|
|
|
|
|
|
-- local on_attach = function(client)
|
|
|
|
-- require'completion'.on_attach(client)
|
|
|
|
-- end
|
|
|
|
|
|
|
|
|
|
|
|
-- require('snippy').setup({
|
|
|
|
-- mappings = {
|
|
|
|
-- is = {
|
|
|
|
-- ['<Tab>'] = 'expand_or_advance',
|
|
|
|
-- ['<S-Tab>'] = 'previous',
|
|
|
|
-- },
|
|
|
|
-- nx = {
|
|
|
|
-- ['<leader>x'] = 'cut_text',
|
|
|
|
-- },
|
|
|
|
-- },
|
|
|
|
-- })
|
|
|
|
|
2022-09-09 13:58:41 -04:00
|
|
|
require('completion')
|
2022-08-16 15:23:30 -04:00
|
|
|
|
|
|
|
local capabilities = require('cmp_nvim_lsp').update_capabilities(vim.lsp.protocol.make_client_capabilities())
|
|
|
|
nvim_lsp.rust_analyzer.setup({
|
|
|
|
capabilities = capabilities,
|
|
|
|
settings = {
|
|
|
|
["rust-analyzer"] = {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
})
|
|
|
|
|
|
|
|
vim.diagnostic.config({
|
|
|
|
underline = true,
|
|
|
|
signs = true,
|
|
|
|
virtual_text = true,
|
|
|
|
float = {
|
|
|
|
show_header = true,
|
|
|
|
source = 'if_many',
|
|
|
|
border = 'rounded',
|
|
|
|
focusable = false,
|
|
|
|
}
|
|
|
|
})
|
|
|
|
|
2022-09-09 13:58:41 -04:00
|
|
|
require('treesitter')
|
|
|
|
|
2022-10-09 11:14:51 -04:00
|
|
|
require('nvim_comment').setup()
|
|
|
|
--vim.keymap.set('v', '<A-->', "<Cmd>'<,'>CommentToggle<CR>")
|
|
|
|
--vim.keymap.set('n', '<A-->', "<Cmd>CommentToggle<CR>")
|
|
|
|
|
|
|
|
-- require('nvim-tree').setup()
|
|
|
|
|
2022-08-16 15:23:30 -04:00
|
|
|
-- -- trouble.nvim mappings
|
|
|
|
-- vim.api.nvim_set_keymap("n", "<leader>xx", "<cmd>Trouble<cr>",
|
|
|
|
-- {silent = true, noremap = true}
|
|
|
|
-- )
|
|
|
|
-- vim.api.nvim_set_keymap("n", "<leader>xw", "<cmd>Trouble workspace_diagnostics<cr>",
|
|
|
|
-- {silent = true, noremap = true}
|
|
|
|
-- )
|
|
|
|
-- vim.api.nvim_set_keymap("n", "<leader>xd", "<cmd>Trouble document_diagnostics<cr>",
|
|
|
|
-- {silent = true, noremap = true}
|
|
|
|
-- )
|
|
|
|
-- vim.api.nvim_set_keymap("n", "<leader>xl", "<cmd>Trouble loclist<cr>",
|
|
|
|
-- {silent = true, noremap = true}
|
|
|
|
-- )
|
|
|
|
-- vim.api.nvim_set_keymap("n", "<leader>xq", "<cmd>Trouble quickfix<cr>",
|
|
|
|
-- {silent = true, noremap = true}
|
|
|
|
-- )
|
|
|
|
-- vim.api.nvim_set_keymap("n", "gR", "<cmd>Trouble lsp_references<cr>",
|
|
|
|
-- {silent = true, noremap = true}
|
|
|
|
-- )
|
2022-08-16 15:37:32 -04:00
|
|
|
--
|
2022-08-02 10:14:47 -04:00
|
|
|
|
|
|
|
-- original init.vim
|
|
|
|
-- syntax on
|
|
|
|
-- hi MatchParen ctermfg=none ctermbg=none cterm=bold,underline gui=bold,underline guifg=fg guibg=bg
|
|
|
|
--
|
|
|
|
-- filetype plugin indent on
|
|
|
|
-- set number
|
|
|
|
-- "set relativenumber
|
|
|
|
-- set path+=**
|
|
|
|
-- set noswapfile
|
|
|
|
-- set wildmenu
|
|
|
|
-- set backspace=indent,eol,start
|
|
|
|
-- set undodir=~/.cache/nvim/undo
|
|
|
|
-- set undofile
|
|
|
|
-- set incsearch
|
|
|
|
-- set smartindent
|
|
|
|
-- set ic
|
|
|
|
-- "set colorcolumn=88
|
|
|
|
-- set et
|
|
|
|
-- set ts=4
|
|
|
|
-- set sw=4
|
|
|
|
-- "set showmatch
|
|
|
|
-- set hlsearch incsearch
|
|
|
|
-- "highlight ColorColumn ctermbg=9
|
|
|
|
--
|
|
|
|
-- lua require('plugins')
|