Commit 63ccdc2
Changed files (4)
.config
nvim
lua
.config/nvim/lua/plugins/alpha.lua
@@ -158,7 +158,7 @@ return {
dashboard.button("n", " New file", ":ene <BAR> startinsert<CR>"),
dashboard.button("r", " Recent files", ":Telescope oldfiles<CR>"),
dashboard.button("u", " Update plugins", "<cmd>Lazy update<CR>"),
- dashboard.button("s", " Settings", ":e " .. config_path .. "/init.lua<CR>"),
+ dashboard.button("s", " Settings", ":e " .. config_path .. "<CR>"),
dashboard.button("q", " Quit", "<cmd>q<CR>"),
}
.config/nvim/lua/plugins/telescope.lua
@@ -3,11 +3,11 @@ return {
'nvim-telescope/telescope.nvim', tag = '0.1.8',
dependencies = { 'nvim-lua/plenary.nvim' },
config = function()
- local actions = require("telescope.actions")
+ require("telescope.actions")
require('telescope').setup({
pickers = {
find_files = {
- find_command = { "rg", "--files",
+ find_command = { "rg", "--files",
"--hidden","--follow",
"--glob", "!.git/*",
"--glob", "!node_modules/*"
@@ -20,9 +20,6 @@ return {
}
}
})
- local builtin = require('telescope.builtin')
- vim.keymap.set('n', '<C-p>', builtin.find_files, { desc = 'Telescope find files' })
- vim.keymap.set('n', '<leader>fg', builtin.live_grep, { desc = 'Telescope live grep' })
end
},
{
@@ -31,4 +28,19 @@ return {
require('telescope').load_extension('git_branch')
end
},
+ {
+ 'nvim-telescope/telescope-ui-select.nvim',
+ config = function()
+ require("telescope").setup {
+ extensions = {
+ ["ui-select"] = {
+ require("telescope.themes").get_dropdown {
+ }
+
+ }
+ }
+ }
+ require("telescope").load_extension("ui-select")
+ end
+ }
}
.config/nvim/lua/keymaps.lua
@@ -1,17 +1,35 @@
--- Move lines up/down in normal mode
-vim.keymap.set("n", "<A-j>", ":m .+1<CR>==",{})
-vim.keymap.set("n", "<A-k>", ":m .-2<CR>==",{})
-vim.keymap.set("v", "<A-j>", ":m '>+1<CR>gv=gv",{})
-vim.keymap.set("v", "<A-k>", ":m '<-2<CR>gv=gv",{})
+-- Move lines up/down in normal/visual mode
+vim.keymap.set("n", "<M-Up>", ":m .-2<CR>==", {})
+vim.keymap.set("n", "<M-Down>", ":m .+1<CR>==", {})
+vim.keymap.set("v", "<M-Up>", ":m '<-2<CR>gv=gv", {})
+vim.keymap.set("v", "<M-Down>", ":m '>+1<CR>gv=gv", {})
-vim.keymap.set('n', '<Tab>', ':tabnext<CR>', { noremap = true, silent = true })
-vim.keymap.set('n', '<C-b>', ':Neotree toggle<CR>', {noremap = true, silent = true})
-vim.keymap.set('n', '<S-Tab>', ':tabprevious<CR>', { noremap = true, silent = true })
+vim.keymap.set("n", "<M-Left>", "<C-o>", { desc = "Jump back" })
+vim.keymap.set("n", "<M-Right>", "<C-i>", { desc = "Jump forward" })
+
+vim.keymap.set("n", "<Tab>", ":tabnext<CR>", { noremap = true, silent = true })
+vim.keymap.set("n", "<C-b>", ":Neotree toggle<CR>", { noremap = true, silent = true })
+vim.keymap.set("n", "<S-Tab>", ":tabprevious<CR>", { noremap = true, silent = true })
--- Terminal
vim.keymap.set("n", "<leader>th", ":split | terminal<CR>", { desc = "Terminal horizontal" })
vim.keymap.set("t", "<Esc>", "<C-\\><C-n>", { desc = "Exit terminal mode" })
vim.keymap.set("t", "<C-h>", "<C-\\><C-n><C-w>h", { desc = "Go to left window" })
vim.keymap.set("t", "<C-j>", "<C-\\><C-n><C-w>j", { desc = "Go to lower window" })
vim.keymap.set("t", "<C-k>", "<C-\\><C-n><C-w>k", { desc = "Go to upper window" })
vim.keymap.set("t", "<C-l>", "<C-\\><C-n><C-w>l", { desc = "Go to right window" })
+
+vim.keymap.set("n", "<C-p>", "<cmd>Telescope find_files<CR>", { desc = "Telescope find files" })
+vim.keymap.set("n", "<C-S-F>", "<cmd>Telescope live_grep<CR>", { desc = "Telescope live grep " })
+
+vim.keymap.set("n", "<leader>e", vim.diagnostic.open_float)
+
+vim.api.nvim_create_autocmd("LspAttach", {
+ callback = function(args)
+ local opts = { buffer = args.buf, silent = true }
+ vim.keymap.set("n", "<C-Space>", vim.lsp.buf.code_action, opts)
+ vim.keymap.set("n", "<F2>", vim.lsp.buf.rename, opts)
+ vim.keymap.set("n", "<F12>", vim.lsp.buf.definition, opts)
+ vim.keymap.set("n", "<S-F12>", vim.lsp.buf.references, opts)
+ vim.keymap.set("n", "<A-F12>", vim.lsp.buf.implementation, opts)
+ end,
+})
.config/nvim/lua/options.lua
@@ -1,5 +1,21 @@
vim.g.mapleader = " "
+
+vim.diagnostic.config({
+ virtual_text = {
+ prefix = "",
+ spacing = 2,
+ },
+ signs = true,
+ underline = true,
+ severity_sort = true,
+ float = {
+ border = "rounded",
+ source = "always",
+ },
+})
+
+
local opt = vim.opt
opt.shortmess:append("I")
@@ -22,7 +38,7 @@ opt.undofile = true
opt.undolevels = 10000
opt.updatetime = 200
opt.timeoutlen = 1500
-opt.splitbelow = true
+opt.splitbelow = true
opt.splitright = true
opt.foldlevel = 99