this repo has no description
formatter.nvim, and stylua fmt everything
+177
-121
+22
-15
nvim/init.lua
+22
-15
nvim/init.lua
···
2
2
require("config.keys")
3
3
4
4
---@diagnostic disable-next-line: undefined-field
5
-
vim.opt.fillchars:append { diff = "╱" }
5
+
vim.opt.fillchars:append({ diff = "╱" })
6
6
7
7
vim.opt.termguicolors = true
8
8
vim.opt.relativenumber = true
···
12
12
vim.opt.wrap = false
13
13
14
14
-- Reserve a space in the gutter
15
-
vim.opt.signcolumn = 'yes'
15
+
vim.opt.signcolumn = "yes"
16
16
17
-
local cmp = require('cmp')
17
+
local cmp = require("cmp")
18
18
19
19
cmp.setup({
20
20
sources = {
21
-
{ name = 'nvim_lsp' },
21
+
{ name = "nvim_lsp" },
22
22
},
23
23
snippet = {
24
24
expand = function(args)
···
39
39
40
40
vim.api.nvim_create_autocmd({ "BufRead", "BufNewFile" }, {
41
41
callback = function()
42
-
if vim.bo.filetype == '' then
42
+
if vim.bo.filetype == "" then
43
43
vim.opt_local.wrap = true
44
44
vim.opt_local.linebreak = true
45
45
end
···
48
48
49
49
-- TODO: Turn this into a convenience function that you can
50
50
-- enable or disable on a per-project and per-filetype basis.
51
-
vim.api.nvim_create_autocmd("BufWritePre", {
52
-
callback = function()
53
-
local mode = vim.api.nvim_get_mode().mode
54
-
-- local filetype = vim.bo.filetype
55
-
if vim.bo.modified == true and mode == 'n' then
56
-
vim.cmd('lua vim.lsp.buf.format()')
57
-
else
58
-
end
59
-
end
60
-
})
51
+
vim.cmd([[
52
+
augroup FormatAutogroup
53
+
autocmd!
54
+
autocmd BufWritePost * FormatWrite
55
+
augroup END
56
+
]])
57
+
58
+
-- vim.api.nvim_create_autocmd("BufWritePre", {
59
+
-- callback = function()
60
+
-- local mode = vim.api.nvim_get_mode().mode
61
+
-- -- local filetype = vim.bo.filetype
62
+
-- if vim.bo.modified == true and mode == 'n' then
63
+
-- vim.cmd('lua vim.lsp.buf.format()')
64
+
-- else
65
+
-- end
66
+
-- end
67
+
-- })
+1
nvim/lazy-lock.json
+1
nvim/lazy-lock.json
···
6
6
"copilot.lua": { "branch": "master", "commit": "f8d8d872bb319f640d5177dad5fbf01f7a16d7d0" },
7
7
"diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
8
8
"dressing.nvim": { "branch": "master", "commit": "6ef1ca479d37d4ff66f13eed44d08912caff483a" },
9
+
"formatter.nvim": { "branch": "master", "commit": "eb89a1f3e079f1b9680bc7293b75fffccb5e1598" },
9
10
"gitlab.nvim": { "branch": "main", "commit": "30daecfb608f6fb793fe0770c4487961e46f8c6f" },
10
11
"gitlinker.nvim": { "branch": "master", "commit": "cc59f732f3d043b626c8702cb725c82e54d35c25" },
11
12
"gitsigns.nvim": { "branch": "main", "commit": "4daf7022f1481edf1e8fb9947df13bb07c18e89a" },
+79
-65
nvim/lua/config/keys.lua
+79
-65
nvim/lua/config/keys.lua
···
1
1
local wk = require("which-key")
2
2
3
-
local Terminal = require('toggleterm.terminal').Terminal
3
+
local Terminal = require("toggleterm.terminal").Terminal
4
4
5
5
-- Create a lazygit fullscreen terminal
6
6
local lazygit = Terminal:new({
7
7
cmd = "lazygit",
8
-
direction = "float", -- This can use "horizontal" or "vertical" if float doesn't fill
8
+
direction = "float", -- This can use "horizontal" or "vertical" if float doesn't fill
9
9
float_opts = {
10
-
border = "none", -- or single/double if you prefer
11
-
width = function() return vim.o.columns end, -- full width
12
-
height = function() return vim.o.lines end, -- full height
10
+
border = "none", -- or single/double if you prefer
11
+
width = function()
12
+
return vim.o.columns
13
+
end, -- full width
14
+
height = function()
15
+
return vim.o.lines
16
+
end, -- full height
13
17
},
14
18
-- adjust other options as needed
15
-
hidden = true
19
+
hidden = true,
16
20
})
17
21
18
22
function _LAZYGIT_TOGGLE()
···
22
26
vim.cmd("command! LazyGit lua _LAZYGIT_TOGGLE()")
23
27
24
28
wk.add({
25
-
{ "<C-h>", "<C-w>h", desc = "Move focus to left pane" },
26
-
{ "<C-j>", "<C-w>j", desc = "Move focus to below pane" },
27
-
{ "<C-k>", "<C-w>k", desc = "Move focus to above pane" },
28
-
{ "<C-l>", "<C-w>l", desc = "Move focus to right pane" },
29
+
{ "<C-h>", "<C-w>h", desc = "Move focus to left pane" },
30
+
{ "<C-j>", "<C-w>j", desc = "Move focus to below pane" },
31
+
{ "<C-k>", "<C-w>k", desc = "Move focus to above pane" },
32
+
{ "<C-l>", "<C-w>l", desc = "Move focus to right pane" },
29
33
30
-
{ "<M-h>", "5zh", desc = "Scroll left" },
31
-
{ "<M-l>", "5zl", desc = "Scroll right" },
34
+
{ "<M-h>", "5zh", desc = "Scroll left" },
35
+
{ "<M-l>", "5zl", desc = "Scroll right" },
32
36
33
-
{ "H", ":bp<cr>", desc = "Switch to previous buffer" },
34
-
{ "L", ":bn<cr>", desc = "Switch to next buffer" },
35
-
{ "<leader>d", "<cmd>bd<cr>", desc = "Close buffer" },
36
-
{ "<leader>D", "<cmd>bd!<cr>", desc = "Close buffer (force)" },
37
-
{ "<leader>bn", "<cmd>new<CR>", desc = "New buffer" },
38
-
{ "<leader>bf", "<cmd>Telescope buffers<cr>", desc = "Buffers" },
39
-
{ "<leader>bF", "<cmd>lua vim.lsp.buf.format()<CR>", desc = "Format buffer" },
37
+
{ "H", ":bp<cr>", desc = "Switch to previous buffer" },
38
+
{ "L", ":bn<cr>", desc = "Switch to next buffer" },
39
+
{ "<leader>d", "<cmd>bd<cr>", desc = "Close buffer" },
40
+
{ "<leader>D", "<cmd>bd!<cr>", desc = "Close buffer (force)" },
41
+
{ "<leader>bn", "<cmd>new<CR>", desc = "New buffer" },
42
+
{ "<leader>bf", "<cmd>Telescope buffers<cr>", desc = "Buffers" },
43
+
{ "<leader>bF", "<cmd>lua vim.lsp.buf.format()<CR>", desc = "Format buffer" },
40
44
41
-
{ "<M-p>", "<cmd>tabprev<cr>", desc = "Previous tab" },
42
-
{ "<M-n>", "<cmd>tabnext<cr>", desc = "Next tab" },
43
-
{ "<leader>td", "<cmd>tabclose<cr>", desc = "Close Tab" },
44
-
{ "<leader>tn", "<cmd>tabnew<cr>", desc = "Close Tab" },
45
+
{ "<M-p>", "<cmd>tabprev<cr>", desc = "Previous tab" },
46
+
{ "<M-n>", "<cmd>tabnext<cr>", desc = "Next tab" },
47
+
{ "<leader>td", "<cmd>tabclose<cr>", desc = "Close Tab" },
48
+
{ "<leader>tn", "<cmd>tabnew<cr>", desc = "Close Tab" },
45
49
46
-
{ "<leader>CL", "<cmd>ConfigLocalEdit<cr>", desc = "Edit local nvim config" },
50
+
{ "<leader>CL", "<cmd>ConfigLocalEdit<cr>", desc = "Edit local nvim config" },
47
51
48
-
{ "<leader>/", "<cmd>CommentToggle<cr>", desc = "Toggle comment", mode = { "n" } },
52
+
{
53
+
"<leader>/",
54
+
"<cmd>CommentToggle<cr>",
55
+
desc = "Toggle comment",
56
+
mode = { "n" },
57
+
},
49
58
-- TODO: Fix multi line commenting
50
-
{ "<leader>/", "<cmd>CommentToggle<cr>", desc = "Toggle comment", mode = { "v" } },
59
+
{
60
+
"<leader>/",
61
+
"<cmd>CommentToggle<cr>",
62
+
desc = "Toggle comment",
63
+
mode = { "v" },
64
+
},
51
65
52
-
{ "<leader>e", "<cmd>NvimTreeToggle<cr>", desc = "Toggle file tree" },
53
-
{ "E", "<cmd>NvimTreeFindFile<cr>", desc = "Reveal file in file tree" },
54
-
{ "<leader>h", "<cmd>noh<cr>", desc = "Clear highlight" },
55
-
{ "<leader>v/", "<cmd>vsp<cr>", desc = "Split vertical" },
56
-
{ "<leader>v?", "<cmd>sp<cr>", desc = "Split horizontal" },
66
+
{ "<leader>e", "<cmd>NvimTreeToggle<cr>", desc = "Toggle file tree" },
67
+
{ "E", "<cmd>NvimTreeFindFile<cr>", desc = "Reveal file in file tree" },
68
+
{ "<leader>h", "<cmd>noh<cr>", desc = "Clear highlight" },
69
+
{ "<leader>v/", "<cmd>vsp<cr>", desc = "Split vertical" },
70
+
{ "<leader>v?", "<cmd>sp<cr>", desc = "Split horizontal" },
57
71
58
-
{ "<leader>f", "<cmd>Telescope find_files<cr>", desc = "Find files" },
59
-
{ "<leader>sd", "<cmd>Telescope lsp_document_symbols<cr>", desc = "Live grep" },
60
-
{ "<leader>sw", "<cmd>Telescope lsp_workspace_symbols<cr>", desc = "Live grep" },
61
-
{ "<leader>sp", "<cmd>Telescope live_grep<cr>", desc = "Live grep" },
62
-
{ "<leader>sh", "<cmd>Telescope help_tags<cr>", desc = "Help tags" },
63
-
{ "<leader>sc", "<cmd>Telescope commands<cr>", desc = "Commands" },
72
+
{ "<leader>f", "<cmd>Telescope find_files<cr>", desc = "Find files" },
73
+
{ "<leader>sd", "<cmd>Telescope lsp_document_symbols<cr>", desc = "Live grep" },
74
+
{ "<leader>sw", "<cmd>Telescope lsp_workspace_symbols<cr>", desc = "Live grep" },
75
+
{ "<leader>sp", "<cmd>Telescope live_grep<cr>", desc = "Live grep" },
76
+
{ "<leader>sh", "<cmd>Telescope help_tags<cr>", desc = "Help tags" },
77
+
{ "<leader>sc", "<cmd>Telescope commands<cr>", desc = "Commands" },
64
78
65
-
{ "<leader>m", "<cmd>Trouble diagnostics toggle<cr>", desc = "Trouble diagnostics" },
66
-
{ "<leader>l", "<cmd>Trouble lsp toggle include_declarations=false<cr>", desc = "Trouble LSP bar" },
67
-
{ "<leader>o", "<cmd>Trouble lsp_document_symbols toggle<cr>", desc = "Symbols outline" },
79
+
{ "<leader>m", "<cmd>Trouble diagnostics toggle<cr>", desc = "Trouble diagnostics" },
80
+
{ "<leader>l", "<cmd>Trouble lsp toggle include_declarations=false<cr>", desc = "Trouble LSP bar" },
81
+
{ "<leader>o", "<cmd>Trouble lsp_document_symbols toggle<cr>", desc = "Symbols outline" },
68
82
69
-
{ "<leader>Z", "<cmd>Goyo<cr>", desc = "Goyo toggle" },
83
+
{ "<leader>Z", "<cmd>Goyo<cr>", desc = "Goyo toggle" },
70
84
71
-
{ "<leader>w", "<cmd>w<cr>", desc = "Save" },
72
-
{ "<leader>X", "<cmd>x<cr>", desc = "Save and close" },
73
-
{ "<leader>q", "<cmd>q<cr>", desc = "Quit" },
74
-
{ "<leader>Q", "<cmd>qa<cr>", desc = "Quit all" },
85
+
{ "<leader>w", "<cmd>w<cr>", desc = "Save" },
86
+
{ "<leader>X", "<cmd>x<cr>", desc = "Save and close" },
87
+
{ "<leader>q", "<cmd>q<cr>", desc = "Quit" },
88
+
{ "<leader>Q", "<cmd>qa<cr>", desc = "Quit all" },
75
89
76
-
{ "[d", "<cmd>lua vim.lsp.diagnostic.goto_prev()<cr>", desc = "Previous diagnostic" },
77
-
{ "]d", "<cmd>lua vim.lsp.diagnostic.goto_next()<cr>", desc = "Next diagnostic" },
78
-
{ "[g", "<cmd>Gitsigns prev_hunk<cr>", desc = "Previous change" },
79
-
{ "]g", "<cmd>Gitsigns next_hunk<cr>", desc = "Next change" },
90
+
{ "[d", "<cmd>lua vim.lsp.diagnostic.goto_prev()<cr>", desc = "Previous diagnostic" },
91
+
{ "]d", "<cmd>lua vim.lsp.diagnostic.goto_next()<cr>", desc = "Next diagnostic" },
92
+
{ "[g", "<cmd>Gitsigns prev_hunk<cr>", desc = "Previous change" },
93
+
{ "]g", "<cmd>Gitsigns next_hunk<cr>", desc = "Next change" },
80
94
81
-
{ "K", "<cmd>lua vim.lsp.buf.hover()<cr>", desc = "Hover" },
95
+
{ "K", "<cmd>lua vim.lsp.buf.hover()<cr>", desc = "Hover" },
82
96
83
-
{ "g", group = "goto" },
84
-
{ "gs", "<cmd>Telescope lsp_document_symbols<cr>", desc = "Document symbols" },
85
-
{ "gS", "<cmd>Telescope lsp_dynamic_workspace_symbols<cr>", desc = "Workspace symbols" },
86
-
{ "gD", "<cmd>lua vim.lsp.buf.declaration()<cr>", desc = "Declaration" },
87
-
{ "gd", "<cmd>lua vim.lsp.buf.definition()<cr>", desc = "Definition" },
88
-
{ "gi", "<cmd>lua vim.lsp.buf.implementation()<cr>", desc = "Implementation" },
89
-
{ "gr", "<cmd>lua vim.lsp.buf.references()<cr>", desc = "References" },
90
-
{ "g.", "<cmd>lua vim.lsp.buf.code_action()<cr>", desc = "Code action" },
97
+
{ "g", group = "goto" },
98
+
{ "gs", "<cmd>Telescope lsp_document_symbols<cr>", desc = "Document symbols" },
99
+
{ "gS", "<cmd>Telescope lsp_dynamic_workspace_symbols<cr>", desc = "Workspace symbols" },
100
+
{ "gD", "<cmd>lua vim.lsp.buf.declaration()<cr>", desc = "Declaration" },
101
+
{ "gd", "<cmd>lua vim.lsp.buf.definition()<cr>", desc = "Definition" },
102
+
{ "gi", "<cmd>lua vim.lsp.buf.implementation()<cr>", desc = "Implementation" },
103
+
{ "gr", "<cmd>lua vim.lsp.buf.references()<cr>", desc = "References" },
104
+
{ "g.", "<cmd>lua vim.lsp.buf.code_action()<cr>", desc = "Code action" },
91
105
92
-
{ "<leader>g", group = "git" },
93
-
{ "<leader>gg", "<cmd>LazyGit<cr>", desc = "Lazygit" },
94
-
{ "<leader>gs", "<cmd>Telescope git_status<cr>", desc = "Git status" },
95
-
{ "<leader>gd", "<cmd>Gitsigns diffthis vertical=true HEAD<cr>", desc = "File diff" },
96
-
{ "<leader>Gd", ":Gitsigns diffthis vertical=true ", desc = "File diff provided ref" },
97
-
{ "<leader>GD", ":DiffviewOpen ", desc = "Diff provided ref" },
98
-
{ "<leader>gh", "<cmd>DiffviewFileHistory<cr>", desc = "File history" },
106
+
{ "<leader>g", group = "git" },
107
+
{ "<leader>gg", "<cmd>LazyGit<cr>", desc = "Lazygit" },
108
+
{ "<leader>gs", "<cmd>Telescope git_status<cr>", desc = "Git status" },
109
+
{ "<leader>gd", "<cmd>Gitsigns diffthis vertical=true HEAD<cr>", desc = "File diff" },
110
+
{ "<leader>Gd", ":Gitsigns diffthis vertical=true ", desc = "File diff provided ref" },
111
+
{ "<leader>GD", ":DiffviewOpen ", desc = "Diff provided ref" },
112
+
{ "<leader>gh", "<cmd>DiffviewFileHistory<cr>", desc = "File history" },
99
113
{
100
114
"<leader>gl",
101
115
'<cmd>lua require("gitlinker").get_buf_range_url("n", {action_callback = require("gitlinker.actions").copy_to_clipboard})<cr>',
+1
-1
nvim/lua/plugins/avante.lua
+1
-1
nvim/lua/plugins/avante.lua
+2
-2
nvim/lua/plugins/cmp.lua
+2
-2
nvim/lua/plugins/cmp.lua
+19
-2
nvim/lua/plugins/colors.lua
+19
-2
nvim/lua/plugins/colors.lua
···
9
9
vim.cmd("colorscheme rose-pine")
10
10
end,
11
11
},
12
-
{ "nvim-treesitter", opts = {} },
12
+
{
13
+
"nvim-treesitter",
14
+
config = function()
15
+
require("nvim-treesitter.configs").setup({
16
+
-- Auto install parsers when entering a buffer if missing
17
+
auto_install = true,
18
+
ensure_installed = {
19
+
"lua",
20
+
"vim",
21
+
"vimdoc",
22
+
"query",
23
+
"markdown",
24
+
"markdown_inline",
25
+
"typescript",
26
+
},
27
+
})
28
+
end,
29
+
},
13
30
{
14
31
"f-person/auto-dark-mode.nvim",
15
32
opts = {
···
23
40
vim.cmd("colorscheme rose-pine-dawn")
24
41
end,
25
42
},
26
-
}
43
+
},
27
44
}
+4
-2
nvim/lua/plugins/git.lua
+4
-2
nvim/lua/plugins/git.lua
···
13
13
"rose-pine/neovim",
14
14
},
15
15
enabled = true,
16
-
build = function() require("gitlab.server").build(true) end, -- Builds the Go binary
16
+
build = function()
17
+
require("gitlab.server").build(true)
18
+
end, -- Builds the Go binary
17
19
config = function()
18
20
require("gitlab").setup()
19
21
end,
···
31
33
vertical = true,
32
34
},
33
35
},
34
-
}
36
+
},
35
37
}
+45
nvim/lua/plugins/ide.lua
+45
nvim/lua/plugins/ide.lua
···
1
+
return {
2
+
{
3
+
"neovim/nvim-lspconfig",
4
+
dependencies = {
5
+
"williamboman/mason.nvim",
6
+
},
7
+
config = function()
8
+
local lspc = require("lspconfig")
9
+
local lspconfig_defaults = lspc.util.default_config
10
+
lspconfig_defaults.capabilities =
11
+
vim.tbl_deep_extend("force", lspconfig_defaults.capabilities, require("cmp_nvim_lsp").default_capabilities())
12
+
lspc.lua_ls.setup({})
13
+
end,
14
+
},
15
+
{
16
+
"mhartington/formatter.nvim",
17
+
config = function()
18
+
require("formatter").setup({
19
+
filetype = {
20
+
lua = {
21
+
require("formatter.filetypes.lua").stylua,
22
+
},
23
+
markdown = {
24
+
require("formatter.defaults.prettier"),
25
+
},
26
+
["*"] = {
27
+
require("formatter.filetypes.any").remove_trailing_whitespace,
28
+
},
29
+
},
30
+
})
31
+
end,
32
+
},
33
+
{
34
+
"williamboman/mason.nvim",
35
+
opts = {},
36
+
},
37
+
{
38
+
"folke/lazydev.nvim",
39
+
ft = "lua", -- only load on lua files
40
+
opts = {},
41
+
},
42
+
{
43
+
"prisma/vim-prisma",
44
+
},
45
+
}
-30
nvim/lua/plugins/lsp.lua
-30
nvim/lua/plugins/lsp.lua
···
1
-
return {
2
-
{
3
-
"neovim/nvim-lspconfig",
4
-
dependencies = {
5
-
"williamboman/mason.nvim",
6
-
},
7
-
config = function()
8
-
local lspc = require("lspconfig")
9
-
local lspconfig_defaults = lspc.util.default_config
10
-
lspconfig_defaults.capabilities = vim.tbl_deep_extend(
11
-
"force",
12
-
lspconfig_defaults.capabilities,
13
-
require("cmp_nvim_lsp").default_capabilities()
14
-
)
15
-
lspc.lua_ls.setup({})
16
-
end,
17
-
},
18
-
{
19
-
"williamboman/mason.nvim",
20
-
opts = {},
21
-
},
22
-
{
23
-
"folke/lazydev.nvim",
24
-
ft = "lua", -- only load on lua files
25
-
opts = {},
26
-
},
27
-
{
28
-
"prisma/vim-prisma",
29
-
},
30
-
}
+4
-4
nvim/lua/plugins/ui.lua
+4
-4
nvim/lua/plugins/ui.lua
···
17
17
hijack_netrw = true,
18
18
disable_netrw = true,
19
19
hijack_directories = {
20
-
enable = true
20
+
enable = true,
21
21
},
22
22
view = {
23
23
width = 45,
···
55
55
cmd = "Trouble",
56
56
},
57
57
{
58
-
'nvim-telescope/telescope.nvim',
59
-
tag = '0.1.8',
60
-
dependencies = { 'nvim-lua/plenary.nvim' },
58
+
"nvim-telescope/telescope.nvim",
59
+
tag = "0.1.8",
60
+
dependencies = { "nvim-lua/plenary.nvim" },
61
61
opts = {},
62
62
},
63
63
{