aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--nvim/.config/nvim/after/ftplugin/css.lua2
-rw-r--r--nvim/.config/nvim/after/ftplugin/go.lua2
-rw-r--r--nvim/.config/nvim/after/ftplugin/html.lua2
-rw-r--r--nvim/.config/nvim/after/ftplugin/javascript.lua2
-rw-r--r--nvim/.config/nvim/after/ftplugin/javascriptreact.lua2
-rw-r--r--nvim/.config/nvim/after/ftplugin/lua.lua3
-rw-r--r--nvim/.config/nvim/after/ftplugin/python.lua11
-rw-r--r--nvim/.config/nvim/after/ftplugin/typescript.lua2
-rw-r--r--nvim/.config/nvim/after/ftplugin/typescriptreact.lua2
-rw-r--r--nvim/.config/nvim/init.lua7
-rw-r--r--nvim/.config/nvim/lazy-lock.json45
-rw-r--r--nvim/.config/nvim/lua/config/autocmds.lua14
-rw-r--r--nvim/.config/nvim/lua/config/filetypes.lua41
-rw-r--r--nvim/.config/nvim/lua/config/lazy.lua91
-rw-r--r--nvim/.config/nvim/lua/eugenetriguba/autocmds.lua8
-rw-r--r--nvim/.config/nvim/lua/eugenetriguba/global.lua (renamed from nvim/.config/nvim/lua/config/global.lua)7
-rw-r--r--nvim/.config/nvim/lua/eugenetriguba/init.lua5
-rw-r--r--nvim/.config/nvim/lua/eugenetriguba/keymaps.lua (renamed from nvim/.config/nvim/lua/config/keymaps.lua)24
-rw-r--r--nvim/.config/nvim/lua/eugenetriguba/options.lua (renamed from nvim/.config/nvim/lua/config/options.lua)4
-rw-r--r--nvim/.config/nvim/lua/eugenetriguba/plugins/blink.lua87
-rw-r--r--nvim/.config/nvim/lua/eugenetriguba/plugins/colorschemes.lua14
-rw-r--r--nvim/.config/nvim/lua/eugenetriguba/plugins/conform.lua95
-rw-r--r--nvim/.config/nvim/lua/eugenetriguba/plugins/copilot.lua32
-rw-r--r--nvim/.config/nvim/lua/eugenetriguba/plugins/fzf-lua.lua30
-rw-r--r--nvim/.config/nvim/lua/eugenetriguba/plugins/gitsigns.lua66
-rw-r--r--nvim/.config/nvim/lua/eugenetriguba/plugins/harpoon.lua (renamed from nvim/.config/nvim/lua/plugins/harpoon.lua)22
-rw-r--r--nvim/.config/nvim/lua/eugenetriguba/plugins/indent_line.lua8
-rw-r--r--nvim/.config/nvim/lua/eugenetriguba/plugins/init.lua22
-rw-r--r--nvim/.config/nvim/lua/eugenetriguba/plugins/lazygit.lua26
-rw-r--r--nvim/.config/nvim/lua/eugenetriguba/plugins/lint.lua52
-rw-r--r--nvim/.config/nvim/lua/eugenetriguba/plugins/lsp/diagnostics.lua27
-rw-r--r--nvim/.config/nvim/lua/eugenetriguba/plugins/lsp/init.lua3
-rw-r--r--nvim/.config/nvim/lua/eugenetriguba/plugins/lsp/lspconfig.lua71
-rw-r--r--nvim/.config/nvim/lua/eugenetriguba/plugins/lsp/mason.lua62
-rw-r--r--nvim/.config/nvim/lua/eugenetriguba/plugins/mini.lua32
-rw-r--r--nvim/.config/nvim/lua/eugenetriguba/plugins/oil.lua18
-rw-r--r--nvim/.config/nvim/lua/eugenetriguba/plugins/tmux-navigator.lua6
-rw-r--r--nvim/.config/nvim/lua/eugenetriguba/plugins/tree-sitter.lua38
-rw-r--r--nvim/.config/nvim/lua/eugenetriguba/plugins/which-key.lua13
-rw-r--r--nvim/.config/nvim/lua/eugenetriguba/utils.lua23
-rw-r--r--nvim/.config/nvim/lua/plugins/autopairs.lua14
-rw-r--r--nvim/.config/nvim/lua/plugins/barbar.lua74
-rw-r--r--nvim/.config/nvim/lua/plugins/blink.lua108
-rw-r--r--nvim/.config/nvim/lua/plugins/colorizer.lua8
-rw-r--r--nvim/.config/nvim/lua/plugins/colorschemes.lua20
-rw-r--r--nvim/.config/nvim/lua/plugins/conform.lua116
-rw-r--r--nvim/.config/nvim/lua/plugins/copilot.lua29
-rw-r--r--nvim/.config/nvim/lua/plugins/debug.lua239
-rw-r--r--nvim/.config/nvim/lua/plugins/gitsigns.lua67
-rw-r--r--nvim/.config/nvim/lua/plugins/indent_line.lua11
-rw-r--r--nvim/.config/nvim/lua/plugins/lazygit.lua18
-rw-r--r--nvim/.config/nvim/lua/plugins/lint.lua60
-rw-r--r--nvim/.config/nvim/lua/plugins/lsp.lua233
-rw-r--r--nvim/.config/nvim/lua/plugins/lualine.lua14
-rw-r--r--nvim/.config/nvim/lua/plugins/mini.lua34
-rw-r--r--nvim/.config/nvim/lua/plugins/obsidian.lua20
-rw-r--r--nvim/.config/nvim/lua/plugins/oil.lua13
-rw-r--r--nvim/.config/nvim/lua/plugins/telescope.lua110
-rw-r--r--nvim/.config/nvim/lua/plugins/tmux-navigator.lua20
-rw-r--r--nvim/.config/nvim/lua/plugins/todo-comments.lua40
-rw-r--r--nvim/.config/nvim/lua/plugins/tree-sitter.lua28
-rw-r--r--nvim/.config/nvim/lua/plugins/which-key.lua55
-rw-r--r--tmux/.config/tmux/options.tmux2
-rw-r--r--tmux/.config/tmux/plugins.tmux1
-rw-r--r--zsh/.zsh/env.sh2
-rw-r--r--zsh/.zsh/languages.sh3
66 files changed, 792 insertions, 1568 deletions
diff --git a/nvim/.config/nvim/after/ftplugin/css.lua b/nvim/.config/nvim/after/ftplugin/css.lua
new file mode 100644
index 0000000..9e469a1
--- /dev/null
+++ b/nvim/.config/nvim/after/ftplugin/css.lua
@@ -0,0 +1,2 @@
+vim.opt_local.tabstop = 2
+vim.opt_local.shiftwidth = 2
diff --git a/nvim/.config/nvim/after/ftplugin/go.lua b/nvim/.config/nvim/after/ftplugin/go.lua
new file mode 100644
index 0000000..3aec42b
--- /dev/null
+++ b/nvim/.config/nvim/after/ftplugin/go.lua
@@ -0,0 +1,2 @@
+vim.opt_local.tabstop = 4
+vim.opt_local.shiftwidth = 4
diff --git a/nvim/.config/nvim/after/ftplugin/html.lua b/nvim/.config/nvim/after/ftplugin/html.lua
new file mode 100644
index 0000000..9e469a1
--- /dev/null
+++ b/nvim/.config/nvim/after/ftplugin/html.lua
@@ -0,0 +1,2 @@
+vim.opt_local.tabstop = 2
+vim.opt_local.shiftwidth = 2
diff --git a/nvim/.config/nvim/after/ftplugin/javascript.lua b/nvim/.config/nvim/after/ftplugin/javascript.lua
new file mode 100644
index 0000000..9e469a1
--- /dev/null
+++ b/nvim/.config/nvim/after/ftplugin/javascript.lua
@@ -0,0 +1,2 @@
+vim.opt_local.tabstop = 2
+vim.opt_local.shiftwidth = 2
diff --git a/nvim/.config/nvim/after/ftplugin/javascriptreact.lua b/nvim/.config/nvim/after/ftplugin/javascriptreact.lua
new file mode 100644
index 0000000..9e469a1
--- /dev/null
+++ b/nvim/.config/nvim/after/ftplugin/javascriptreact.lua
@@ -0,0 +1,2 @@
+vim.opt_local.tabstop = 2
+vim.opt_local.shiftwidth = 2
diff --git a/nvim/.config/nvim/after/ftplugin/lua.lua b/nvim/.config/nvim/after/ftplugin/lua.lua
new file mode 100644
index 0000000..03a618a
--- /dev/null
+++ b/nvim/.config/nvim/after/ftplugin/lua.lua
@@ -0,0 +1,3 @@
+vim.opt_local.tabstop = 2
+vim.opt_local.shiftwidth = 2
+vim.opt_local.commentstring = '-- %s'
diff --git a/nvim/.config/nvim/after/ftplugin/python.lua b/nvim/.config/nvim/after/ftplugin/python.lua
new file mode 100644
index 0000000..20fc6b1
--- /dev/null
+++ b/nvim/.config/nvim/after/ftplugin/python.lua
@@ -0,0 +1,11 @@
+-- PEP 8 indentation settings
+vim.opt_local.tabstop = 4
+vim.opt_local.softtabstop = 4
+vim.opt_local.shiftwidth = 4
+vim.opt_local.expandtab = true
+
+-- 88 character length lines for Black formatter
+vim.opt_local.colorcolumn = '88'
+
+-- Google-style docstrings
+vim.g.python_style = 'google'
diff --git a/nvim/.config/nvim/after/ftplugin/typescript.lua b/nvim/.config/nvim/after/ftplugin/typescript.lua
new file mode 100644
index 0000000..9e469a1
--- /dev/null
+++ b/nvim/.config/nvim/after/ftplugin/typescript.lua
@@ -0,0 +1,2 @@
+vim.opt_local.tabstop = 2
+vim.opt_local.shiftwidth = 2
diff --git a/nvim/.config/nvim/after/ftplugin/typescriptreact.lua b/nvim/.config/nvim/after/ftplugin/typescriptreact.lua
new file mode 100644
index 0000000..9e469a1
--- /dev/null
+++ b/nvim/.config/nvim/after/ftplugin/typescriptreact.lua
@@ -0,0 +1,2 @@
+vim.opt_local.tabstop = 2
+vim.opt_local.shiftwidth = 2
diff --git a/nvim/.config/nvim/init.lua b/nvim/.config/nvim/init.lua
index 96ccd07..4a5ce9f 100644
--- a/nvim/.config/nvim/init.lua
+++ b/nvim/.config/nvim/init.lua
@@ -1,6 +1 @@
-require 'config.global'
-require 'config.keymaps'
-require 'config.autocmds'
-require 'config.options'
-require 'config.filetypes'
-require 'config.lazy'
+require 'eugenetriguba'
diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json
deleted file mode 100644
index 8488412..0000000
--- a/nvim/.config/nvim/lazy-lock.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
- "CopilotChat.nvim": { "branch": "main", "commit": "06e54538c24cbeb341301418dabaf598ae8e7e60" },
- "LuaSnip": { "branch": "master", "commit": "458560534a73f7f8d7a11a146c801db00b081df0" },
- "barbar.nvim": { "branch": "master", "commit": "53b5a2f34b68875898f0531032fbf090e3952ad7" },
- "blink-cmp-copilot": { "branch": "main", "commit": "439cff78780c033aa23cf061d7315314b347e3c1" },
- "blink.cmp": { "branch": "main", "commit": "bae4bae0eedd1fa55f34b685862e94a222d5c6f8" },
- "conform.nvim": { "branch": "master", "commit": "973f3cb73887d510321653044791d7937c7ec0fa" },
- "copilot.lua": { "branch": "master", "commit": "0f2fd3829dd27d682e46c244cf48d9715726f612" },
- "fidget.nvim": { "branch": "main", "commit": "4ec7bed6c86b671ddde03ca1b227343cfa3e65fa" },
- "gitsigns.nvim": { "branch": "main", "commit": "736f51d2bb684c06f39a2032f064d7244f549981" },
- "harpoon": { "branch": "harpoon2", "commit": "ed1f853847ffd04b2b61c314865665e1dadf22c7" },
- "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" },
- "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
- "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" },
- "lazygit.nvim": { "branch": "main", "commit": "cdd3527e251f96eb0527162b156ad839286fcd97" },
- "lualine.nvim": { "branch": "master", "commit": "a94fc68960665e54408fe37dcf573193c4ce82c9" },
- "mason-lspconfig.nvim": { "branch": "main", "commit": "7f0bf635082bb9b7d2b37766054526a6ccafdb85" },
- "mason-nvim-dap.nvim": { "branch": "main", "commit": "86389a3dd687cfaa647b6f44731e492970034baa" },
- "mason-tool-installer.nvim": { "branch": "main", "commit": "517ef5994ef9d6b738322664d5fdd948f0fdeb46" },
- "mason.nvim": { "branch": "main", "commit": "9e25c98d4826998460926f8c5c2284848d80ae89" },
- "mini.icons": { "branch": "main", "commit": "b8f6fa6f5a3fd0c56936252edcd691184e5aac0c" },
- "mini.nvim": { "branch": "main", "commit": "03387f53f1cb8c6a8ba0798041c6aa3525ed11ba" },
- "nvim-autopairs": { "branch": "master", "commit": "23320e75953ac82e559c610bec5a90d9c6dfa743" },
- "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" },
- "nvim-dap": { "branch": "master", "commit": "a479e25ed5b5d331fb46ee4b9e160ff02ac64310" },
- "nvim-dap-go": { "branch": "main", "commit": "b4421153ead5d726603b02743ea40cf26a51ed5f" },
- "nvim-dap-python": { "branch": "master", "commit": "261ce649d05bc455a29f9636dc03f8cdaa7e0e2c" },
- "nvim-dap-ui": { "branch": "master", "commit": "cf91d5e2d07c72903d052f5207511bf7ecdb7122" },
- "nvim-lint": { "branch": "master", "commit": "7ef127aaede2a4d5ad8df8321e2eb4e567f29594" },
- "nvim-lspconfig": { "branch": "master", "commit": "9141be4c1332afc83bdf1b0278dbb030f75ff8e3" },
- "nvim-navic": { "branch": "master", "commit": "f887d794a0f4594882814d7780980a949200a238" },
- "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
- "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
- "nvim-web-devicons": { "branch": "master", "commit": "3362099de3368aa620a8105b19ed04c2053e38c0" },
- "obsidian.nvim": { "branch": "main", "commit": "ae1f76a75c7ce36866e1d9342a8f6f5b9c2caf9b" },
- "oil.nvim": { "branch": "master", "commit": "bbad9a76b2617ce1221d49619e4e4b659b3c61fc" },
- "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
- "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" },
- "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
- "telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" },
- "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" },
- "tokyonight.nvim": { "branch": "main", "commit": "057ef5d260c1931f1dffd0f052c685dcd14100a3" },
- "vim-tmux-navigator": { "branch": "master", "commit": "c45243dc1f32ac6bcf6068e5300f3b2b237e576a" },
- "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" }
-}
diff --git a/nvim/.config/nvim/lua/config/autocmds.lua b/nvim/.config/nvim/lua/config/autocmds.lua
deleted file mode 100644
index 1e8b533..0000000
--- a/nvim/.config/nvim/lua/config/autocmds.lua
+++ /dev/null
@@ -1,14 +0,0 @@
--- [[ Autocommands ]]
--- See `:help lua-guide-autocommands`
-local autocmd = vim.api.nvim_create_autocmd
-
--- Highlight when yanking (copying) text
--- Try it with `yap` in normal mode
--- See `:help vim.highlight.on_yank()`
-autocmd('TextYankPost', {
- desc = 'Highlight when yanking (copying) text',
- group = vim.api.nvim_create_augroup('highlight-yank', { clear = true }),
- callback = function()
- vim.highlight.on_yank()
- end,
-})
diff --git a/nvim/.config/nvim/lua/config/filetypes.lua b/nvim/.config/nvim/lua/config/filetypes.lua
deleted file mode 100644
index 139bfb7..0000000
--- a/nvim/.config/nvim/lua/config/filetypes.lua
+++ /dev/null
@@ -1,41 +0,0 @@
-vim.api.nvim_create_autocmd('FileType', {
- pattern = 'python',
- callback = function()
- -- PEP 8 indentation settings
- vim.opt_local.tabstop = 4
- vim.opt_local.softtabstop = 4
- vim.opt_local.shiftwidth = 4
- vim.opt_local.expandtab = true
-
- -- 120 character length lines for Black formatter
- vim.opt_local.colorcolumn = '120'
-
- -- Google-style docstrings
- vim.g.python_style = 'google'
- end,
-})
-
-vim.api.nvim_create_autocmd('FileType', {
- pattern = 'lua',
- callback = function()
- vim.opt_local.tabstop = 2
- vim.opt_local.shiftwidth = 2
- vim.opt_local.commentstring = '-- %s'
- end,
-})
-
-vim.api.nvim_create_autocmd('FileType', {
- pattern = { 'html', 'css', 'javascript', 'typescript', 'javascriptreact', 'typescriptreact' },
- callback = function()
- vim.opt_local.tabstop = 2
- vim.opt_local.shiftwidth = 2
- end,
-})
-
-vim.api.nvim_create_autocmd('FileType', {
- pattern = 'go',
- callback = function()
- vim.opt_local.tabstop = 4
- vim.opt_local.shiftwidth = 4
- end,
-})
diff --git a/nvim/.config/nvim/lua/config/lazy.lua b/nvim/.config/nvim/lua/config/lazy.lua
deleted file mode 100644
index d4dbe5f..0000000
--- a/nvim/.config/nvim/lua/config/lazy.lua
+++ /dev/null
@@ -1,91 +0,0 @@
--- [[ Install `lazy.nvim` plugin manager ]]
--- See `:help lazy.nvim.txt` or https://github.com/folke/lazy.nvim for more info
-local lazypath = vim.fn.stdpath 'data' .. '/lazy/lazy.nvim'
-if not (vim.uv or vim.loop).fs_stat(lazypath) then
- local lazyrepo = 'https://github.com/folke/lazy.nvim.git'
- local out = vim.fn.system { 'git', 'clone', '--filter=blob:none', '--branch=stable', lazyrepo, lazypath }
- if vim.v.shell_error ~= 0 then
- vim.api.nvim_echo({
- { 'Failed to clone lazy.nvim:\n', 'ErrorMsg' },
- { out, 'WarningMsg' },
- { '\nPress any key to exit...' },
- }, true, {})
- vim.fn.getchar()
- os.exit(1)
- end
-end
-vim.opt.rtp:prepend(lazypath)
-
--- NOTE: All plugins are automatically discovered via the
--- 'plugins' directory.
---
--- Plugins can also be added by using a table, with the first
--- argument being the link and the following keys can be used
--- to configure plugin behavior/loading/etc.
---
--- Use `opts = {}` to automatically pass options to a plugin's
--- `setup()` function, forcing the plugin to be loaded.
---
--- Alternatively, use `config = function() ... end` for full
--- control over the configuration.
---
--- `setup` may also be called explicitly:
--- {
--- 'lewis6991/gitsigns.nvim',
--- config = function()
--- require('gitsigns').setup({
--- -- Your gitsigns configuration here
--- })
--- end,
--- }
---
--- NOTE: Plugins can also be configured to run Lua code when they are loaded.
---
--- This is often very useful to both group configuration, as well as handle
--- lazy loading plugins that don't need to be loaded immediately at startup.
---
--- For example, in the whichkey configuration, we use:
--- event = 'VimEnter'
---
--- which loads which-key before all the UI elements are loaded. Events can be
--- normal autocommands events (`:help autocmd-events`).
---
--- Then, because we use the `opts` key (recommended), the configuration runs
--- after the plugin has been loaded as `require(MODULE).setup(opts)`.
---
--- NOTE: Plugins can specify dependencies.
---
--- The dependencies are proper plugin specifications as well - anything
--- you do for a plugin at the top level, you can do for a dependency.
---
--- Use the `dependencies` key to specify the dependencies of a particular plugin
-
-require('lazy').setup({
- spec = {
- { import = 'plugins' },
- },
- install = { colorscheme = { 'tokyonight' } },
- -- Check for plugin updates automatically.
- checker = { enabled = true, notify = false },
-}, {
- ui = {
- -- If Nerd Fonts are enabled, we set the icons to an empty table to use the
- -- default lazy.nvim defined Nerd Font icons, otherwise define a unicode icons
- -- table
- icons = vim.g.have_nerd_font and {} or {
- cmd = 'โŒ˜',
- config = '๐Ÿ› ',
- event = '๐Ÿ“…',
- ft = '๐Ÿ“‚',
- init = 'โš™',
- keys = '๐Ÿ—',
- plugin = '๐Ÿ”Œ',
- runtime = '๐Ÿ’ป',
- require = '๐ŸŒ™',
- source = '๐Ÿ“„',
- start = '๐Ÿš€',
- task = '๐Ÿ“Œ',
- lazy = '๐Ÿ’ค ',
- },
- },
-})
diff --git a/nvim/.config/nvim/lua/eugenetriguba/autocmds.lua b/nvim/.config/nvim/lua/eugenetriguba/autocmds.lua
new file mode 100644
index 0000000..145d00a
--- /dev/null
+++ b/nvim/.config/nvim/lua/eugenetriguba/autocmds.lua
@@ -0,0 +1,8 @@
+-- Highlight when yanking (copying) text
+vim.api.nvim_create_autocmd('TextYankPost', {
+ desc = 'Highlight when yanking (copying) text',
+ group = vim.api.nvim_create_augroup('highlight-yank', { clear = true }),
+ callback = function()
+ vim.hl.on_yank()
+ end,
+})
diff --git a/nvim/.config/nvim/lua/config/global.lua b/nvim/.config/nvim/lua/eugenetriguba/global.lua
index 8581ae9..f31ae13 100644
--- a/nvim/.config/nvim/lua/config/global.lua
+++ b/nvim/.config/nvim/lua/eugenetriguba/global.lua
@@ -3,13 +3,6 @@
vim.g.mapleader = ' '
vim.g.maplocalleader = ' '
--- Set to true if you have a Nerd Font installed and selected in the terminal
-vim.g.have_nerd_font = true
-
--- Disable netrw
-vim.g.loaded_netrw = 1
-vim.g.loaded_netrwPlugin = 1
-
-- Set Python 3 to a virtual environment with `pynvim` installed
-- to support python plugins.
vim.g.python3_host_prog = vim.fn.expand '~/.config/nvim/venv/bin/python'
diff --git a/nvim/.config/nvim/lua/eugenetriguba/init.lua b/nvim/.config/nvim/lua/eugenetriguba/init.lua
new file mode 100644
index 0000000..d372afd
--- /dev/null
+++ b/nvim/.config/nvim/lua/eugenetriguba/init.lua
@@ -0,0 +1,5 @@
+require 'eugenetriguba.global'
+require 'eugenetriguba.keymaps'
+require 'eugenetriguba.autocmds'
+require 'eugenetriguba.options'
+require 'eugenetriguba.plugins'
diff --git a/nvim/.config/nvim/lua/config/keymaps.lua b/nvim/.config/nvim/lua/eugenetriguba/keymaps.lua
index 46beb9c..6d88773 100644
--- a/nvim/.config/nvim/lua/config/keymaps.lua
+++ b/nvim/.config/nvim/lua/eugenetriguba/keymaps.lua
@@ -1,31 +1,17 @@
--- [[ Keymaps ]]
--- See `:help vim.keymap.set()`
local map = vim.keymap.set
-local telescope = require('telescope.builtin')
-
-map('n', '<leader>ff', telescope.find_files, { desc = 'Telescope find files' })
-map('n', '<leader>fg', telescope.live_grep, { desc = 'Telescope live grep' })
-map('n', '<leader>fb', telescope.buffers, { desc = 'Telescope buffers' })
-map('n', '<leader>fh', telescope.help_tags, { desc = 'Telescope help tags' })
-
map("n", "<leader>sh", ":split<CR>")
map("n", "<leader>sv", ":vsplit<CR>")
-- Clear highlights on search when pressing <Esc> in normal mode
--- See `:help hlsearch`
map('n', '<Esc>', '<cmd>nohlsearch<CR>')
-- Diagnostic keymaps
map('n', '<leader>q', vim.diagnostic.setloclist, { desc = 'Open diagnostic [Q]uickfix list' })
-- Exit terminal mode in the builtin terminal with a shortcut that is a bit easier
--- to discover. Otherwise, you normally need to press <C-\><C-n>.
---
--- NOTE: This won't work in all terminal emulators/tmux/etc.
--- Try your own mapping or just use <C-\><C-n> to exit terminal mode
-map('t', '<Esc>', '<C-\\><C-n>', { desc = 'Exit terminal mode' })
-map('t', '<C-v><Esc>', '<Esc>', { desc = 'Verbatim escape' })
+-- to remember.
+map('t', '<Esc><Esc>', '<C-\\><C-n>', { desc = 'Exit terminal mode' })
-- Keybinds to make split navigation easier.
-- Use CTRL+<hjkl> to switch between windows
@@ -36,12 +22,6 @@ map('n', '<C-l>', '<C-w><C-l>', { desc = 'Move focus to the right window' })
map('n', '<C-j>', '<C-w><C-j>', { desc = 'Move focus to the lower window' })
map('n', '<C-k>', '<C-w><C-k>', { desc = 'Move focus to the upper window' })
--- NOTE: Some terminals have colliding keymaps or are not able to send distinct keycodes
-map('n', '<C-S-h>', '<C-w>H', { desc = 'Move window to the left' })
-map('n', '<C-S-l>', '<C-w>L', { desc = 'Move window to the right' })
-map('n', '<C-S-j>', '<C-w>J', { desc = 'Move window to the lower' })
-map('n', '<C-S-k>', '<C-w>K', { desc = 'Move window to the upper' })
-
local function confirm_and_delete_buffer()
local confirm = vim.fn.confirm("Delete buffer and file?", "&Y\n&N", 2)
diff --git a/nvim/.config/nvim/lua/config/options.lua b/nvim/.config/nvim/lua/eugenetriguba/options.lua
index 77d38c3..2634748 100644
--- a/nvim/.config/nvim/lua/config/options.lua
+++ b/nvim/.config/nvim/lua/eugenetriguba/options.lua
@@ -1,6 +1,3 @@
--- [[ Setting options ]]
--- See `:help vim.opt`
--- For more options, see `:help option-list`
local opt = vim.opt
-- Make line numbers default
@@ -93,4 +90,5 @@ opt.listchars = { tab = 'ยป ', trail = 'ยท', nbsp = 'โฃ' }
-- Preview substitutions live, as you type!
opt.inccommand = 'split'
+-- Add a spell file for files that are spell checked
opt.spellfile = vim.fn.stdpath 'config' .. '/spell/en.utf-8.add'
diff --git a/nvim/.config/nvim/lua/eugenetriguba/plugins/blink.lua b/nvim/.config/nvim/lua/eugenetriguba/plugins/blink.lua
new file mode 100644
index 0000000..930acbd
--- /dev/null
+++ b/nvim/.config/nvim/lua/eugenetriguba/plugins/blink.lua
@@ -0,0 +1,87 @@
+vim.pack.add {
+ {
+ name = 'blink.cmp',
+ src = 'https://github.com/saghen/blink.cmp',
+ },
+ {
+ name = 'LuaSnip',
+ src = 'https://github.com/L3MON4D3/LuaSnip',
+ },
+ {
+ name = 'friendly-snippets',
+ src = 'https://github.com/rafamadriz/friendly-snippets',
+ },
+ {
+ name = 'lazydev.nvim',
+ src = 'https://github.com/folke/lazydev.nvim',
+ },
+}
+
+local lsp = vim.api.nvim_create_augroup('lsp', { clear = true })
+vim.api.nvim_create_autocmd('FileType', {
+ desc = 'Setup lua lsp on lua filetype',
+ pattern = 'lua',
+ group = lsp,
+ callback = function()
+ require('lazydev').setup {
+ library = {
+ -- Load luvit types when the `vim.uv` word is found
+ { path = '${3rd}/luv/library', words = { 'vim%.uv' } },
+ },
+ }
+ end,
+})
+
+require('luasnip').setup {}
+require('luasnip.loaders.from_vscode').lazy_load() -- load friendly-snippets
+
+require('blink.cmp').setup {
+ keymap = {
+ preset = 'default',
+ },
+
+ appearance = {
+ nerd_font_variant = 'mono',
+ },
+
+ completion = {
+ documentation = {
+ auto_show = true,
+ auto_show_delay_ms = 500,
+ },
+ },
+
+ sources = {
+ default = {
+ 'lsp',
+ 'path',
+ 'snippets',
+ 'lazydev',
+ },
+ providers = {
+ lazydev = {
+ module = 'lazydev.integrations.blink',
+ score_offset = 100,
+ },
+ },
+ },
+ snippets = { preset = 'luasnip' },
+ fuzzy = { implementation = 'prefer_rust_with_warning' },
+ signature = { enabled = true },
+}
+
+vim.api.nvim_create_user_command('BlinkBuild', function()
+ local utils = require 'eugenetirguba.utils'
+ local blink_path = vim.fn.stdpath 'data' .. '/site/pack/core/opt/blink.cmp'
+ utils.build_with_job({ 'cargo', '+nightly', 'build', '--release' }, blink_path, 'blink.cmp')
+end, { desc = 'Build blink.cmp' })
+
+vim.api.nvim_create_user_command('LuaSnipBuild', function()
+ if vim.fn.has 'win32' == 1 or vim.fn.executable 'make' == 0 then
+ vim.notify 'LuaSnip build not supported on this system'
+ return
+ end
+ local utils = require 'eugenetirguba.utils'
+ local luasnip_path = vim.fn.stdpath 'data' .. '/site/pack/core/opt/LuaSnip'
+ utils.build_with_job({ 'make', 'install_jsregexp' }, luasnip_path, 'LuaSnip')
+end, { desc = 'Build LuaSnip jsregexp' })
diff --git a/nvim/.config/nvim/lua/eugenetriguba/plugins/colorschemes.lua b/nvim/.config/nvim/lua/eugenetriguba/plugins/colorschemes.lua
new file mode 100644
index 0000000..63e3cf8
--- /dev/null
+++ b/nvim/.config/nvim/lua/eugenetriguba/plugins/colorschemes.lua
@@ -0,0 +1,14 @@
+vim.pack.add {
+ {
+ name = 'tokyonight',
+ src = 'https://github.com/folke/tokyonight.nvim',
+ },
+}
+
+
+require('tokyonight').setup {
+ styles = {
+ comments = { italic = false },
+ },
+}
+vim.cmd.colorscheme 'tokyonight'
diff --git a/nvim/.config/nvim/lua/eugenetriguba/plugins/conform.lua b/nvim/.config/nvim/lua/eugenetriguba/plugins/conform.lua
new file mode 100644
index 0000000..d177759
--- /dev/null
+++ b/nvim/.config/nvim/lua/eugenetriguba/plugins/conform.lua
@@ -0,0 +1,95 @@
+vim.pack.add({
+ {
+ name = 'conform',
+ src = 'https://github.com/stevearc/conform.nvim',
+ },
+}, { load = false })
+
+vim.api.nvim_create_autocmd('VimEnter', {
+ once = true,
+ callback = function()
+ local prettier_fmt = { 'prettierd', 'prettier', stop_after_first = true }
+ require('conform').setup {
+ notify_on_error = true,
+ format_on_save = function(bufnr)
+ if vim.g.disable_autoformat or vim.b[bufnr].disable_autoformat then
+ return
+ end
+ return {
+ timeout_ms = 500,
+ lsp_format = 'fallback',
+ }
+ end,
+ formatters_by_ft = {
+ lua = { 'stylua' },
+ go = { 'goimports', 'gofmt' },
+ python = { 'isort', 'black' },
+ rust = { 'rustfmt' },
+ javascript = prettier_fmt,
+ typescript = prettier_fmt,
+ javascriptreact = prettier_fmt,
+ typescriptreact = prettier_fmt,
+ css = prettier_fmt,
+ htmldjango = prettier_fmt,
+ html = prettier_fmt,
+ sh = { 'shfmt' },
+ cpp = { 'clang-format' },
+ c = { 'clang-format' },
+ tf = { 'terraformfmt' },
+ },
+ formatters = {
+ isort = {
+ prepend_args = { '--profile', 'black' },
+ },
+ },
+ }
+ end,
+})
+
+-- Format current buffer
+vim.keymap.set({ 'n', 'v' }, '<leader>f', function()
+ require('conform').format { async = true, lsp_format = 'fallback' }
+end, { desc = '[F]ormat buffer' })
+
+-- Toggle autoformat for current buffer
+vim.keymap.set('n', '<leader>tf', function()
+ if vim.b.disable_autoformat then
+ vim.cmd 'FormatEnable'
+ vim.notify 'Enabled autoformat for current buffer'
+ else
+ vim.cmd 'FormatDisable!'
+ vim.notify 'Disabled autoformat for current buffer'
+ end
+end, { desc = 'Toggle autoformat for current buffer' })
+
+-- Toggle autoformat globally
+vim.keymap.set('n', '<leader>tF', function()
+ if vim.g.disable_autoformat then
+ vim.cmd 'FormatEnable'
+ vim.notify 'Enabled autoformat globally'
+ else
+ vim.cmd 'FormatDisable'
+ vim.notify 'Disabled autoformat globally'
+ end
+end, { desc = 'Toggle autoformat globally' })
+
+-- :FormatDisable! disables autoformat for this buffer only
+-- :FormatDisable disables autoformat globally
+vim.api.nvim_create_user_command('FormatDisable', function(args)
+ if args.bang then
+ vim.b.disable_autoformat = true
+ else
+ vim.g.disable_autoformat = true
+ end
+end, {
+ desc = 'Disable autoformat-on-save',
+ bang = true,
+})
+
+-- :FormatEnable enables autoformat globally and for this buffer
+vim.api.nvim_create_user_command('FormatEnable', function()
+ vim.b.disable_autoformat = false
+ vim.g.disable_autoformat = false
+end, {
+ desc = 'Re-enable autoformat-on-save',
+})
diff --git a/nvim/.config/nvim/lua/eugenetriguba/plugins/copilot.lua b/nvim/.config/nvim/lua/eugenetriguba/plugins/copilot.lua
new file mode 100644
index 0000000..c6e3a03
--- /dev/null
+++ b/nvim/.config/nvim/lua/eugenetriguba/plugins/copilot.lua
@@ -0,0 +1,32 @@
+vim.pack.add({
+ { name = 'copilot.lua', src = 'https://github.com/zbirenbaum/copilot.lua' },
+ { name = 'plenary.nvim', src = 'https://github.com/nvim-lua/plenary.nvim' },
+ {
+ name = 'CopilotChat.nvim',
+ src = 'https://github.com/CopilotC-Nvim/CopilotChat.nvim',
+ },
+}, { load = false })
+
+vim.api.nvim_create_autocmd('VimEnter', {
+ once = true,
+ callback = function()
+ require('copilot').setup {
+ suggestion = { enabled = false },
+ panel = { enabled = false },
+ }
+
+ require('CopilotChat').setup {
+ model = 'claude-3.5-sonnet',
+ }
+
+ vim.keymap.set('n', '<leader>tc', function()
+ vim.cmd 'CopilotChatToggle'
+ end, { desc = '[T]oggle [C]opilot Chat' })
+ end,
+})
+
+vim.api.nvim_create_user_command('CopilotChatBuild', function()
+ local utils = require 'eugenetriguba.utils'
+ local copilot_path = vim.fn.stdpath 'data' .. '/site/pack/core/opt/CopilotChat.nvim'
+ utils.build_with_job({ 'make', 'tiktoken' }, copilot_path, 'CopilotChat.nvim')
+end, { desc = 'Build CopilotChat' })
diff --git a/nvim/.config/nvim/lua/eugenetriguba/plugins/fzf-lua.lua b/nvim/.config/nvim/lua/eugenetriguba/plugins/fzf-lua.lua
new file mode 100644
index 0000000..0b7029d
--- /dev/null
+++ b/nvim/.config/nvim/lua/eugenetriguba/plugins/fzf-lua.lua
@@ -0,0 +1,30 @@
+vim.pack.add({
+ {
+ name = 'fzf-lua',
+ src = 'https://github.com/ibhagwan/fzf-lua',
+ },
+ {
+ name = 'nvim-web-devicons',
+ src = 'https://github.com/nvim-tree/nvim-web-devicons',
+ },
+}, { load = false })
+
+vim.api.nvim_create_autocmd('VimEnter', {
+ once = true,
+ callback = function()
+ require('fzf-lua').setup {}
+ vim.keymap.set('n', '<leader>sh', require('fzf-lua').help_tags, { desc = '[S]earch [H]elp' })
+ vim.keymap.set('n', '<leader>sk', require('fzf-lua').keymaps, { desc = '[S]earch [K]eymaps' })
+ vim.keymap.set('n', '<leader>sf', require('fzf-lua').files, { desc = '[S]earch [F]iles' })
+ vim.keymap.set('n', '<leader>ss', require('fzf-lua').builtin, { desc = '[S]earch [S]elect Telescope' })
+ vim.keymap.set('n', '<leader>sw', require('fzf-lua').grep_cword, { desc = '[S]earch current [W]ord' })
+ vim.keymap.set('n', '<leader>sg', require('fzf-lua').live_grep, { desc = '[S]earch by [G]rep' })
+ vim.keymap.set('n', '<leader>sd', require('fzf-lua').diagnostics_document, { desc = '[S]earch [D]iagnostics' })
+ vim.keymap.set('n', '<leader>sr', require('fzf-lua').resume, { desc = '[S]earch [R]esume' })
+ vim.keymap.set('n', '<leader>s.', require('fzf-lua').oldfiles, { desc = '[S]earch Recent Files ("." for repeat)' })
+ vim.keymap.set('n', '<leader><leader>', require('fzf-lua').buffers, { desc = '[ ] Find existing buffers' })
+ vim.keymap.set('n', '<leader>sn', function()
+ require('fzf-lua').files { cwd = vim.fn.stdpath 'config' }
+ end, { desc = '[S]earch [N]eovim files' })
+ end,
+})
diff --git a/nvim/.config/nvim/lua/eugenetriguba/plugins/gitsigns.lua b/nvim/.config/nvim/lua/eugenetriguba/plugins/gitsigns.lua
new file mode 100644
index 0000000..a3fd83a
--- /dev/null
+++ b/nvim/.config/nvim/lua/eugenetriguba/plugins/gitsigns.lua
@@ -0,0 +1,66 @@
+vim.pack.add {
+ {
+ name = 'gitsigns',
+ src = 'https://github.com/lewis6991/gitsigns.nvim',
+ },
+}
+
+require('gitsigns').setup {
+ signs = {
+ add = { text = '+' },
+ change = { text = '~' },
+ delete = { text = '_' },
+ topdelete = { text = 'โ€พ' },
+ changedelete = { text = '~' },
+ },
+ on_attach = function(bufnr)
+ local gitsigns = require 'gitsigns'
+
+ local function map(mode, l, r, opts)
+ opts = opts or {}
+ opts.buffer = bufnr
+ vim.keymap.set(mode, l, r, opts)
+ end
+
+ -- Navigation
+ map('n', ']c', function()
+ if vim.wo.diff then
+ vim.cmd.normal { ']c', bang = true }
+ else
+ gitsigns.nav_hunk 'next'
+ end
+ end, { desc = 'Jump to next git [c]hange' })
+
+ map('n', '[c', function()
+ if vim.wo.diff then
+ vim.cmd.normal { '[c', bang = true }
+ else
+ gitsigns.nav_hunk 'prev'
+ end
+ end, { desc = 'Jump to previous git [c]hange' })
+
+ -- Actions
+ -- visual mode
+ map('v', '<leader>hs', function()
+ gitsigns.stage_hunk { vim.fn.line '.', vim.fn.line 'v' }
+ end, { desc = 'git [s]tage hunk' })
+ map('v', '<leader>hr', function()
+ gitsigns.reset_hunk { vim.fn.line '.', vim.fn.line 'v' }
+ end, { desc = 'git [r]eset hunk' })
+ -- normal mode
+ map('n', '<leader>hs', gitsigns.stage_hunk, { desc = 'git [s]tage hunk' })
+ map('n', '<leader>hr', gitsigns.reset_hunk, { desc = 'git [r]eset hunk' })
+ map('n', '<leader>hS', gitsigns.stage_buffer, { desc = 'git [S]tage buffer' })
+ map('n', '<leader>hu', gitsigns.undo_stage_hunk, { desc = 'git [u]ndo stage hunk' })
+ map('n', '<leader>hR', gitsigns.reset_buffer, { desc = 'git [R]eset buffer' })
+ map('n', '<leader>hp', gitsigns.preview_hunk, { desc = 'git [p]review hunk' })
+ map('n', '<leader>hb', gitsigns.blame_line, { desc = 'git [b]lame line' })
+ map('n', '<leader>hd', gitsigns.diffthis, { desc = 'git [d]iff against index' })
+ map('n', '<leader>hD', function()
+ gitsigns.diffthis '@'
+ end, { desc = 'git [D]iff against last commit' })
+ -- Toggles
+ map('n', '<leader>tb', gitsigns.toggle_current_line_blame, { desc = '[T]oggle git show [b]lame line' })
+ map('n', '<leader>tD', gitsigns.toggle_deleted, { desc = '[T]oggle git show [D]eleted' })
+ end,
+}
diff --git a/nvim/.config/nvim/lua/plugins/harpoon.lua b/nvim/.config/nvim/lua/eugenetriguba/plugins/harpoon.lua
index bf43c5d..6d3b050 100644
--- a/nvim/.config/nvim/lua/plugins/harpoon.lua
+++ b/nvim/.config/nvim/lua/eugenetriguba/plugins/harpoon.lua
@@ -1,8 +1,18 @@
-return {
- 'ThePrimeagen/harpoon',
- branch = 'harpoon2',
- dependencies = { 'nvim-lua/plenary.nvim' },
- config = function()
+vim.pack.add({
+ {
+ name = 'harpoon',
+ src = 'https://github.com/ThePrimeagen/harpoon',
+ version = 'harpoon2',
+ },
+ {
+ name = 'plenary',
+ src = 'https://github.com/nvim-lua/plenary.nvim',
+ },
+}, { load = false })
+
+vim.api.nvim_create_autocmd('VimEnter', {
+ once = true,
+ callback = function()
local harpoon = require 'harpoon'
harpoon:setup()
@@ -33,4 +43,4 @@ return {
harpoon:list():next()
end)
end,
-}
+})
diff --git a/nvim/.config/nvim/lua/eugenetriguba/plugins/indent_line.lua b/nvim/.config/nvim/lua/eugenetriguba/plugins/indent_line.lua
new file mode 100644
index 0000000..f6c0e8f
--- /dev/null
+++ b/nvim/.config/nvim/lua/eugenetriguba/plugins/indent_line.lua
@@ -0,0 +1,8 @@
+vim.pack.add {
+ {
+ name = 'indent-blankline',
+ src = 'https://github.com/lukas-reineke/indent-blankline.nvim',
+ },
+}
+
+require('ibl').setup()
diff --git a/nvim/.config/nvim/lua/eugenetriguba/plugins/init.lua b/nvim/.config/nvim/lua/eugenetriguba/plugins/init.lua
new file mode 100644
index 0000000..40e52f0
--- /dev/null
+++ b/nvim/.config/nvim/lua/eugenetriguba/plugins/init.lua
@@ -0,0 +1,22 @@
+local plugins = {
+ 'tree-sitter',
+ 'colorschemes',
+ 'which-key',
+ 'indent_line',
+ 'conform',
+ 'fzf-lua',
+ 'gitsigns',
+ 'harpoon',
+ 'lint',
+ 'mini',
+ 'oil',
+ 'lsp',
+ 'blink',
+ 'tmux-navigator',
+ 'copilot',
+ 'lazygit',
+}
+
+for _, plugin in ipairs(plugins) do
+ pcall(require, 'eugenetriguba.plugins.' .. plugin)
+end
diff --git a/nvim/.config/nvim/lua/eugenetriguba/plugins/lazygit.lua b/nvim/.config/nvim/lua/eugenetriguba/plugins/lazygit.lua
new file mode 100644
index 0000000..e998657
--- /dev/null
+++ b/nvim/.config/nvim/lua/eugenetriguba/plugins/lazygit.lua
@@ -0,0 +1,26 @@
+vim.pack.add {
+ { name = 'lazygit.nvim', src = 'https://github.com/kdheepak/lazygit.nvim' },
+ { name = 'plenary.nvim', src = 'https://github.com/nvim-lua/plenary.nvim' },
+}
+
+vim.api.nvim_create_user_command('LazyGit', function()
+ require('lazygit').lazygit()
+end, {})
+
+vim.api.nvim_create_user_command('LazyGitConfig', function()
+ require('lazygit').lazygit_config()
+end, {})
+
+vim.api.nvim_create_user_command('LazyGitCurrentFile', function()
+ require('lazygit').lazygit_current_file()
+end, {})
+
+vim.api.nvim_create_user_command('LazyGitFilter', function()
+ require('lazygit').lazygit_filter()
+end, {})
+
+vim.api.nvim_create_user_command('LazyGitFilterCurrentFile', function()
+ require('lazygit').lazygit_filter_current_file()
+end, {})
+
+vim.keymap.set('n', '<leader>lg', '<cmd>LazyGit<cr>', { desc = 'LazyGit' })
diff --git a/nvim/.config/nvim/lua/eugenetriguba/plugins/lint.lua b/nvim/.config/nvim/lua/eugenetriguba/plugins/lint.lua
new file mode 100644
index 0000000..72f9a51
--- /dev/null
+++ b/nvim/.config/nvim/lua/eugenetriguba/plugins/lint.lua
@@ -0,0 +1,52 @@
+vim.pack.add({
+ {
+ name = 'nvim-lint',
+ src = 'https://github.com/mfussenegger/nvim-lint',
+ },
+}, { load = false })
+
+vim.api.nvim_create_autocmd({ 'BufReadPre', 'BufNewFile' }, {
+ callback = function()
+ -- Default linters, which will cause errors unless these tools are available:
+ -- {
+ -- clojure = { "clj-kondo" },
+ -- dockerfile = { "hadolint" },
+ -- inko = { "inko" },
+ -- janet = { "janet" },
+ -- json = { "jsonlint" },
+ -- markdown = { "vale" },
+ -- rst = { "vale" },
+ -- ruby = { "ruby" },
+ -- terraform = { "tflint" },
+ -- text = { "vale" }
+ -- }
+ --
+ -- They can be disabled by setting their filetypes to nil:
+ -- lint.linters_by_ft['clojure'] = nil
+
+ local lint = require 'lint'
+ lint.linters_by_ft = lint.linters_by_ft or {}
+ lint.linters_by_ft['cpp'] = { 'cppcheck' }
+ lint.linters_by_ft['dockerfile'] = { 'hadolint' }
+ lint.linters_by_ft['json'] = { 'jsonlint' }
+ lint.linters_by_ft['terraform'] = { 'tflint', 'terraform_validate' }
+ lint.linters_by_ft['python'] = { 'ruff', 'bandit' }
+ lint.linters_by_ft['markdown'] = nil
+ lint.linters_by_ft['text'] = nil
+ lint.linters_by_ft['sh'] = { 'shellcheck' }
+ lint.linters.shellcheck.args = { '-x' }
+
+ local lint_augroup = vim.api.nvim_create_augroup('lint', { clear = true })
+ vim.api.nvim_create_autocmd({ 'BufEnter', 'BufWritePost', 'InsertLeave' }, {
+ group = lint_augroup,
+ callback = function()
+ -- Only run the linter in buffers that you can modify in order to
+ -- avoid superfluous noise, notably within the handy LSP pop-ups that
+ -- describe the hovered symbol using Markdown.
+ if vim.opt_local.modifiable:get() then
+ lint.try_lint()
+ end
+ end,
+ })
+ end,
+})
diff --git a/nvim/.config/nvim/lua/eugenetriguba/plugins/lsp/diagnostics.lua b/nvim/.config/nvim/lua/eugenetriguba/plugins/lsp/diagnostics.lua
new file mode 100644
index 0000000..4ea0673
--- /dev/null
+++ b/nvim/.config/nvim/lua/eugenetriguba/plugins/lsp/diagnostics.lua
@@ -0,0 +1,27 @@
+-- See :help vim.diagnostic.Opts
+vim.diagnostic.config {
+ severity_sort = true,
+ float = { border = 'rounded', source = 'if_many' },
+ underline = { severity = vim.diagnostic.severity.ERROR },
+ signs = vim.g.have_nerd_font and {
+ text = {
+ [vim.diagnostic.severity.ERROR] = '๓ฐ…š ',
+ [vim.diagnostic.severity.WARN] = '๓ฐ€ช ',
+ [vim.diagnostic.severity.INFO] = '๓ฐ‹ฝ ',
+ [vim.diagnostic.severity.HINT] = '๓ฐŒถ ',
+ },
+ } or {},
+ virtual_text = {
+ source = 'if_many',
+ spacing = 2,
+ format = function(diagnostic)
+ local diagnostic_message = {
+ [vim.diagnostic.severity.ERROR] = diagnostic.message,
+ [vim.diagnostic.severity.WARN] = diagnostic.message,
+ [vim.diagnostic.severity.INFO] = diagnostic.message,
+ [vim.diagnostic.severity.HINT] = diagnostic.message,
+ }
+ return diagnostic_message[diagnostic.severity]
+ end,
+ },
+}
diff --git a/nvim/.config/nvim/lua/eugenetriguba/plugins/lsp/init.lua b/nvim/.config/nvim/lua/eugenetriguba/plugins/lsp/init.lua
new file mode 100644
index 0000000..065f34c
--- /dev/null
+++ b/nvim/.config/nvim/lua/eugenetriguba/plugins/lsp/init.lua
@@ -0,0 +1,3 @@
+require 'eugenetriguba.plugins.lsp.lspconfig'
+require 'eugenetriguba.plugins.lsp.diagnostics'
+require 'eugenetriguba.plugins.lsp.mason'
diff --git a/nvim/.config/nvim/lua/eugenetriguba/plugins/lsp/lspconfig.lua b/nvim/.config/nvim/lua/eugenetriguba/plugins/lsp/lspconfig.lua
new file mode 100644
index 0000000..2ce6198
--- /dev/null
+++ b/nvim/.config/nvim/lua/eugenetriguba/plugins/lsp/lspconfig.lua
@@ -0,0 +1,71 @@
+vim.pack.add {
+ {
+ name = 'nvim-lspconfig',
+ src = 'https://github.com/neovim/nvim-lspconfig',
+ },
+ {
+ name = 'fidget.nvim',
+ src = 'https://github.com/j-hui/fidget.nvim',
+ },
+}
+
+require('fidget').setup {}
+
+vim.api.nvim_create_autocmd('LspAttach', {
+ group = vim.api.nvim_create_augroup('lsp-attach', { clear = true }),
+ callback = function(event)
+ -- Utility to more easily define mappings specific for LSP related items.
+ -- It sets the mode, buffer and description for us each time.
+ local map = function(keys, func, desc, mode)
+ mode = mode or 'n'
+ vim.keymap.set(mode, keys, func, { buffer = event.buf, desc = 'LSP: ' .. desc })
+ end
+
+ map('grn', vim.lsp.buf.rename, '[R]e[n]ame')
+ map('gra', vim.lsp.buf.code_action, '[G]oto Code [A]ction', { 'n', 'x' })
+ map('grr', require('fzf-lua').lsp_references, '[G]oto [R]eferences')
+ map('gri', require('fzf-lua').lsp_implementations, '[G]oto [I]mplementation')
+ map('grd', require('fzf-lua').lsp_definitions, '[G]oto [D]efinition')
+ map('grD', vim.lsp.buf.declaration, '[G]oto [D]eclaration')
+ map('gO', require('fzf-lua').lsp_document_symbols, 'Open Document Symbols')
+ map('gW', require('fzf-lua').lsp_workspace_symbols, 'Open Workspace Symbols')
+ map('grt', require('fzf-lua').lsp_typedefs, '[G]oto [T]ype Definition')
+
+ -- Highlight references of the word under your cursor when your cursor
+ -- rests there for a little while.
+ --
+ -- See `:help CursorHold` for information about when this is executed
+ --
+ -- When you move your cursor, the highlights will be cleared (the second autocommand).
+ local client = vim.lsp.get_client_by_id(event.data.client_id)
+ if client and client:supports_method(vim.lsp.protocol.Methods.textDocument_documentHighlight, event.buf) then
+ local highlight_augroup = vim.api.nvim_create_augroup('lsp-highlight', { clear = false })
+ vim.api.nvim_create_autocmd({ 'CursorHold', 'CursorHoldI' }, {
+ buffer = event.buf,
+ group = highlight_augroup,
+ callback = vim.lsp.buf.document_highlight,
+ })
+
+ vim.api.nvim_create_autocmd({ 'CursorMoved', 'CursorMovedI' }, {
+ buffer = event.buf,
+ group = highlight_augroup,
+ callback = vim.lsp.buf.clear_references,
+ })
+
+ vim.api.nvim_create_autocmd('LspDetach', {
+ group = vim.api.nvim_create_augroup('lsp-detach', { clear = true }),
+ callback = function(event2)
+ vim.lsp.buf.clear_references()
+ vim.api.nvim_clear_autocmds { group = 'lsp-highlight', buffer = event2.buf }
+ end,
+ })
+ end
+
+ -- Keymap to toggle inlay hints if the language server supports them
+ if client and client:supports_method(vim.lsp.protocol.Methods.textDocument_inlayHint, event.buf) then
+ map('<leader>th', function()
+ vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled { bufnr = event.buf })
+ end, '[T]oggle Inlay [H]ints')
+ end
+ end,
+})
diff --git a/nvim/.config/nvim/lua/eugenetriguba/plugins/lsp/mason.lua b/nvim/.config/nvim/lua/eugenetriguba/plugins/lsp/mason.lua
new file mode 100644
index 0000000..2c2bde1
--- /dev/null
+++ b/nvim/.config/nvim/lua/eugenetriguba/plugins/lsp/mason.lua
@@ -0,0 +1,62 @@
+vim.pack.add {
+ {
+ name = 'mason.nvim',
+ src = 'https://github.com/williamboman/mason.nvim',
+ },
+ {
+ name = 'mason-lspconfig.nvim',
+ src = 'https://github.com/williamboman/mason-lspconfig.nvim',
+ },
+ {
+ name = 'mason-tool-installer.nvim',
+ src = 'https://github.com/WhoIsSethDaniel/mason-tool-installer.nvim',
+ },
+ {
+ name = 'blink.cmp',
+ src = 'https://github.com/saghen/blink.cmp',
+ },
+}
+
+require('mason').setup {}
+
+local capabilities = require('blink.cmp').get_lsp_capabilities()
+local servers = {
+ clangd = {},
+ gopls = {},
+ pyright = {},
+ rust_analyzer = {},
+ -- Note: https://github.com/pmizio/typescript-tools.nvim may be a better
+ -- LSP to use here at some point.
+ ts_ls = {},
+ lua_ls = {
+ settings = {
+ Lua = {
+ completion = {
+ callSnippet = 'Replace',
+ },
+ },
+ },
+ },
+ tailwindcss = {},
+ mesonlsp = {},
+ terraformls = {},
+}
+
+local ensure_installed = vim.tbl_keys(servers or {})
+vim.list_extend(ensure_installed, {
+ 'stylua', -- Used to format Lua code
+})
+require('mason-tool-installer').setup { ensure_installed = ensure_installed }
+
+require('mason-lspconfig').setup {
+ ensure_installed = {}, -- Populated via mason-tool-installer
+ automatic_installation = false,
+ automatic_enable = true,
+ handlers = {
+ function(server_name)
+ local server = servers[server_name] or {}
+ server.capabilities = vim.tbl_deep_extend('force', {}, capabilities, server.capabilities or {})
+ require('lspconfig')[server_name].setup(server)
+ end,
+ },
+}
diff --git a/nvim/.config/nvim/lua/eugenetriguba/plugins/mini.lua b/nvim/.config/nvim/lua/eugenetriguba/plugins/mini.lua
new file mode 100644
index 0000000..5f8f862
--- /dev/null
+++ b/nvim/.config/nvim/lua/eugenetriguba/plugins/mini.lua
@@ -0,0 +1,32 @@
+vim.pack.add {
+ {
+ name = 'mini',
+ src = 'https://github.com/echasnovski/mini.nvim',
+ },
+}
+
+require('mini.pairs').setup()
+
+-- Better Around/Inside textobjects
+--
+-- Examples:
+-- - va) - [V]isually select [A]round [)]paren
+-- - yinq - [Y]ank [I]nside [N]ext [Q]uote
+-- - ci' - [C]hange [I]nside [']quote
+require('mini.ai').setup { n_lines = 500 }
+
+-- Add/delete/replace surroundings (brackets, quotes, etc.)
+--
+-- - saiw) - [S]urround [A]dd [I]nner [W]ord [)]Paren
+-- - sd' - [S]urround [D]elete [']quotes
+-- - sr)' - [S]urround [R]eplace [)] [']
+-- require('mini.surround').setup()
+
+local statusline = require 'mini.statusline'
+statusline.setup { use_icons = true }
+
+-- Set the section for cursor location to LINE:COLUMN
+---@diagnostic disable-next-line: duplicate-set-field
+statusline.section_location = function()
+ return '%2l:%-2v'
+end
diff --git a/nvim/.config/nvim/lua/eugenetriguba/plugins/oil.lua b/nvim/.config/nvim/lua/eugenetriguba/plugins/oil.lua
new file mode 100644
index 0000000..e7d39c6
--- /dev/null
+++ b/nvim/.config/nvim/lua/eugenetriguba/plugins/oil.lua
@@ -0,0 +1,18 @@
+vim.pack.add {
+ {
+ name = 'oil',
+ src = 'https://github.com/stevearc/oil.nvim',
+ },
+ {
+ name = 'mini.icons',
+ src = 'https://github.com/echasnovski/mini.icons',
+ },
+}
+
+require('oil').setup {
+ keymaps = {
+ ['<C-l>'] = false, -- Clashes with tmux navigator
+ },
+}
+vim.keymap.set('n', '\\', '<CMD>Oil --float<CR>', { desc = 'Open parent directory in floating window' })
+vim.keymap.set('n', '-', '<CMD>Oil<CR>', { desc = 'Open parent directory' })
diff --git a/nvim/.config/nvim/lua/eugenetriguba/plugins/tmux-navigator.lua b/nvim/.config/nvim/lua/eugenetriguba/plugins/tmux-navigator.lua
new file mode 100644
index 0000000..2ec0035
--- /dev/null
+++ b/nvim/.config/nvim/lua/eugenetriguba/plugins/tmux-navigator.lua
@@ -0,0 +1,6 @@
+vim.pack.add {
+ {
+ name = 'vim-tmux-navigator',
+ src = 'https://github.com/christoomey/vim-tmux-navigator',
+ },
+}
diff --git a/nvim/.config/nvim/lua/eugenetriguba/plugins/tree-sitter.lua b/nvim/.config/nvim/lua/eugenetriguba/plugins/tree-sitter.lua
new file mode 100644
index 0000000..1f57e46
--- /dev/null
+++ b/nvim/.config/nvim/lua/eugenetriguba/plugins/tree-sitter.lua
@@ -0,0 +1,38 @@
+vim.pack.add {
+ {
+ name = 'nvim-treesitter',
+ src = 'https://github.com/nvim-treesitter/nvim-treesitter',
+ },
+ {
+ name = 'nvim-treesitter-context',
+ src = 'https://github.com/nvim-treesitter/nvim-treesitter-context',
+ },
+}
+
+require('nvim-treesitter.configs').setup {
+ ensure_installed = 'all',
+ auto_install = true,
+ modules = {},
+ sync_install = false,
+ ignore_install = { 'norg', 'org', 'ipkg' }, -- Issues installing them, unused anyway.
+ highlight = {
+ enable = true,
+ additional_vim_regex_highlighting = { 'ruby', 'cpp' },
+ },
+ indent = { enable = true, disable = { 'ruby', 'cpp' } },
+ incremental_selection = { enable = true },
+ context_commentstring = { enable = true },
+ textobjects = { enable = true },
+}
+
+local nts = require 'nvim-treesitter'
+vim.api.nvim_create_autocmd('PackChanged', {
+ callback = function(args)
+ local spec = args.data.spec
+ if spec and spec.name == 'nvim-treesitter' and args.data.kind == 'update' then
+ vim.schedule(function()
+ nts.update()
+ end)
+ end
+ end,
+})
diff --git a/nvim/.config/nvim/lua/eugenetriguba/plugins/which-key.lua b/nvim/.config/nvim/lua/eugenetriguba/plugins/which-key.lua
new file mode 100644
index 0000000..47c789d
--- /dev/null
+++ b/nvim/.config/nvim/lua/eugenetriguba/plugins/which-key.lua
@@ -0,0 +1,13 @@
+vim.pack.add({
+ {
+ name = 'which-key',
+ src = 'https://github.com/folke/which-key.nvim',
+ },
+}, { load = false })
+
+vim.api.nvim_create_autocmd('VimEnter', {
+ once = true,
+ callback = function()
+ require('which-key').setup {}
+ end,
+})
diff --git a/nvim/.config/nvim/lua/eugenetriguba/utils.lua b/nvim/.config/nvim/lua/eugenetriguba/utils.lua
new file mode 100644
index 0000000..de95803
--- /dev/null
+++ b/nvim/.config/nvim/lua/eugenetriguba/utils.lua
@@ -0,0 +1,23 @@
+local M = {}
+
+M.build_with_job = function(cmd, cwd, name)
+ vim.notify('Building ' .. name .. '...', vim.log.levels.INFO)
+
+ vim.fn.jobstart(cmd, {
+ cwd = cwd,
+ on_exit = function(_, code)
+ if code == 0 then
+ vim.notify(name .. ' build completed successfully!', vim.log.levels.INFO)
+ else
+ vim.notify(name .. ' build failed with code ' .. code, vim.log.levels.ERROR)
+ end
+ end,
+ on_stdout = function(_, data)
+ if data and #data > 0 and data[1] ~= '' then
+ vim.notify(name .. ': ' .. table.concat(data, '\n'), vim.log.levels.DEBUG)
+ end
+ end,
+ })
+end
+
+return M
diff --git a/nvim/.config/nvim/lua/plugins/autopairs.lua b/nvim/.config/nvim/lua/plugins/autopairs.lua
deleted file mode 100644
index 8171237..0000000
--- a/nvim/.config/nvim/lua/plugins/autopairs.lua
+++ /dev/null
@@ -1,14 +0,0 @@
--- autopairs
--- https://github.com/windwp/nvim-autopairs
-
-return {
- 'windwp/nvim-autopairs',
- event = 'InsertEnter',
- config = function()
- local autopairs = require 'nvim-autopairs'
- autopairs.setup {
- check_ts = true, -- Use treesitter for smarter pairing
- disable_filetype = { 'TelescopePrompt' },
- }
- end,
-}
diff --git a/nvim/.config/nvim/lua/plugins/barbar.lua b/nvim/.config/nvim/lua/plugins/barbar.lua
deleted file mode 100644
index 9787b05..0000000
--- a/nvim/.config/nvim/lua/plugins/barbar.lua
+++ /dev/null
@@ -1,74 +0,0 @@
-return {
- {
- 'romgrk/barbar.nvim',
- dependencies = {
- 'lewis6991/gitsigns.nvim',
- 'nvim-tree/nvim-web-devicons',
- },
- init = function()
- vim.g.barbar_auto_setup = false
- end,
- version = '^1.0.0',
- config = function()
- require('barbar').setup {}
-
- local map = vim.api.nvim_set_keymap
- local opts = { noremap = true, silent = true }
-
- -- Move to previous/next
- map('n', '<A-,>', '<Cmd>BufferPrevious<CR>', opts)
- map('n', '<A-.>', '<Cmd>BufferNext<CR>', opts)
-
- -- Re-order to previous/next
- map('n', '<A-<>', '<Cmd>BufferMovePrevious<CR>', opts)
- map('n', '<A->>', '<Cmd>BufferMoveNext<CR>', opts)
-
- -- Goto buffer in position...
- map('n', '<A-1>', '<Cmd>BufferGoto 1<CR>', opts)
- map('n', '<A-2>', '<Cmd>BufferGoto 2<CR>', opts)
- map('n', '<A-3>', '<Cmd>BufferGoto 3<CR>', opts)
- map('n', '<A-4>', '<Cmd>BufferGoto 4<CR>', opts)
- map('n', '<A-5>', '<Cmd>BufferGoto 5<CR>', opts)
- map('n', '<A-6>', '<Cmd>BufferGoto 6<CR>', opts)
- map('n', '<A-7>', '<Cmd>BufferGoto 7<CR>', opts)
- map('n', '<A-8>', '<Cmd>BufferGoto 8<CR>', opts)
- map('n', '<A-9>', '<Cmd>BufferGoto 9<CR>', opts)
- map('n', '<A-0>', '<Cmd>BufferLast<CR>', opts)
-
- -- Pin/unpin buffer
- map('n', '<A-p>', '<Cmd>BufferPin<CR>', opts)
-
- -- Goto pinned/unpinned buffer
- -- :BufferGotoPinned
- -- :BufferGotoUnpinned
-
- -- Close buffer
- map('n', '<A-c>', '<Cmd>BufferClose<CR>', opts)
-
- -- Wipeout buffer
- -- :BufferWipeout
-
- -- Close commands
- -- :BufferCloseAllButCurrent
- -- :BufferCloseAllButPinned
- -- :BufferCloseAllButCurrentOrPinned
- -- :BufferCloseBuffersLeft
- -- :BufferCloseBuffersRight
-
- -- Magic buffer-picking mode
- map('n', '<C-p>', '<Cmd>BufferPick<CR>', opts)
- map('n', '<C-s-p>', '<Cmd>BufferPickDelete<CR>', opts)
-
- -- Sort automatically by...
- map('n', '<Space>bb', '<Cmd>BufferOrderByBufferNumber<CR>', opts)
- map('n', '<Space>bn', '<Cmd>BufferOrderByName<CR>', opts)
- map('n', '<Space>bd', '<Cmd>BufferOrderByDirectory<CR>', opts)
- map('n', '<Space>bl', '<Cmd>BufferOrderByLanguage<CR>', opts)
- map('n', '<Space>bw', '<Cmd>BufferOrderByWindowNumber<CR>', opts)
-
- -- Other:
- -- :BarbarEnable - enables barbar (enabled by default)
- -- :BarbarDisable - very bad command, should never be used
- end,
- },
-}
diff --git a/nvim/.config/nvim/lua/plugins/blink.lua b/nvim/.config/nvim/lua/plugins/blink.lua
deleted file mode 100644
index e035292..0000000
--- a/nvim/.config/nvim/lua/plugins/blink.lua
+++ /dev/null
@@ -1,108 +0,0 @@
-return {
- { -- Autocompletion
- 'saghen/blink.cmp',
- build = 'cargo +nightly build --release',
- event = 'VimEnter',
- version = '*',
- dependencies = {
- -- Snippet Engine
- {
- 'L3MON4D3/LuaSnip',
- version = '2.*',
- build = (function()
- -- Build Step is needed for regex support in snippets.
- -- This step is not supported in many windows environments.
- -- Remove the below condition to re-enable on windows.
- if vim.fn.has 'win32' == 1 or vim.fn.executable 'make' == 0 then
- return
- end
- return 'make install_jsregexp'
- end)(),
- dependencies = {
- -- `friendly-snippets` contains a variety of premade snippets.
- -- See the README about individual language/framework/plugin snippets:
- -- https://github.com/rafamadriz/friendly-snippets
- -- {
- -- 'rafamadriz/friendly-snippets',
- -- config = function()
- -- require('luasnip.loaders.from_vscode').lazy_load()
- -- end,
- -- },
- },
- opts = {},
- },
- 'folke/lazydev.nvim',
- 'giuxtaposition/blink-cmp-copilot',
- },
- --- @module 'blink.cmp'
- --- @type blink.cmp.Config
- opts = {
- keymap = {
- -- 'default' (recommended) for mappings similar to built-in completions
- -- <c-y> to accept ([y]es) the completion.
- -- This will auto-import if your LSP supports it.
- -- This will expand snippets if the LSP sent a snippet.
- -- 'super-tab' for tab to accept
- -- 'enter' for enter to accept
- -- 'none' for no mappings
- --
- -- For an understanding of why the 'default' preset is recommended,
- -- you will need to read `:help ins-completion`
- --
- -- No, but seriously. Please read `:help ins-completion`, it is really good!
- --
- -- All presets have the following mappings:
- -- <tab>/<s-tab>: move to right/left of your snippet expansion
- -- <c-space>: Open menu or open docs if already open
- -- <c-n>/<c-p> or <up>/<down>: Select next/previous item
- -- <c-e>: Hide menu
- -- <c-k>: Toggle signature help
- --
- -- See :h blink-cmp-config-keymap for defining your own keymap
- preset = 'default',
-
- -- For more advanced Luasnip keymaps (e.g. selecting choice nodes, expansion) see:
- -- https://github.com/L3MON4D3/LuaSnip?tab=readme-ov-file#keymaps
- },
-
- appearance = {
- -- 'mono' (default) for 'Nerd Font Mono' or 'normal' for 'Nerd Font'
- -- Adjusts spacing to ensure icons are aligned
- nerd_font_variant = 'mono',
- },
-
- completion = {
- -- By default, you may press `<c-space>` to show the documentation.
- -- Optionally, set `auto_show = true` to show the documentation after a delay.
- documentation = { auto_show = true, auto_show_delay_ms = 500 },
- },
-
- sources = {
- default = { 'lsp', 'path', 'snippets', 'lazydev', 'copilot' },
- providers = {
- lazydev = { module = 'lazydev.integrations.blink', score_offset = 100 },
- copilot = {
- name = 'copilot',
- module = 'blink-cmp-copilot',
- score_offset = 100,
- async = true,
- },
- },
- },
-
- snippets = { preset = 'luasnip' },
-
- -- Blink.cmp includes an optional, recommended rust fuzzy matcher,
- -- which automatically downloads a prebuilt binary when enabled.
- --
- -- By default, we use the Lua implementation instead, but you may enable
- -- the rust implementation via `'prefer_rust_with_warning'`
- --
- -- See :h blink-cmp-config-fuzzy for more information
- fuzzy = { implementation = 'lua' },
-
- -- Shows a signature help window while you type arguments for a function
- signature = { enabled = true },
- },
- },
-}
diff --git a/nvim/.config/nvim/lua/plugins/colorizer.lua b/nvim/.config/nvim/lua/plugins/colorizer.lua
deleted file mode 100644
index e8ead01..0000000
--- a/nvim/.config/nvim/lua/plugins/colorizer.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-return {
- {
- "norcalli/nvim-colorizer.lua",
- config = function()
- require 'colorizer'.setup()
- end,
- }
-}
diff --git a/nvim/.config/nvim/lua/plugins/colorschemes.lua b/nvim/.config/nvim/lua/plugins/colorschemes.lua
deleted file mode 100644
index aae2d30..0000000
--- a/nvim/.config/nvim/lua/plugins/colorschemes.lua
+++ /dev/null
@@ -1,20 +0,0 @@
--- Setup the tokyonight color scheme.
---
--- To see what colorschemes are already installed: `:Telescope colorscheme`.
-
-return {
- {
- 'folke/tokyonight.nvim',
- priority = 1000,
- config = function()
- require('tokyonight').setup {
- styles = {
- comments = { italic = false }, -- Disable italics in comments
- },
- }
-
- -- Other styles: 'tokyonight-storm', 'tokyonight-moon', or 'tokyonight-day'.
- vim.cmd.colorscheme 'tokyonight'
- end,
- },
-}
diff --git a/nvim/.config/nvim/lua/plugins/conform.lua b/nvim/.config/nvim/lua/plugins/conform.lua
deleted file mode 100644
index cb43b27..0000000
--- a/nvim/.config/nvim/lua/plugins/conform.lua
+++ /dev/null
@@ -1,116 +0,0 @@
--- Conform adds code autoformatting funcionality.
-
-return {
- {
- 'stevearc/conform.nvim',
- event = { 'BufWritePre' },
- cmd = { 'ConformInfo' },
- lazy = false,
- keys = {
- {
- '<leader>f',
- function()
- require('conform').format { async = true, lsp_format = 'fallback' }
- end,
- mode = '',
- desc = '[F]ormat buffer',
- },
- {
- '<leader>tf',
- function()
- -- If autoformat is currently disabled for this buffer,
- -- then enable it, otherwise disable it
- if vim.b.disable_autoformat then
- vim.cmd 'FormatEnable'
- vim.notify 'Enabled autoformat for current buffer'
- else
- vim.cmd 'FormatDisable!'
- vim.notify 'Disabled autoformat for current buffer'
- end
- end,
- desc = 'Toggle autoformat for current buffer',
- },
- {
- '<leader>tF',
- function()
- -- If autoformat is currently disabled globally,
- -- then enable it globally, otherwise disable it globally
- if vim.g.disable_autoformat then
- vim.cmd 'FormatEnable'
- vim.notify 'Enabled autoformat globally'
- else
- vim.cmd 'FormatDisable'
- vim.notify 'Disabled autoformat globally'
- end
- end,
- desc = 'Toggle autoformat globally',
- },
- },
- opts = {
- notify_on_error = false,
- format_on_save = function(bufnr)
- -- Disable with a global or buffer-local variable
- if vim.g.disable_autoformat or vim.b[bufnr].disable_autoformat then
- return
- end
-
- -- Disable "format_on_save lsp_fallback" for certain languages.
- local disable_filetypes = { sql = true, c = true, cpp = true }
- if disable_filetypes[vim.bo[bufnr].filetype] then
- return nil
- end
-
- return {
- timeout_ms = 3000,
- lsp_format = 'fallback',
- }
- end,
- formatters_by_ft = {
- lua = { 'stylua' },
- go = { 'goimports', 'gofmt' },
- python = { 'black', 'isort' },
- rust = { 'rustfmt' },
- sh = { 'shfmt' },
- javascript = { 'prettierd', 'prettier', stop_after_first = true },
- typescript = { 'prettierd', 'prettier', stop_after_first = true },
- javascriptreact = { 'prettierd', 'prettier', stop_after_first = true },
- typescriptreact = { 'prettierd', 'prettier', stop_after_first = true },
- css = { 'prettierd', 'prettier', stop_after_first = true },
- htmldjango = { 'prettierd', 'prettier', stop_after_first = true },
- html = { 'prettierd', 'prettier', stop_after_first = true },
- tf = { 'terraform_fmt' },
- },
- formatters = {
- isort = {
- prepend_args = { '--profile', 'black' },
- },
- shfmt = {
- args = { '-i', '2' },
- },
- },
- },
- config = function(_, opts)
- require('conform').setup(opts)
-
- vim.api.nvim_create_user_command('FormatDisable', function(args)
- if args.bang then
- -- :FormatDisable! disables autoformat for this buffer only
- vim.b.disable_autoformat = true
- else
- -- :FormatDisable disables autoformat globally
- vim.g.disable_autoformat = true
- end
- end, {
- desc = 'Disable autoformat-on-save',
- bang = true, -- allows the ! variant
- })
-
- vim.api.nvim_create_user_command('FormatEnable', function()
- vim.b.disable_autoformat = false
- vim.g.disable_autoformat = false
- end, {
- desc = 'Re-enable autoformat-on-save',
- })
- end,
- },
-}
diff --git a/nvim/.config/nvim/lua/plugins/copilot.lua b/nvim/.config/nvim/lua/plugins/copilot.lua
deleted file mode 100644
index 7f99c10..0000000
--- a/nvim/.config/nvim/lua/plugins/copilot.lua
+++ /dev/null
@@ -1,29 +0,0 @@
-return {
- {
- 'zbirenbaum/copilot.lua',
- cmd = 'Copilot',
- event = 'InsertEnter',
- config = function()
- require('copilot').setup {
- suggestion = { enabled = false },
- panel = { enabled = false },
- }
- end,
- },
- {
- 'CopilotC-Nvim/CopilotChat.nvim',
- dependencies = {
- { 'zbirenbaum/copilot.lua' },
- { 'nvim-lua/plenary.nvim', branch = 'master' }, -- for curl, log and async functions
- },
- build = 'make tiktoken', -- Only on MacOS or Linux
- config = function()
- require('CopilotChat').setup {
- model = 'claude-3.5-sonnet',
- vim.keymap.set('n', '<leader>tc', function()
- vim.cmd 'CopilotChatToggle'
- end, { desc = '[T]oggle [C]opilot Chat' }),
- }
- end,
- },
-}
diff --git a/nvim/.config/nvim/lua/plugins/debug.lua b/nvim/.config/nvim/lua/plugins/debug.lua
deleted file mode 100644
index e8b3110..0000000
--- a/nvim/.config/nvim/lua/plugins/debug.lua
+++ /dev/null
@@ -1,239 +0,0 @@
--- debug.lua
---
--- Configures the DAP plugin to debug code.
-
----@class DapConfig
----@field name string Configuration name
----@field type string Debug adapter type
----@field request string Launch type ('launch' or 'attach')
----@field program function|string Path to executable or function returning path
----@field cwd string Working directory
----@field stopOnEntry boolean Whether to stop at entry point
----@field args table Command line arguments
----@field runInTerminal boolean Whether to run in terminal
-
----@class DapAdapter
----@field type string Adapter type ('server', 'executable', etc.)
----@field port string Port configuration
----@field executable table Executable configuration with command and args
-
--- Go debugging adapter setup
--- Configures delve debugger for Go with platform-specific settings
----@return nil
-local function setup_go_adapter()
- require('dap-go').setup {
- delve = {
- -- On Windows delve must be run attached or it crashes
- detached = vim.fn.has 'win32' == 0,
- },
- }
-end
-
--- Python debugging adapter setup
--- Configures Python debugger using python3 interpreter
----@return nil
-local function setup_python_adapter()
- require('dap-python').setup 'python3'
-end
-
--- CodeLLDB adapter setup
--- Configures LLDB-based debugger for native languages (C, C++, Rust, Zig)
----@param dap table # DAP module instance
----@return nil
-local function setup_codelldb_adapter(dap)
- ---@type DapAdapter
- dap.adapters.codelldb = {
- type = 'server',
- port = '${port}',
- executable = {
- command = vim.fn.exepath 'codelldb',
- args = { '--port', '${port}' },
- },
- }
-end
-
--- Build and find the newly-built Zig executable by running
--- 'zig build' and attempting to locate the resulting executable.
--- If the executable is unable to be automatically found, the user
--- will be prompted to give the path to the executable.
---
----@return string|nil # Path to executable or nil if build the failed
-local function build_and_find_zig_executable()
- local build_result = vim.fn.system 'zig build'
- if vim.v.shell_error ~= 0 then
- vim.notify('Build failed: ' .. build_result, vim.log.levels.ERROR)
- return nil
- end
-
- local exe_name = vim.fn.fnamemodify(vim.fn.getcwd(), ':t')
- local possible_paths = { 'zig-out/bin/' .. exe_name }
-
- for _, path in ipairs(possible_paths) do
- local full_path = vim.fn.getcwd() .. '/' .. path
- if vim.fn.executable(full_path) == 1 then
- return full_path
- end
- end
-
- return vim.fn.input('Path to executable: ', vim.fn.getcwd() .. '/zig-out/bin/', 'file')
-end
-
--- Build and find the Zig test executable by running
--- 'zig build test' and prompting the user for the test
--- executable location.
---
----@return string # Path to test executable
-local function build_and_find_zig_test()
- vim.fn.system 'zig build test'
- return vim.fn.input('Path to test executable: ', vim.fn.getcwd() .. '/zig-cache/o/', 'file')
-end
-
--- Zig debugging configuration
--- Sets up debugging configurations for Zig programs and tests
----@param dap table # DAP module instance
----@return nil
-local function setup_zig_configuration(dap)
- ---@type DapConfig[]
- dap.configurations.zig = {
- {
- name = 'Build and Launch Zig Program',
- type = 'codelldb',
- request = 'launch',
- program = build_and_find_zig_executable,
- cwd = '${workspaceFolder}',
- stopOnEntry = false,
- args = {},
- runInTerminal = false,
- },
- {
- name = 'Launch Zig Test',
- type = 'codelldb',
- request = 'launch',
- program = build_and_find_zig_test,
- cwd = '${workspaceFolder}',
- stopOnEntry = false,
- args = {},
- runInTerminal = false,
- },
- }
-end
-
--- Language adapters and configurations
--- Sets up debugging support for all supported languages
----@param dap table # DAP module instance
----@return nil
-local function setup_language_adapters(dap)
- setup_go_adapter()
- setup_python_adapter()
- setup_codelldb_adapter(dap)
- setup_zig_configuration(dap)
-end
-
--- Key mappings setup
--- Configures function keys and leader key combinations for debugging actions
----@param dap table # DAP module instance
----@param dapui table # DAP UI module instance
----@return nil
-local function setup_keymaps(dap, dapui)
- ---@type table<string, {[1]: function, [2]: string}>
- local keymaps = {
- ['<F5>'] = { dap.continue, 'Debug: Start/Continue' },
- ['<F1>'] = { dap.step_into, 'Debug: Step Into' },
- ['<F2>'] = { dap.step_over, 'Debug: Step Over' },
- ['<F3>'] = { dap.step_out, 'Debug: Step Out' },
- ['<F7>'] = { dapui.toggle, 'Debug: See last session result' },
- ['<leader>tB'] = { dap.toggle_breakpoint, 'Debug: Toggle Breakpoint' },
- ['<leader>B'] = {
- function()
- dap.set_breakpoint(vim.fn.input 'Breakpoint condition: ')
- end,
- 'Debug: Set Breakpoint',
- },
- }
-
- for key, config in pairs(keymaps) do
- vim.keymap.set('n', key, config[1], { desc = config[2] })
- end
-end
-
--- Event listeners setup
--- Configures automatic UI opening/closing based on debug session events
----@param dap table # DAP module instance
----@param dapui table # DAP UI module instance
----@return nil
-local function setup_dap_listeners(dap, dapui)
- local dapui_config = 'dapui_config'
- dap.listeners.after.event_initialized[dapui_config] = dapui.open
- dap.listeners.before.event_terminated[dapui_config] = dapui.close
- dap.listeners.before.event_exited[dapui_config] = dapui.close
-end
-
--- DAP UI configuration
--- Sets up the debugging user interface with custom icons and controls
----@param dapui table # DAP UI module instance
----@return nil
-local function setup_dapui_config(dapui)
- dapui.setup {
- icons = {
- expanded = 'โ–พ',
- collapsed = 'โ–ธ',
- current_frame = '*',
- },
- controls = {
- icons = {
- pause = 'โธ',
- play = 'โ–ถ',
- step_into = 'โŽ',
- step_over = 'โญ',
- step_out = 'โฎ',
- step_back = 'b',
- run_last = 'โ–ถโ–ถ',
- terminate = 'โน',
- disconnect = 'โ',
- },
- },
- }
-end
-
--- Mason DAP configuration
--- Automatically installs and configures debug adapters through Mason
----@return nil
-local function setup_mason_dap()
- require('mason-nvim-dap').setup {
- automatic_installation = true,
- handlers = {},
- ensure_installed = { 'delve', 'python', 'codelldb' },
- }
-end
-
--- Main configuration orchestrator
--- Sets up all debugging components in the correct order
----@return nil
-local function setup_dap()
- local dap = require 'dap'
- local dapui = require 'dapui'
-
- setup_mason_dap()
- setup_dapui_config(dapui)
- setup_dap_listeners(dap, dapui)
- setup_language_adapters(dap)
- setup_keymaps(dap, dapui)
-end
-
--- Plugin specification
--- Configures nvim-dap with all necessary dependencies for debugging
----@return table # Plugin specification for lazy.nvim
-return {
- 'mfussenegger/nvim-dap',
- dependencies = {
- 'rcarriga/nvim-dap-ui', -- Beautiful debugger UI
- 'nvim-neotest/nvim-nio', -- Required dependency for nvim-dap-ui
- 'williamboman/mason.nvim', -- Package manager for debug adapters
- 'jay-babu/mason-nvim-dap.nvim', -- Mason integration for DAP
- 'leoluz/nvim-dap-go', -- Go debugging support
- 'mfussenegger/nvim-dap-python', -- Python debugging support
- },
- config = function()
- setup_dap()
- end,
-}
diff --git a/nvim/.config/nvim/lua/plugins/gitsigns.lua b/nvim/.config/nvim/lua/plugins/gitsigns.lua
deleted file mode 100644
index 1a87c61..0000000
--- a/nvim/.config/nvim/lua/plugins/gitsigns.lua
+++ /dev/null
@@ -1,67 +0,0 @@
--- Adds git related signs to the gutter, as well as utilities
--- for managing changes
-
-return {
- {
- 'lewis6991/gitsigns.nvim',
- opts = {
- signs = {
- add = { text = '+' },
- change = { text = '~' },
- delete = { text = '_' },
- topdelete = { text = 'โ€พ' },
- changedelete = { text = '~' },
- },
- on_attach = function(bufnr)
- local gitsigns = require 'gitsigns'
-
- local function map(mode, l, r, opts)
- opts = opts or {}
- opts.buffer = bufnr
- vim.keymap.set(mode, l, r, opts)
- end
-
- -- Navigation
- map('n', ']c', function()
- if vim.wo.diff then
- vim.cmd.normal { ']c', bang = true }
- else
- gitsigns.nav_hunk 'next'
- end
- end, { desc = 'Jump to next git [c]hange' })
-
- map('n', '[c', function()
- if vim.wo.diff then
- vim.cmd.normal { '[c', bang = true }
- else
- gitsigns.nav_hunk 'prev'
- end
- end, { desc = 'Jump to previous git [c]hange' })
-
- -- Actions
- -- visual mode
- map('v', '<leader>hs', function()
- gitsigns.stage_hunk { vim.fn.line '.', vim.fn.line 'v' }
- end, { desc = 'git [s]tage hunk' })
- map('v', '<leader>hr', function()
- gitsigns.reset_hunk { vim.fn.line '.', vim.fn.line 'v' }
- end, { desc = 'git [r]eset hunk' })
- -- normal mode
- map('n', '<leader>hs', gitsigns.stage_hunk, { desc = 'git [s]tage hunk' })
- map('n', '<leader>hr', gitsigns.reset_hunk, { desc = 'git [r]eset hunk' })
- map('n', '<leader>hS', gitsigns.stage_buffer, { desc = 'git [S]tage buffer' })
- map('n', '<leader>hu', gitsigns.stage_hunk, { desc = 'git [u]ndo stage hunk' })
- map('n', '<leader>hR', gitsigns.reset_buffer, { desc = 'git [R]eset buffer' })
- map('n', '<leader>hp', gitsigns.preview_hunk, { desc = 'git [p]review hunk' })
- map('n', '<leader>hb', gitsigns.blame_line, { desc = 'git [b]lame line' })
- map('n', '<leader>hd', gitsigns.diffthis, { desc = 'git [d]iff against index' })
- map('n', '<leader>hD', function()
- gitsigns.diffthis '@'
- end, { desc = 'git [D]iff against last commit' })
- -- Toggles
- map('n', '<leader>tb', gitsigns.toggle_current_line_blame, { desc = '[T]oggle git show [b]lame line' })
- map('n', '<leader>tD', gitsigns.preview_hunk_inline, { desc = '[T]oggle git show [D]eleted' })
- end,
- },
- },
-}
diff --git a/nvim/.config/nvim/lua/plugins/indent_line.lua b/nvim/.config/nvim/lua/plugins/indent_line.lua
deleted file mode 100644
index 041ba40..0000000
--- a/nvim/.config/nvim/lua/plugins/indent_line.lua
+++ /dev/null
@@ -1,11 +0,0 @@
--- Add indentation guides even on blank lines
-
-return {
- {
- 'lukas-reineke/indent-blankline.nvim',
- -- Enable `lukas-reineke/indent-blankline.nvim`
- -- See `:help ibl`
- main = 'ibl',
- opts = {},
- },
-}
diff --git a/nvim/.config/nvim/lua/plugins/lazygit.lua b/nvim/.config/nvim/lua/plugins/lazygit.lua
deleted file mode 100644
index a4e50c0..0000000
--- a/nvim/.config/nvim/lua/plugins/lazygit.lua
+++ /dev/null
@@ -1,18 +0,0 @@
-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' },
- },
-}
diff --git a/nvim/.config/nvim/lua/plugins/lint.lua b/nvim/.config/nvim/lua/plugins/lint.lua
deleted file mode 100644
index d7d5c7f..0000000
--- a/nvim/.config/nvim/lua/plugins/lint.lua
+++ /dev/null
@@ -1,60 +0,0 @@
-return {
- {
- 'mfussenegger/nvim-lint',
- event = { 'BufReadPre', 'BufNewFile' },
- config = function()
- local lint = require 'lint'
- lint.linters_by_ft = lint.linters_by_ft or {}
- lint.linters_by_ft['cpp'] = { 'cppcheck' }
- lint.linters_by_ft['dockerfile'] = { 'hadolint' }
- lint.linters_by_ft['json'] = { 'jsonlint' }
- lint.linters_by_ft['terraform'] = { 'tflint', 'terraform_validate' }
- lint.linters_by_ft['python'] = { 'ruff', 'bandit' }
- lint.linters_by_ft['markdown'] = nil
- lint.linters_by_ft['text'] = nil
- lint.linters_by_ft['sh'] = { 'shellcheck' }
- lint.linters.shellcheck.args = { '-x' }
-
- -- Default linters, which will cause errors unless these tools are available:
- -- {
- -- clojure = { "clj-kondo" },
- -- dockerfile = { "hadolint" },
- -- inko = { "inko" },
- -- janet = { "janet" },
- -- json = { "jsonlint" },
- -- markdown = { "vale" },
- -- rst = { "vale" },
- -- ruby = { "ruby" },
- -- terraform = { "tflint" },
- -- text = { "vale" }
- -- }
- --
- -- They can be disabled by setting their filetypes to nil:
- -- lint.linters_by_ft['clojure'] = nil
- -- lint.linters_by_ft['dockerfile'] = nil
- -- lint.linters_by_ft['inko'] = nil
- -- lint.linters_by_ft['janet'] = nil
- -- lint.linters_by_ft['json'] = nil
- -- lint.linters_by_ft['markdown'] = nil
- -- lint.linters_by_ft['rst'] = nil
- -- lint.linters_by_ft['ruby'] = nil
- -- lint.linters_by_ft['terraform'] = nil
- -- lint.linters_by_ft['text'] = nil
-
- -- Create autocommand which carries out the actual linting
- -- on the specified events.
- local lint_augroup = vim.api.nvim_create_augroup('lint', { clear = true })
- vim.api.nvim_create_autocmd({ 'BufEnter', 'BufWritePost', 'InsertLeave' }, {
- group = lint_augroup,
- callback = function()
- -- Only run the linter in buffers that you can modify in order to
- -- avoid superfluous noise, notably within the handy LSP pop-ups that
- -- describe the hovered symbol using Markdown.
- if vim.opt_local.modifiable:get() then
- lint.try_lint()
- end
- end,
- })
- end,
- },
-}
diff --git a/nvim/.config/nvim/lua/plugins/lsp.lua b/nvim/.config/nvim/lua/plugins/lsp.lua
deleted file mode 100644
index 65093f6..0000000
--- a/nvim/.config/nvim/lua/plugins/lsp.lua
+++ /dev/null
@@ -1,233 +0,0 @@
--- LSP Plugins
-return {
- {
- -- `lazydev` configures Lua LSP for your Neovim config, runtime and plugins
- -- used for completion, annotations and signatures of Neovim apis
- 'folke/lazydev.nvim',
- ft = 'lua',
- opts = {
- library = {
- -- Load luvit types when the `vim.uv` word is found
- { path = '${3rd}/luv/library', words = { 'vim%.uv' } },
- },
- },
- },
- {
- -- Main LSP Configuration
- 'neovim/nvim-lspconfig',
- dependencies = {
- -- Automatically install LSPs and related tools to stdpath for Neovim
- -- Mason must be loaded before its dependents so we need to set it up here.
- -- NOTE: `opts = {}` is the same as calling `require('mason').setup({})`
- { 'williamboman/mason.nvim', opts = {} },
- 'williamboman/mason-lspconfig.nvim',
- 'WhoIsSethDaniel/mason-tool-installer.nvim',
-
- -- Useful status updates for LSP.
- { 'j-hui/fidget.nvim', opts = {} },
-
- -- Allows extra capabilities provided by blink.cmp
- 'saghen/blink.cmp',
- },
- config = function()
- -- This function gets run when an LSP attaches to a particular buffer.
- -- That is to say, every time a new file is opened that is associated with
- -- an lsp (for example, opening `main.rs` is associated with `rust_analyzer`) this
- -- function will be executed to configure the current buffer
- vim.api.nvim_create_autocmd('LspAttach', {
- group = vim.api.nvim_create_augroup('lsp-attach', { clear = true }),
- callback = function(event)
- -- Utility to more easily define mappings specific for LSP related items.
- -- It sets the mode, buffer and description for us each time.
- local map = function(keys, func, desc, mode)
- mode = mode or 'n'
- vim.keymap.set(mode, keys, func, { buffer = event.buf, desc = 'LSP: ' .. desc })
- end
-
- -- Rename the variable under your cursor.
- -- Most Language Servers support renaming across files, etc.
- map('grn', vim.lsp.buf.rename, '[R]e[n]ame')
-
- -- Execute a code action, usually your cursor needs to be on top of an error
- -- or a suggestion from your LSP for this to activate.
- map('gra', vim.lsp.buf.code_action, '[G]oto Code [A]ction', { 'n', 'x' })
-
- -- Find references for the word under your cursor.
- map('grr', require('telescope.builtin').lsp_references, '[G]oto [R]eferences')
-
- -- Jump to the implementation of the word under your cursor.
- -- Useful when your language has ways of declaring types without an actual implementation.
- map('gri', require('telescope.builtin').lsp_implementations, '[G]oto [I]mplementation')
-
- -- Jump to the definition of the word under your cursor.
- -- This is where a variable was first declared, or where a function is defined, etc.
- -- To jump back, press <C-t>.
- map('grd', require('telescope.builtin').lsp_definitions, '[G]oto [D]efinition')
-
- -- WARN: This is not Goto Definition, this is Goto Declaration.
- -- For example, in C this would take you to the header.
- map('grD', vim.lsp.buf.declaration, '[G]oto [D]eclaration')
-
- -- Fuzzy find all the symbols in your current document.
- -- Symbols are things like variables, functions, types, etc.
- map('gO', require('telescope.builtin').lsp_document_symbols, 'Open Document Symbols')
-
- -- Fuzzy find all the symbols in your current workspace.
- -- Similar to document symbols, except searches over your entire project.
- map('gW', require('telescope.builtin').lsp_dynamic_workspace_symbols, 'Open Workspace Symbols')
-
- -- Jump to the type of the word under your cursor.
- -- Useful when you're not sure what type a variable is and you want to see
- -- the definition of its *type*, not where it was *defined*.
- map('grt', require('telescope.builtin').lsp_type_definitions, '[G]oto [T]ype Definition')
-
- -- The following two autocommands are used to highlight references of the
- -- word under your cursor when your cursor rests there for a little while.
- -- See `:help CursorHold` for information about when this is executed
- --
- -- When you move your cursor, the highlights will be cleared (the second autocommand).
- local client = vim.lsp.get_client_by_id(event.data.client_id)
- if client and client:supports_method(vim.lsp.protocol.Methods.textDocument_documentHighlight, event.buf) then
- local highlight_augroup = vim.api.nvim_create_augroup('lsp-highlight', { clear = false })
- vim.api.nvim_create_autocmd({ 'CursorHold', 'CursorHoldI' }, {
- buffer = event.buf,
- group = highlight_augroup,
- callback = vim.lsp.buf.document_highlight,
- })
-
- vim.api.nvim_create_autocmd({ 'CursorMoved', 'CursorMovedI' }, {
- buffer = event.buf,
- group = highlight_augroup,
- callback = vim.lsp.buf.clear_references,
- })
-
- vim.api.nvim_create_autocmd('LspDetach', {
- group = vim.api.nvim_create_augroup('lsp-detach', { clear = true }),
- callback = function(event2)
- vim.lsp.buf.clear_references()
- vim.api.nvim_clear_autocmds { group = 'lsp-highlight', buffer = event2.buf }
- end,
- })
- end
-
- -- The following code creates a keymap to toggle inlay hints in your
- -- code, if the language server you are using supports them
- --
- -- This may be unwanted, since they displace some of your code
- if client and client:supports_method(vim.lsp.protocol.Methods.textDocument_inlayHint, event.buf) then
- map('<leader>th', function()
- vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled { bufnr = event.buf })
- end, '[T]oggle Inlay [H]ints')
- end
- end,
- })
-
- -- Diagnostic Config
- -- See :help vim.diagnostic.Opts
- vim.diagnostic.config {
- severity_sort = true,
- float = { border = 'rounded', source = 'if_many' },
- underline = { severity = vim.diagnostic.severity.ERROR },
- signs = vim.g.have_nerd_font and {
- text = {
- [vim.diagnostic.severity.ERROR] = '๓ฐ…š ',
- [vim.diagnostic.severity.WARN] = '๓ฐ€ช ',
- [vim.diagnostic.severity.INFO] = '๓ฐ‹ฝ ',
- [vim.diagnostic.severity.HINT] = '๓ฐŒถ ',
- },
- } or {},
- virtual_text = {
- source = 'if_many',
- spacing = 2,
- format = function(diagnostic)
- local diagnostic_message = {
- [vim.diagnostic.severity.ERROR] = diagnostic.message,
- [vim.diagnostic.severity.WARN] = diagnostic.message,
- [vim.diagnostic.severity.INFO] = diagnostic.message,
- [vim.diagnostic.severity.HINT] = diagnostic.message,
- }
- return diagnostic_message[diagnostic.severity]
- end,
- },
- }
-
- -- LSP servers and clients are able to communicate to each other what features they support.
- --
- -- By default, Neovim doesn't support everything that is in the LSP specification.
- -- When you add blink.cmp, luasnip, etc. Neovim now has *more* capabilities.
- -- So, we create new capabilities with blink.cmp, and then broadcast that to the servers.
- local capabilities = require('blink.cmp').get_lsp_capabilities()
-
- -- Enable the following language servers. They will automatically be installed.
- --
- -- Add any additional override configuration in the following tables. Available keys are:
- -- - cmd (table): Override the default command used to start the server
- -- - filetypes (table): Override the default list of associated filetypes for the server
- -- - capabilities (table): Override fields in capabilities. Can be used to disable certain LSP features.
- -- - settings (table): Override the default settings passed when initializing the server.
- -- For example, to see the options for `lua_ls`, you could go to: https://luals.github.io/wiki/settings/
- local servers = {
- -- See `:help lspconfig-all` for a list of all the pre-configured LSPs
- clangd = {},
- gopls = {},
- pyright = {
- settings = {
- python = {
- analysis = {
- autoImportCompletions = true,
- },
- },
- },
- },
- rust_analyzer = {},
- -- NOTE: https://github.com/pmizio/typescript-tools.nvim may be a better
- -- LSP to use here at some point.
- ts_ls = {},
- lua_ls = {
- settings = {
- Lua = {
- completion = {
- callSnippet = 'Replace',
- },
- },
- },
- },
- stylua = {},
- tailwindcss = {},
- mesonlsp = {},
- terraformls = {},
- }
-
- -- Ensure the servers and tools above are installed
- --
- -- To check the current status of installed tools and/or manually install
- -- other tools, you can run
- -- :Mason
- --
- -- You can press `g?` for help in this menu.
- --
- -- `mason` had to be setup earlier: to configure its options see the
- -- `dependencies` table for `nvim-lspconfig` above.
- --
- -- You can add other tools here that you want Mason to install
- -- for you, so that they are available from within Neovim.
- local ensure_installed = vim.tbl_keys(servers or {})
- require('mason-tool-installer').setup { ensure_installed = ensure_installed }
- require('mason-lspconfig').setup {
- ensure_installed = {}, -- explicitly set to an empty table (Populated via mason-tool-installer)
- automatic_installation = false,
- automatic_enable = true,
- handlers = {
- function(server_name)
- local server = servers[server_name] or {}
- -- This handles overriding only values explicitly passed
- -- by the server configuration above. Useful when disabling
- -- certain features of an LSP (for example, turning off formatting for ts_ls)
- server.capabilities = vim.tbl_deep_extend('force', {}, capabilities, server.capabilities or {})
- require('lspconfig')[server_name].setup(server)
- end,
- },
- }
- end,
- },
-}
diff --git a/nvim/.config/nvim/lua/plugins/lualine.lua b/nvim/.config/nvim/lua/plugins/lualine.lua
deleted file mode 100644
index c5ed579..0000000
--- a/nvim/.config/nvim/lua/plugins/lualine.lua
+++ /dev/null
@@ -1,14 +0,0 @@
-return {
- {
- "nvim-lualine/lualine.nvim",
- event = "VeryLazy",
- dependencies = { "nvim-tree/nvim-web-devicons" },
- opts = {
- options = {
- theme = "tokyonight",
- component_separators = { left = "|", right = "|" },
- section_separators = { left = "", right = "" },
- },
- },
- },
-}
diff --git a/nvim/.config/nvim/lua/plugins/mini.lua b/nvim/.config/nvim/lua/plugins/mini.lua
deleted file mode 100644
index 4048fae..0000000
--- a/nvim/.config/nvim/lua/plugins/mini.lua
+++ /dev/null
@@ -1,34 +0,0 @@
--- Collection of various small independent plugins/modules
-
-return {
- {
- 'echasnovski/mini.nvim',
- config = function()
- -- Better Around/Inside textobjects
- --
- -- Examples:
- -- - va) - [V]isually select [A]round [)]paren
- -- - yinq - [Y]ank [I]nside [N]ext [Q]uote
- -- - ci' - [C]hange [I]nside [']quote
- require('mini.ai').setup { n_lines = 500 }
-
- -- Add/delete/replace surroundings (brackets, quotes, etc.)
- --
- -- - saiw) - [S]urround [A]dd [I]nner [W]ord [)]Paren
- -- - sd' - [S]urround [D]elete [']quotes
- -- - sr)' - [S]urround [R]eplace [)] [']
- require('mini.surround').setup()
-
- local statusline = require 'mini.statusline'
- statusline.setup { use_icons = vim.g.have_nerd_font }
-
- -- You can configure sections in the statusline by overriding their
- -- default behavior. For example, here we set the section for
- -- cursor location to LINE:COLUMN
- ---@diagnostic disable-next-line: duplicate-set-field
- statusline.section_location = function()
- return '%2l:%-2v'
- end
- end,
- },
-}
diff --git a/nvim/.config/nvim/lua/plugins/obsidian.lua b/nvim/.config/nvim/lua/plugins/obsidian.lua
deleted file mode 100644
index a29e9f8..0000000
--- a/nvim/.config/nvim/lua/plugins/obsidian.lua
+++ /dev/null
@@ -1,20 +0,0 @@
-return {
- 'epwalsh/obsidian.nvim',
- version = '*',
- lazy = true,
- event = {
- 'BufReadPre ' .. vim.fn.expand '~' .. '/Documents/Notes/*.md',
- 'BufNewFile ' .. vim.fn.expand '~' .. '/Documents/Notes/*.md',
- },
- dependencies = {
- 'nvim-lua/plenary.nvim',
- },
- opts = {
- workspaces = {
- {
- name = 'personal',
- path = '~/Documents/Notes',
- },
- },
- },
-}
diff --git a/nvim/.config/nvim/lua/plugins/oil.lua b/nvim/.config/nvim/lua/plugins/oil.lua
deleted file mode 100644
index f200559..0000000
--- a/nvim/.config/nvim/lua/plugins/oil.lua
+++ /dev/null
@@ -1,13 +0,0 @@
-return {
- 'stevearc/oil.nvim',
- ---@module 'oil'
- ---@type oil.SetupOpts
- opts = {},
- dependencies = { { 'echasnovski/mini.icons', opts = {} } },
- config = function(_, opts)
- vim.keymap.set('n', '\\', '<CMD>Oil --float<CR>', { desc = 'Open parent directory in floating window' })
- vim.keymap.set('n', '-', '<CMD>Oil<CR>', { desc = 'Open parent directory' })
- require('oil').setup(opts)
- end,
- lazy = false,
-}
diff --git a/nvim/.config/nvim/lua/plugins/telescope.lua b/nvim/.config/nvim/lua/plugins/telescope.lua
deleted file mode 100644
index 9e3c703..0000000
--- a/nvim/.config/nvim/lua/plugins/telescope.lua
+++ /dev/null
@@ -1,110 +0,0 @@
--- Fuzzy Finder (files, lsp, etc)
-
-return {
- {
- 'nvim-telescope/telescope.nvim',
- event = 'VimEnter',
- dependencies = {
- 'nvim-lua/plenary.nvim',
- {
- 'nvim-telescope/telescope-fzf-native.nvim',
- build = 'make',
- cond = function()
- return vim.fn.executable 'make' == 1
- end,
- },
- { 'nvim-telescope/telescope-ui-select.nvim' },
- { 'nvim-tree/nvim-web-devicons', enabled = vim.g.have_nerd_font },
- },
- config = function()
- -- Telescope is a fuzzy finder that comes with a lot of different things that
- -- it can fuzzy find! It's more than just a "file finder", it can search
- -- many different aspects of Neovim, your workspace, LSP, and more!
- --
- -- The easiest way to use Telescope, is to start by doing something like:
- -- :Telescope help_tags
- --
- -- After running this command, a window will open up and you're able to
- -- type in the prompt window. You'll see a list of `help_tags` options and
- -- a corresponding preview of the help.
- --
- -- Two important keymaps to use while in Telescope are:
- -- - Insert mode: <c-/>
- -- - Normal mode: ?
- --
- -- This opens a window that shows you all of the keymaps for the current
- -- Telescope picker. This is really useful to discover what Telescope can
- -- do as well as how to actually do it!
-
- -- [[ Configure Telescope ]]
- -- See `:help telescope` and `:help telescope.setup()`
- require('telescope').setup {
- defaults = {
- vimgrep_arguments = {
- 'rg',
- '--color=never',
- '--no-heading',
- '--with-filename',
- '--line-number',
- '--column',
- '--smart-case',
- '--hidden',
- '--glob',
- '!.git/*',
- },
- },
- pickers = {
- find_files = {
- find_command = { 'fd', '--type', 'f', '--hidden', '--strip-cwd-prefix', '--exclude', '.git' },
- },
- },
- extensions = {
- ['ui-select'] = {
- require('telescope.themes').get_dropdown(),
- },
- },
- }
-
- -- Enable Telescope extensions if they are installed
- pcall(require('telescope').load_extension, 'fzf')
- pcall(require('telescope').load_extension, 'ui-select')
-
- -- See `:help telescope.builtin`
- local builtin = require 'telescope.builtin'
- vim.keymap.set('n', '<leader>sh', builtin.help_tags, { desc = '[S]earch [H]elp' })
- vim.keymap.set('n', '<leader>sk', builtin.keymaps, { desc = '[S]earch [K]eymaps' })
- vim.keymap.set('n', '<leader>sf', builtin.find_files, { desc = '[S]earch [F]iles' })
- vim.keymap.set('n', '<leader>sc', builtin.commands, { desc = '[S]earch [C]ommands'})
- vim.keymap.set('n', '<leader>ss', builtin.builtin, { desc = '[S]earch [S]elect Telescope' })
- vim.keymap.set('n', '<leader>sw', builtin.grep_string, { desc = '[S]earch current [W]ord' })
- vim.keymap.set('n', '<leader>sg', builtin.live_grep, { desc = '[S]earch by [G]rep' })
- vim.keymap.set('n', '<leader>sd', builtin.diagnostics, { desc = '[S]earch [D]iagnostics' })
- vim.keymap.set('n', '<leader>sr', builtin.resume, { desc = '[S]earch [R]esume' })
- vim.keymap.set('n', '<leader>s.', builtin.oldfiles, { desc = '[S]earch Recent Files ("." for repeat)' })
- vim.keymap.set('n', '<leader><leader>', builtin.buffers, { desc = '[ ] Find existing buffers' })
-
- -- Slightly advanced example of overriding default behavior and theme
- vim.keymap.set('n', '<leader>/', function()
- -- You can pass additional configuration to Telescope to change the theme, layout, etc.
- builtin.current_buffer_fuzzy_find(require('telescope.themes').get_dropdown {
- winblend = 10,
- previewer = false,
- })
- end, { desc = '[/] Fuzzily search in current buffer' })
-
- -- It's also possible to pass additional configuration options.
- -- See `:help telescope.builtin.live_grep()` for information about particular keys
- vim.keymap.set('n', '<leader>s/', function()
- builtin.live_grep {
- grep_open_files = true,
- prompt_title = 'Live Grep in Open Files',
- }
- end, { desc = '[S]earch [/] in Open Files' })
-
- -- Shortcut for searching your Neovim configuration files
- vim.keymap.set('n', '<leader>sn', function()
- builtin.find_files { cwd = vim.fn.stdpath 'config' }
- end, { desc = '[S]earch [N]eovim files' })
- end,
- },
-}
diff --git a/nvim/.config/nvim/lua/plugins/tmux-navigator.lua b/nvim/.config/nvim/lua/plugins/tmux-navigator.lua
deleted file mode 100644
index a161285..0000000
--- a/nvim/.config/nvim/lua/plugins/tmux-navigator.lua
+++ /dev/null
@@ -1,20 +0,0 @@
---- Vim Tmux Navigator is a plugin that allows you to navigate between Vim and Tmux panes seamlessly.
-
-return {
- 'christoomey/vim-tmux-navigator',
- cmd = {
- 'TmuxNavigateLeft',
- 'TmuxNavigateDown',
- 'TmuxNavigateUp',
- 'TmuxNavigateRight',
- 'TmuxNavigatePrevious',
- 'TmuxNavigatorProcessList',
- },
- keys = {
- { '<c-h>', '<cmd><C-U>TmuxNavigateLeft<cr>' },
- { '<c-j>', '<cmd><C-U>TmuxNavigateDown<cr>' },
- { '<c-k>', '<cmd><C-U>TmuxNavigateUp<cr>' },
- { '<c-l>', '<cmd><C-U>TmuxNavigateRight<cr>' },
- { '<c-\\>', '<cmd><C-U>TmuxNavigatePrevious<cr>' },
- },
-}
diff --git a/nvim/.config/nvim/lua/plugins/todo-comments.lua b/nvim/.config/nvim/lua/plugins/todo-comments.lua
deleted file mode 100644
index 0f740e4..0000000
--- a/nvim/.config/nvim/lua/plugins/todo-comments.lua
+++ /dev/null
@@ -1,40 +0,0 @@
--- Highlight todo, notes, etc in comments
-return {
- {
- 'folke/todo-comments.nvim',
- event = 'VimEnter',
- dependencies = { 'nvim-lua/plenary.nvim' },
- opts = {
- signs = false,
- keywords = {
- NOTE = {
- color = 'hint',
- alt = { 'INFO', 'Note' },
- },
- },
- },
- keys = {
- {
- '<leader>]t',
- function()
- require('todo-comments').jump_next()
- end,
- desc = 'Next todo comment',
- },
- {
- '<leader>[t',
- function()
- require('todo-comments').jump_prev()
- end,
- desc = 'Previous todo comment',
- },
- {
- '<leader>st',
- function()
- vim.cmd 'TodoTelescope'
- end,
- desc = 'Search todo comments',
- },
- },
- },
-}
diff --git a/nvim/.config/nvim/lua/plugins/tree-sitter.lua b/nvim/.config/nvim/lua/plugins/tree-sitter.lua
deleted file mode 100644
index ea68249..0000000
--- a/nvim/.config/nvim/lua/plugins/tree-sitter.lua
+++ /dev/null
@@ -1,28 +0,0 @@
--- Highlight, edit, and navigate code
-
-return {
- {
- 'nvim-treesitter/nvim-treesitter',
- build = ':TSUpdate',
- main = 'nvim-treesitter.configs',
- -- [[ Configure Treesitter ]] See `:help nvim-treesitter`
- opts = {
- ensure_installed = 'all',
- -- Autoinstall languages that are not installed
- auto_install = true,
- highlight = {
- enable = true,
- -- Some languages depend on vim's regex highlighting system (such as Ruby) for indent rules.
- -- If you are experiencing weird indenting issues, add the language to
- -- the list of additional_vim_regex_highlighting and disabled languages for indent.
- additional_vim_regex_highlighting = { 'ruby', 'cpp' },
- },
- indent = { enable = true, disable = { 'ruby', 'cpp' } },
- },
- -- Additional nvim-treesitter modules to explore:
- --
- -- - Incremental selection: Included, see `:help nvim-treesitter-incremental-selection-mod`
- -- - Show your current context: https://github.com/nvim-treesitter/nvim-treesitter-context
- -- - Treesitter + textobjects: https://github.com/nvim-treesitter/nvim-treesitter-textobjects
- },
-}
diff --git a/nvim/.config/nvim/lua/plugins/which-key.lua b/nvim/.config/nvim/lua/plugins/which-key.lua
deleted file mode 100644
index ca43c7a..0000000
--- a/nvim/.config/nvim/lua/plugins/which-key.lua
+++ /dev/null
@@ -1,55 +0,0 @@
--- which-key is a useful plugin to show you pending keybinds.
-
-return {
- {
- 'folke/which-key.nvim',
- event = 'VimEnter',
- opts = {
- -- delay between pressing a key and opening which-key (milliseconds)
- -- this setting is independent of vim.opt.timeoutlen
- delay = 0,
- icons = {
- mappings = vim.g.have_nerd_font,
- -- If you are using a Nerd Font: set icons.keys to an empty table which will use the
- -- default which-key.nvim defined Nerd Font icons, otherwise define a string table
- keys = vim.g.have_nerd_font and {} or {
- Up = '<Up> ',
- Down = '<Down> ',
- Left = '<Left> ',
- Right = '<Right> ',
- C = '<C-โ€ฆ> ',
- M = '<M-โ€ฆ> ',
- D = '<D-โ€ฆ> ',
- S = '<S-โ€ฆ> ',
- CR = '<CR> ',
- Esc = '<Esc> ',
- ScrollWheelDown = '<ScrollWheelDown> ',
- ScrollWheelUp = '<ScrollWheelUp> ',
- NL = '<NL> ',
- BS = '<BS> ',
- Space = '<Space> ',
- Tab = '<Tab> ',
- F1 = '<F1>',
- F2 = '<F2>',
- F3 = '<F3>',
- F4 = '<F4>',
- F5 = '<F5>',
- F6 = '<F6>',
- F7 = '<F7>',
- F8 = '<F8>',
- F9 = '<F9>',
- F10 = '<F10>',
- F11 = '<F11>',
- F12 = '<F12>',
- },
- },
-
- -- Document existing key chains
- spec = {
- { '<leader>s', group = '[S]earch' },
- { '<leader>t', group = '[T]oggle' },
- { '<leader>h', group = 'Git [H]unk', mode = { 'n', 'v' } },
- },
- },
- },
-}
diff --git a/tmux/.config/tmux/options.tmux b/tmux/.config/tmux/options.tmux
index ab6a97e..76baf3f 100644
--- a/tmux/.config/tmux/options.tmux
+++ b/tmux/.config/tmux/options.tmux
@@ -20,6 +20,8 @@ set-option -g pane-base-index 1
set-window-option -g pane-base-index 1
set-option -g renumber-windows on
+set-option -g status-position top
+
# Don't do anything when a 'bell' rings
set-option -g visual-activity off
set-option -g visual-bell off
diff --git a/tmux/.config/tmux/plugins.tmux b/tmux/.config/tmux/plugins.tmux
index 004b1bb..d3e32d7 100644
--- a/tmux/.config/tmux/plugins.tmux
+++ b/tmux/.config/tmux/plugins.tmux
@@ -27,7 +27,6 @@ set-option -g @plugin 'christoomey/vim-tmux-navigator'
set-option -g @plugin 'tmux-plugins/tmux-yank'
set-option -g @plugin 'tmux-plugins/tmux-open'
-set-option -g @plugin 'tmux-plugins/tmux-copycat'
set-option -g @plugin "janoamaral/tokyo-night-tmux"
set -g @tokyo-night-tmux_theme night
diff --git a/zsh/.zsh/env.sh b/zsh/.zsh/env.sh
index 0292a26..81a0255 100644
--- a/zsh/.zsh/env.sh
+++ b/zsh/.zsh/env.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env zsh
export EDITOR="nvim"
-export BROWSER=""
+export BROWSER="firefox"
export GPG_TTY=$(tty)
export PAGER="less"
export MANPAGER="less"
diff --git a/zsh/.zsh/languages.sh b/zsh/.zsh/languages.sh
index ad162cb..5c19fd7 100644
--- a/zsh/.zsh/languages.sh
+++ b/zsh/.zsh/languages.sh
@@ -8,6 +8,9 @@ export PATH="$GOROOT/bin:$PATH"
export PATH="$GOBIN:$PATH"
export GOPROXY="direct"
+# Rust
+. "$HOME/.cargo/env"
+
# Python
export PYENV_ROOT="$HOME/.pyenv"
export PATH="$PYENV_ROOT/bin:$PATH"