Skip to content

Commit 6d3974b

Browse files
bar0meterbar0meter
committed
refactor neovim config
Signed-off-by: Ajinkya <ajinkya060@gmail.com>
1 parent 102c64f commit 6d3974b

12 files changed

Lines changed: 143 additions & 224 deletions

File tree

‎after/plugin/theme.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ local function apply_theme_for_terminal()
33
if term_program == "iTerm.app" then
44
vim.cmd.colorscheme("deus")
55
else
6-
vim.cmd.colorscheme("deus")
6+
vim.cmd.colorscheme("everforest")
77
end
88
end
99

‎lazy-lock.json‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,26 @@
11
{
22
"conform.nvim": { "branch": "master", "commit": "c2526f1cde528a66e086ab1668e996d162c75f4f" },
3+
"everforest-nvim": { "branch": "main", "commit": "557bce922401e247a596583679bc181d4d688554" },
34
"gopher.nvim": { "branch": "main", "commit": "6a3924cee5a9f36d316f8e4a90c3020438d3513f" },
5+
"gruvbox-material": { "branch": "master", "commit": "790afe9dd085aa04eccd1da3626c5fa05c620e53" },
46
"gruvbox.nvim": { "branch": "main", "commit": "a472496e1a4465a2dd574389dcf6cdb29af9bf1b" },
5-
"kanagawa.nvim": { "branch": "master", "commit": "aef7f5cec0a40dbe7f3304214850c472e2264b10" },
67
"lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" },
78
"lazydev.nvim": { "branch": "main", "commit": "5231c62aa83c2f8dc8e7ba957aa77098cda1257d" },
9+
"lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" },
810
"mini.nvim": { "branch": "main", "commit": "9b935c218ddba02e5dc75c94f90143bce1f7c646" },
9-
"nvim": { "branch": "main", "commit": "beaf41a30c26fd7d6c386d383155cbd65dd554cd" },
10-
"nvim-lspconfig": { "branch": "master", "commit": "419b082102fa813739588dd82e19a8b6b2442855" },
11-
"nvim-treesitter": { "branch": "main", "commit": "275b9fe801d56d5fea6d34f5bfea8bb24887b805" },
11+
"nvim-lspconfig": { "branch": "master", "commit": "5fef3b4a5f1057553b78d048322782c3a9ae69c6" },
12+
"nvim-treesitter": { "branch": "main", "commit": "f8bbc3177d929dc86e272c41cc15219f0a7aa1ac" },
1213
"nvim-ts-autotag": { "branch": "main", "commit": "db15f2e0df2f5db916e511e3fffb682ef2f6354f" },
14+
"nvim-web-devicons": { "branch": "master", "commit": "803353450c374192393f5387b6a0176d0972b848" },
1315
"oil-git-status.nvim": { "branch": "main", "commit": "4b5cf53842c17a09420919e655a6a559da3112d7" },
1416
"oil.nvim": { "branch": "master", "commit": "f55b25e493a7df76371cfadd0ded5004cb9cd48a" },
15-
"onedarkpro.nvim": { "branch": "main", "commit": "743bf248cf238a0625f3a204eecefafcf6281a9f" },
1617
"plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
18+
"snacks.nvim": { "branch": "main", "commit": "fe7cfe9800a182274d0f868a74b7263b8c0c020b" },
1719
"telescope-fzf-native.nvim": { "branch": "main", "commit": "6fea601bd2b694c6f2ae08a6c6fab14930c60e2c" },
1820
"telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
1921
"telescope.nvim": { "branch": "master", "commit": "ad7d9580338354ccc136e5b8f0aa4f880434dcdc" },
2022
"tiny-code-action.nvim": { "branch": "main", "commit": "6ded5f7cf53e8d804ab4fdc1d728f47ab772007e" },
21-
"vim-airline": { "branch": "master", "commit": "b03fdc542f5155b54959102a2aecaf6c792dce01" },
23+
"typescript-tools.nvim": { "branch": "master", "commit": "c2f5910074103705661e9651aa841e0d7eea9932" },
2224
"vim-commentary": { "branch": "master", "commit": "64a654ef4a20db1727938338310209b6a63f60c9" },
2325
"vim-deus": { "branch": "master", "commit": "1be965e7bc1c01e7db5e46dcd0e50d32d4eef434" },
2426
"vim-rest-console": { "branch": "master", "commit": "7b407f47185468d1b57a8bd71cdd66c9a99359b2" },

‎lsp/vtsls.lua‎

Lines changed: 0 additions & 102 deletions
This file was deleted.

