summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitignore1
-rw-r--r--lua/config/init.lua1
-rw-r--r--lua/config/keymaps.lua21
-rw-r--r--lua/config/lsp.lua10
-rw-r--r--lua/config/packages/fzf.lua11
-rw-r--r--lua/config/packages/gitsigns.lua3
-rw-r--r--lua/config/packages/init.lua4
-rw-r--r--lua/config/packages/lsp.lua16
-rw-r--r--lua/config/packages/lspconfig.lua2
-rw-r--r--lua/config/packages/lualine.lua16
-rw-r--r--lua/config/packages/surround.lua2
-rw-r--r--lua/config/packages/toggleterm.lua6
-rw-r--r--nvim-pack-lock.json8
13 files changed, 63 insertions, 38 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..6b8710a
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.git
diff --git a/lua/config/init.lua b/lua/config/init.lua
index 4be42fe..93582aa 100644
--- a/lua/config/init.lua
+++ b/lua/config/init.lua
@@ -1,4 +1,3 @@
require("config.options")
require("config.keymaps")
require("config.autocmds")
-require("config.lsp")
diff --git a/lua/config/keymaps.lua b/lua/config/keymaps.lua
index 96dff5e..961c69b 100644
--- a/lua/config/keymaps.lua
+++ b/lua/config/keymaps.lua
@@ -13,16 +13,19 @@ vim.keymap.set("n", "N", "Nzzzv", { desc = "center searching" })
vim.keymap.set("n", "<Esc>", "<CMD>nohlsearch<CR>", { desc = "clear search highlights" })
-- diagnostics
-vim.keymap.set("n", "<leader>dD", function() vim.diagnostic.setqflist() end, { desc = "Diagnostics: workspace" })
-vim.keymap.set("n", "<leader>dd", function() vim.diagnostic.setloclist() end, { desc = "Diagnostics: file" })
+vim.keymap.set("n", "<leader>dD", function()
+ vim.diagnostic.setqflist()
+end, { desc = "Diagnostics: workspace" })
+vim.keymap.set("n", "<leader>dd", function()
+ vim.diagnostic.setloclist()
+end, { desc = "Diagnostics: file" })
-- Remap for dealing with word wrap
-vim.keymap.set('n', 'k', "v:count == 0 ? 'gk' : 'k'", { expr = true, silent = true })
-vim.keymap.set('n', 'j', "v:count == 0 ? 'gj' : 'j'", { expr = true, silent = true })
+vim.keymap.set("n", "k", "v:count == 0 ? 'gk' : 'k'", { expr = true, silent = true })
+vim.keymap.set("n", "j", "v:count == 0 ? 'gj' : 'j'", { expr = true, silent = true })
-- Diagnostic keymaps
-vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, { desc = 'Go to previous diagnostic message' })
-vim.keymap.set('n', ']d', vim.diagnostic.goto_next, { desc = 'Go to next diagnostic message' })
-vim.keymap.set('n', '<leader>t', vim.diagnostic.open_float, { desc = 'Open floating diagnostic message' })
-vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist, { desc = 'Open diagnostics list' })
-
+vim.keymap.set("n", "[d", vim.diagnostic.goto_prev, { desc = "Go to previous diagnostic message" })
+vim.keymap.set("n", "]d", vim.diagnostic.goto_next, { desc = "Go to next diagnostic message" })
+vim.keymap.set("n", "<leader>t", vim.diagnostic.open_float, { desc = "Open floating diagnostic message" })
+vim.keymap.set("n", "<leader>q", vim.diagnostic.setloclist, { desc = "Open diagnostics list" })
diff --git a/lua/config/lsp.lua b/lua/config/lsp.lua
deleted file mode 100644
index f6f49dd..0000000
--- a/lua/config/lsp.lua
+++ /dev/null
@@ -1,10 +0,0 @@
-local lspservers = {
- "basedpyright",
- "ruff",
- "clangd",
- "rust_analyzer",
- "lua_ls",
- "zls",
-}
-vim.lsp.enable(lspservers)
-
diff --git a/lua/config/packages/fzf.lua b/lua/config/packages/fzf.lua
index a40ddfa..3b27f93 100644
--- a/lua/config/packages/fzf.lua
+++ b/lua/config/packages/fzf.lua
@@ -1,5 +1,8 @@
-vim.pack.add({{ src = gh("ibhagwan/fzf-lua") }})
-
-vim.keymap.set("n", "<leader>/", function() require("fzf-lua").live_grep_native() end, { desc = "fzf live grep" })
-vim.keymap.set("n", "<leader>F", function() require("fzf-lua").files() end, { desc = "fzf find files" })
+vim.pack.add({ gh("ibhagwan/fzf-lua") })
+vim.keymap.set("n", "<leader>/", function()
+ require("fzf-lua").live_grep_native()
+end, { desc = "fzf live grep" })
+vim.keymap.set("n", "<leader>F", function()
+ require("fzf-lua").files()
+end, { desc = "fzf find files" })
diff --git a/lua/config/packages/gitsigns.lua b/lua/config/packages/gitsigns.lua
index 2161b22..d76ba68 100644
--- a/lua/config/packages/gitsigns.lua
+++ b/lua/config/packages/gitsigns.lua
@@ -1,7 +1,6 @@
-vim.pack.add({{ src = gh("lewis6991/gitsigns.nvim") }})
+vim.pack.add({ gh("lewis6991/gitsigns.nvim") })
require("gitsigns").setup()
vim.keymap.set("n", "<leader>gg", "<CMD>Gitsigns<CR>", { desc = "Gitsigns: menu" })
vim.keymap.set("n", "<leader>gb", "<CMD>Gitsigns blame_line<CR>", { desc = "Gitsigns: blame line" })
vim.keymap.set("n", "<leader>gd", "<CMD>vert rightb Gitsigns diffthis<CR>", { desc = "Gitsigns: open git diff" })
-
diff --git a/lua/config/packages/init.lua b/lua/config/packages/init.lua
index 0b30698..ed38f16 100644
--- a/lua/config/packages/init.lua
+++ b/lua/config/packages/init.lua
@@ -8,7 +8,7 @@ require("config.packages.tree")
require("config.packages.gitsigns")
require("config.packages.autopairs")
require("config.packages.lualine")
-require("config.packages.lspconfig")
+require("config.packages.lsp")
require("config.packages.conform")
require("config.packages.lint")
require("config.packages.blink")
@@ -16,3 +16,5 @@ require("config.packages.colorscheme")
require("config.packages.barbar")
require("config.packages.mini")
require("config.packages.whichkey")
+require("config.packages.toggleterm")
+require("config.packages.surround")
diff --git a/lua/config/packages/lsp.lua b/lua/config/packages/lsp.lua
new file mode 100644
index 0000000..9d2ff0d
--- /dev/null
+++ b/lua/config/packages/lsp.lua
@@ -0,0 +1,16 @@
+vim.pack.add({ gh("neovim/nvim-lspconfig") })
+
+local lspservers = {
+ "basedpyright",
+ "ruff",
+ "clangd",
+ "rust_analyzer",
+ "lua_ls",
+ "zls",
+}
+vim.lsp.enable(lspservers)
+
+vim.keymap.set("n", "<leader>rn", vim.lsp.buf.rename, { desc = "[R]e[n]ame" })
+vim.keymap.set("n", "<leader>ca", vim.lsp.buf.code_action, { desc = "[C]ode [A]ction" })
+vim.keymap.set("n", "K", vim.lsp.buf.hover, { desc = "Hover Documentation" })
+vim.keymap.set("n", "<leader>K", vim.lsp.buf.signature_help, { desc = "Signature Documentation" })
diff --git a/lua/config/packages/lspconfig.lua b/lua/config/packages/lspconfig.lua
deleted file mode 100644
index afb1092..0000000
--- a/lua/config/packages/lspconfig.lua
+++ /dev/null
@@ -1,2 +0,0 @@
-vim.pack.add({{ src = gh("neovim/nvim-lspconfig") }})
-
diff --git a/lua/config/packages/lualine.lua b/lua/config/packages/lualine.lua
index 3fa7281..02909cc 100644
--- a/lua/config/packages/lualine.lua
+++ b/lua/config/packages/lualine.lua
@@ -1,12 +1,10 @@
-vim.pack.add({{ src = gh("nvim-lualine/lualine.nvim") }})
+vim.pack.add({ gh("nvim-lualine/lualine.nvim") })
require("lualine").setup({
- options = {
- theme = color,
- icons_enabled = true,
- component_separators = { left = '', right = '' },
- section_separators = { left = '', right = '' },
- },
+ options = {
+ theme = color,
+ icons_enabled = true,
+ component_separators = { left = "", right = "" },
+ section_separators = { left = "", right = "" },
+ },
})
-
-
diff --git a/lua/config/packages/surround.lua b/lua/config/packages/surround.lua
new file mode 100644
index 0000000..8b07e69
--- /dev/null
+++ b/lua/config/packages/surround.lua
@@ -0,0 +1,2 @@
+vim.pack.add({ gh("kylechui/nvim-surround") })
+require("nvim-surround").setup({})
diff --git a/lua/config/packages/toggleterm.lua b/lua/config/packages/toggleterm.lua
new file mode 100644
index 0000000..c2964c8
--- /dev/null
+++ b/lua/config/packages/toggleterm.lua
@@ -0,0 +1,6 @@
+vim.pack.add({ gh("akinsho/toggleterm.nvim") })
+
+require("toggleterm").setup({
+ open_mapping = [[<c-\>]],
+ direction = "horizontal",
+})
diff --git a/nvim-pack-lock.json b/nvim-pack-lock.json
index f18e103..ed83ce5 100644
--- a/nvim-pack-lock.json
+++ b/nvim-pack-lock.json
@@ -49,6 +49,10 @@
"rev": "4b7fbaa239c5db6b36f424a4521ca9f1a401be33",
"src": "https://github.com/neovim/nvim-lspconfig"
},
+ "nvim-surround": {
+ "rev": "9291040de8cd8a4439eb64c441e8d5d2bf884a5a",
+ "src": "https://github.com/kylechui/nvim-surround"
+ },
"nvim-tree.lua": {
"rev": "d277467fc0d1d0e2bca88165a1de6b526f9f6fe8",
"src": "https://github.com/nvim-tree/nvim-tree.lua"
@@ -57,6 +61,10 @@
"rev": "c72328a5494b4502947a022fe69c0c47e53b6aa6",
"src": "https://github.com/nvim-tree/nvim-web-devicons"
},
+ "toggleterm.nvim": {
+ "rev": "9a88eae817ef395952e08650b3283726786fb5fb",
+ "src": "https://github.com/akinsho/toggleterm.nvim"
+ },
"which-key.nvim": {
"rev": "3aab2147e74890957785941f0c1ad87d0a44c15a",
"src": "https://github.com/folke/which-key.nvim"
generated by cgit v1.2.3 (git 2.46.0) at 2026-04-24 15:46:22 +0000