aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--nvim/.config/nvim/.gitignore2
-rw-r--r--nvim/.config/nvim/lazy-lock.json11
-rw-r--r--nvim/.config/nvim/lua/plugins/conform.lua3
-rw-r--r--nvim/.config/nvim/lua/plugins/copilot.lua8
-rw-r--r--nvim/.config/nvim/lua/plugins/lazygit.lua18
5 files changed, 34 insertions, 8 deletions
diff --git a/nvim/.config/nvim/.gitignore b/nvim/.config/nvim/.gitignore
new file mode 100644
index 0000000..8b8b7d9
--- /dev/null
+++ b/nvim/.config/nvim/.gitignore
@@ -0,0 +1,2 @@
+/venv
+
diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json
index a6af74e..9db9f24 100644
--- a/nvim/.config/nvim/lazy-lock.json
+++ b/nvim/.config/nvim/lazy-lock.json
@@ -4,29 +4,30 @@
"barbar.nvim": { "branch": "master", "commit": "53b5a2f34b68875898f0531032fbf090e3952ad7" },
"blink-cmp-copilot": { "branch": "main", "commit": "439cff78780c033aa23cf061d7315314b347e3c1" },
"blink.cmp": { "branch": "main", "commit": "9bcb14b43852a6f2bfd5ac9ef29cb5cf09b1b39b" },
- "conform.nvim": { "branch": "master", "commit": "8132ec733eed3bf415b97b76797ca41b59f51d7d" },
+ "conform.nvim": { "branch": "master", "commit": "f54259518695178168fbad442468e25f121230d4" },
"copilot.lua": { "branch": "master", "commit": "46f4b7d026cba9497159dcd3e6aa61a185cb1c48" },
"fidget.nvim": { "branch": "main", "commit": "d9ba6b7bfe29b3119a610892af67602641da778e" },
- "gitsigns.nvim": { "branch": "main", "commit": "1b0350ab707713b2bc6c236151f1a324175347b1" },
+ "gitsigns.nvim": { "branch": "main", "commit": "588264bee92993df92535b6742576f5655c91b1c" },
"indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" },
"lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
"lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" },
+ "lazygit.nvim": { "branch": "main", "commit": "4839ab642962cc76bb1bf278427dc4c59be15072" },
"lualine.nvim": { "branch": "master", "commit": "a94fc68960665e54408fe37dcf573193c4ce82c9" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "c4c84f4521d62de595c0d0f718a9a40c1890c8ce" },
"mason-nvim-dap.nvim": { "branch": "main", "commit": "4c2cdc69d69fe00c15ae8648f7e954d99e5de3ea" },
"mason-tool-installer.nvim": { "branch": "main", "commit": "517ef5994ef9d6b738322664d5fdd948f0fdeb46" },
"mason.nvim": { "branch": "main", "commit": "8024d64e1330b86044fed4c8494ef3dcd483a67c" },
- "mini.nvim": { "branch": "main", "commit": "8ca3965e68edfee5f438d4063f5adf5afa255884" },
+ "mini.nvim": { "branch": "main", "commit": "48f48e4b3f317e9da34ee7a01958b4c5018e2d34" },
"neo-tree.nvim": { "branch": "main", "commit": "f481de16a0eb59c985abac8985e3f2e2f75b4875" },
"nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
- "nvim-autopairs": { "branch": "master", "commit": "2647cce4cb64fb35c212146663384e05ae126bdf" },
+ "nvim-autopairs": { "branch": "master", "commit": "23320e75953ac82e559c610bec5a90d9c6dfa743" },
"nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" },
"nvim-dap": { "branch": "master", "commit": "14fe46ae16eb272629144a93f7738f5279665a4f" },
"nvim-dap-go": { "branch": "main", "commit": "8763ced35b19c8dc526e04a70ab07c34e11ad064" },
"nvim-dap-python": { "branch": "master", "commit": "261ce649d05bc455a29f9636dc03f8cdaa7e0e2c" },
"nvim-dap-ui": { "branch": "master", "commit": "73a26abf4941aa27da59820fd6b028ebcdbcf932" },
"nvim-lint": { "branch": "master", "commit": "2b0039b8be9583704591a13129c600891ac2c596" },
- "nvim-lspconfig": { "branch": "master", "commit": "6bba673aa8993eceec233be17b42ddfb9540794b" },
+ "nvim-lspconfig": { "branch": "master", "commit": "1cb30b1bafe5a63a5c6ac20dc39f83487df38855" },
"nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
"nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
"nvim-web-devicons": { "branch": "master", "commit": "19d6211c78169e78bab372b585b6fb17ad974e82" },
diff --git a/nvim/.config/nvim/lua/plugins/conform.lua b/nvim/.config/nvim/lua/plugins/conform.lua
index 627607f..93e4fcb 100644
--- a/nvim/.config/nvim/lua/plugins/conform.lua
+++ b/nvim/.config/nvim/lua/plugins/conform.lua
@@ -106,6 +106,9 @@ return {
black = {
prepend_args = { '--line-length', '120' },
},
+ shfmt = {
+ args = { '-i', '2' },
+ },
},
},
config = function(_, opts)
diff --git a/nvim/.config/nvim/lua/plugins/copilot.lua b/nvim/.config/nvim/lua/plugins/copilot.lua
index 4d16709..23ee23e 100644
--- a/nvim/.config/nvim/lua/plugins/copilot.lua
+++ b/nvim/.config/nvim/lua/plugins/copilot.lua
@@ -18,10 +18,12 @@ return {
},
build = 'make tiktoken', -- Only on MacOS or Linux
config = function()
- require('CopilotChat').setup {}
- vim.keymap.set('n', '<leader>cc', function()
+ require('CopilotChat').setup {
+ model = 'gpt-4o',
+ }
+ vim.keymap.set('n', '<leader>tc', function()
vim.cmd 'CopilotChatToggle'
- end, { desc = '[Copilot] Toggle Copilot Chat' })
+ end, { desc = '[T]oggle [C]opilot Chat' })
end,
},
}
diff --git a/nvim/.config/nvim/lua/plugins/lazygit.lua b/nvim/.config/nvim/lua/plugins/lazygit.lua
new file mode 100644
index 0000000..a4e50c0
--- /dev/null
+++ b/nvim/.config/nvim/lua/plugins/lazygit.lua
@@ -0,0 +1,18 @@
+return {
+ 'kdheepak/lazygit.nvim',
+ lazy = true,
+ cmd = {
+ 'LazyGit',
+ 'LazyGitConfig',
+ 'LazyGitCurrentFile',
+ 'LazyGitFilter',
+ 'LazyGitFilterCurrentFile',
+ },
+ dependencies = {
+ -- For floating window border decoration
+ 'nvim-lua/plenary.nvim',
+ },
+ keys = {
+ { '<leader>lg', '<cmd>LazyGit<cr>', desc = 'LazyGit' },
+ },
+}