‎lua/config/options.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
vim.g.mapleader = "," -- space leader key
2-
vim.g.editorconfig = false -- disable built-in editorconfig
2+
vim.g.editorconfig = true -- enable built-in editorconfig
33
vim.o.mouse = "" -- disable mouse in nvim
44

55
vim.o.termguicolors = true -- enable 24-bit colors

‎lua/plugins/colorscheme.lua‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,17 @@ local gruvbox = {
1717
end,
1818
}
1919

20+
local gruvbox_material = {
21+
"sainnhe/gruvbox-material",
22+
}
23+
24+
local everforest = {
25+
"neanias/everforest-nvim",
26+
}
27+
2028
return {
2129
deus,
2230
gruvbox,
31+
gruvbox_material,
32+
everforest,
2333
}

‎lua/plugins/gopher.lua‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
return {
2-
"olexsmir/gopher.nvim",
3-
lazy = false,
4-
ft = "go",
5-
build = function()
6-
vim.cmd.GoInstallDeps()
7-
end,
8-
keys = {
9-
{ "<leader>goat", ":GoTestAdd<cr>" },
10-
{ "<leader>got", ":GoTestsAll<cr>" },
11-
{ "<leader>goe", ":GoTestsExp<cr>" },
12-
{ "<leader>goj", ":GoTagsAdd json<cr>" },
13-
},
14-
---@module "gopher"
15-
---@type gopher.Config
16-
opts = {},
2+
"olexsmir/gopher.nvim",
3+
lazy = false,
4+
ft = "go",
5+
build = function()
6+
vim.cmd.GoInstallDeps()
7+
end,
8+
keys = {
9+
{ "<leader>goat", ":GoTestAdd<cr>" },
10+
{ "<leader>got", ":GoTestsAll<cr>" },
11+
{ "<leader>goe", ":GoTestsExp<cr>" },
12+
{ "<leader>goj", ":GoTagsAdd json<cr>" },
13+
},
14+
---@module "gopher"
15+
---@type gopher.Config
16+
opts = {},
1717
}

‎lua/plugins/lsp.lua‎

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ return {
55
"nvim-lua/plenary.nvim",
66
},
77
config = function()
8-
vim.lsp.enable({ "lua_ls", "vtsls", "gopls", "biome" })
8+
vim.lsp.enable({ "lua_ls", "gopls", "biome" })
99

1010
vim.api.nvim_create_autocmd("LspAttach", {
1111
group = vim.api.nvim_create_augroup("UserLspConfig", {}),
@@ -22,21 +22,6 @@ return {
2222
require("tiny-code-action").code_action()
2323
end, { noremap = true, silent = true })
2424

25-
vim.keymap.set("n", "<leader>li", function()
26-
if vim.bo.filetype == "typescript" or vim.bo.filetype == "typescriptreact" then
27-
vim.lsp.buf.code_action({
28-
apply = true,
29-
---@diagnostic disable-next-line: assign-type-mismatch
30-
context = { only = { "source.removeUnused.ts" }, diagnostics = {} },
31-
})
32-
vim.defer_fn(function()
33-
vim.lsp.buf.format({ timeout_ms = 10000 })
34-
end, 100) -- 100ms delay
35-
else
36-
vim.lsp.buf.format({ timeout_ms = 10000 })
37-
end
38-
end)
39-
4025
vim.keymap.set("n", "<leader>k", function()
4126
vim.diagnostic.open_float({
4227
border = "rounded",

‎lua/plugins/mini.lua‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,6 @@ return {
1111
-- access to surround keymaps sa,sd,sc etc
1212
require("mini.surround").setup()
1313

14-
-- replace gitsigns
15-
require("mini.diff").setup({
16-
view = {
17-
style = "sign",
18-
signs = {
19-
add = "┃",
20-
change = "┃",
21-
delete = "_",
22-
},
23-
},
24-
})
25-
2614
require("mini.jump").setup()
2715
end,
2816
}

‎lua/plugins/snacks.lua‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
return {
2+
"folke/snacks.nvim",
3+
priority = 1000,
4+
lazy = false,
5+
opts = {
6+
bigfile = { enabled = true },
7+
dashboard = { enabled = true },
8+
explorer = { enabled = false },
9+
indent = { enabled = true },
10+
input = { enabled = true },
11+
picker = { enabled = false },
12+
notifier = { enabled = true },
13+
quickfile = { enabled = true },
14+
scope = { enabled = true },
15+
scroll = { enabled = true },
16+
statuscolumn = { enabled = true },
17+
words = { enabled = true },
18+
},
19+
}

0 commit comments

Comments
 (0)