From 29b4e6c2bca441d5071b47b36f9a66a88964d880 Mon Sep 17 00:00:00 2001 From: Sergii Tykhomyrov Date: Mon, 3 Aug 2026 21:26:37 +0200 Subject: Restructure: new nvim/tmux/editorconfig, remove stale packages Replace the old nvim package with the new minimal config. Add tmux and editorconfig packages in dot- convention. Remove i3, kitty, alacritty, and xbindkeys packages. Use /bin/sh in the Makefile; zsh is not on every machine. Add .stowrc so plain stow works without the Makefile. Co-Authored-By: Claude Fable 5 Claude-Session: https://claude.ai/code/session_01KYrzpJevCUUqP6pFyJHmB4 --- nvim/.config/nvim/after/syntax/markdown.vim | 1 - nvim/.config/nvim/init.lua | 102 ------------------ nvim/.config/nvim/lazy-lock.json | 12 --- nvim/.config/nvim/lua/plugins/lsp.lua | 18 ---- nvim/.config/nvim/lua/plugins/neo-tree.lua | 23 ---- nvim/.config/nvim/lua/plugins/telescope.lua | 9 -- nvim/.config/nvim/lua/plugins/treesitter.lua | 16 --- nvim/dot-config/nvim/after/syntax/markdown.vim | 1 + nvim/dot-config/nvim/init.lua | 118 +++++++++++++++++---- nvim/dot-config/nvim/lazy-lock.json | 32 ++---- nvim/dot-config/nvim/lua/asciidoc-preview/init.lua | 84 --------------- nvim/dot-config/nvim/lua/plugins/catppuccin.lua | 9 -- nvim/dot-config/nvim/lua/plugins/copilot.lua | 3 - nvim/dot-config/nvim/lua/plugins/editorconfig.lua | 3 - nvim/dot-config/nvim/lua/plugins/lazygit.lua | 17 --- nvim/dot-config/nvim/lua/plugins/lsp.lua | 18 ++++ nvim/dot-config/nvim/lua/plugins/lspconfig.lua | 35 ------ nvim/dot-config/nvim/lua/plugins/lualine.lua | 11 -- nvim/dot-config/nvim/lua/plugins/neo-tree.lua | 22 ++-- nvim/dot-config/nvim/lua/plugins/neogit.lua | 8 -- nvim/dot-config/nvim/lua/plugins/oil.lua | 8 -- nvim/dot-config/nvim/lua/plugins/telescope.lua | 11 +- nvim/dot-config/nvim/lua/plugins/treesitter.lua | 12 ++- nvim/dot-config/nvim/lua/plugins/vim-gitgutter.lua | 3 - nvim/dot-config/nvim/lua/plugins/vim-glsl.lua | 3 - nvim/dot-config/nvim/lua/plugins/vim-rails.lua | 3 - nvim/dot-config/nvim/lua/plugins/zen-mode.lua | 6 -- 27 files changed, 153 insertions(+), 435 deletions(-) delete mode 100644 nvim/.config/nvim/after/syntax/markdown.vim delete mode 100644 nvim/.config/nvim/init.lua delete mode 100644 nvim/.config/nvim/lazy-lock.json delete mode 100644 nvim/.config/nvim/lua/plugins/lsp.lua delete mode 100644 nvim/.config/nvim/lua/plugins/neo-tree.lua delete mode 100644 nvim/.config/nvim/lua/plugins/telescope.lua delete mode 100644 nvim/.config/nvim/lua/plugins/treesitter.lua create mode 100644 nvim/dot-config/nvim/after/syntax/markdown.vim delete mode 100644 nvim/dot-config/nvim/lua/asciidoc-preview/init.lua delete mode 100644 nvim/dot-config/nvim/lua/plugins/catppuccin.lua delete mode 100644 nvim/dot-config/nvim/lua/plugins/copilot.lua delete mode 100644 nvim/dot-config/nvim/lua/plugins/editorconfig.lua delete mode 100644 nvim/dot-config/nvim/lua/plugins/lazygit.lua create mode 100644 nvim/dot-config/nvim/lua/plugins/lsp.lua delete mode 100644 nvim/dot-config/nvim/lua/plugins/lspconfig.lua delete mode 100644 nvim/dot-config/nvim/lua/plugins/lualine.lua delete mode 100644 nvim/dot-config/nvim/lua/plugins/neogit.lua delete mode 100644 nvim/dot-config/nvim/lua/plugins/oil.lua delete mode 100644 nvim/dot-config/nvim/lua/plugins/vim-gitgutter.lua delete mode 100644 nvim/dot-config/nvim/lua/plugins/vim-glsl.lua delete mode 100644 nvim/dot-config/nvim/lua/plugins/vim-rails.lua delete mode 100644 nvim/dot-config/nvim/lua/plugins/zen-mode.lua (limited to 'nvim') diff --git a/nvim/.config/nvim/after/syntax/markdown.vim b/nvim/.config/nvim/after/syntax/markdown.vim deleted file mode 100644 index d9b0a80..0000000 --- a/nvim/.config/nvim/after/syntax/markdown.vim +++ /dev/null @@ -1 +0,0 @@ -syn clear markdownError diff --git a/nvim/.config/nvim/init.lua b/nvim/.config/nvim/init.lua deleted file mode 100644 index f621504..0000000 --- a/nvim/.config/nvim/init.lua +++ /dev/null @@ -1,102 +0,0 @@ --- Basic options -vim.g.mapleader = " " -vim.g.maplocalleader = "\\" - -vim.opt.number = true -vim.opt.relativenumber = false -vim.opt.mouse = "a" -vim.opt.ignorecase = true -vim.opt.smartcase = true -vim.opt.expandtab = true -vim.opt.softtabstop = 4 -vim.opt.shiftwidth = 4 -vim.opt.tabstop = 4 -vim.opt.autoindent = true -vim.opt.cindent = true -vim.opt.signcolumn = "yes" -vim.opt.termguicolors = true -vim.opt.splitright = true -vim.opt.splitbelow = true -vim.opt.clipboard = "unnamedplus" -vim.opt.undofile = true -vim.opt.cursorline = true -vim.opt.background="dark" -vim.opt.completeopt = { "menuone", "noinsert", "popup" } - -vim.cmd.colorscheme("habamax") - --- Diagnostics: show messages as virtual text, no fancy UI -vim.diagnostic.config({ - virtual_text = true, - severity_sort = true, -}) - --- Native LSP completion (NeoVim 0.11+), no completion plugin needed -vim.api.nvim_create_autocmd("LspAttach", { - callback = function(ev) - local client = vim.lsp.get_client_by_id(ev.data.client_id) - if client and client:supports_method("textDocument/completion") then - vim.lsp.completion.enable(true, client.id, ev.buf, { autotrigger = true }) - end - end, -}) - -vim.keymap.set("n", "gd", vim.lsp.buf.definition, { desc = "Go to definition" }) - --- Go convention: organize imports and format on save (via gopls) -vim.api.nvim_create_autocmd("BufWritePre", { - pattern = "*.go", - callback = function() - local client = vim.lsp.get_clients({ bufnr = 0, name = "gopls" })[1] - if not client then - return - end - local params = vim.lsp.util.make_range_params(0, client.offset_encoding) - params.context = { only = { "source.organizeImports" } } - local result = vim.lsp.buf_request_sync(0, "textDocument/codeAction", params, 2000) - for _, res in pairs(result or {}) do - for _, action in pairs(res.result or {}) do - if action.edit then - vim.lsp.util.apply_workspace_edit(action.edit, client.offset_encoding) - end - end - end - vim.lsp.buf.format() - end, -}) - --- Spell checking for markdown and git commit messages -vim.api.nvim_create_autocmd("FileType", { - pattern = { "markdown", "gitcommit" }, - callback = function() - vim.opt_local.spell = true - vim.opt_local.spelllang = "en_us" - end, -}) - - --- Bootstrap lazy.nvim -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) - --- Setup lazy.nvim (loads all files in lua/plugins/) -require("lazy").setup({ - spec = { - { import = "plugins" }, - }, - install = { colorscheme = { "habamax" } }, - checker = { enabled = true, notify = false }, -}) diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json deleted file mode 100644 index c2c2f1a..0000000 --- a/nvim/.config/nvim/lazy-lock.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "67029ccdac1ef8941e13b826417bc0ffac24cc86" }, - "mason.nvim": { "branch": "main", "commit": "2a6940af80375532e5e9e7c1f2fc6319a1b7a69d" }, - "neo-tree.nvim": { "branch": "v3.x", "commit": "ebd66767191714e008ce73b769518a763ff31bdc" }, - "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, - "nvim-lspconfig": { "branch": "master", "commit": "1c0d8f70dbc8827263eedc3cf7021ceba0f68689" }, - "nvim-treesitter": { "branch": "master", "commit": "cf12346a3414fa1b06af75c79faebe7f76df080a" }, - "nvim-web-devicons": { "branch": "master", "commit": "2ae6958df7ced50baac5035cec0c15799eedfbf7" }, - "plenary.nvim": { "branch": "master", "commit": "74b06c6c75e4eeb3108ec01852001636d85a932b" }, - "telescope.nvim": { "branch": "master", "commit": "427b576c16792edad01a92b89721d923c19ad60f" } -} diff --git a/nvim/.config/nvim/lua/plugins/lsp.lua b/nvim/.config/nvim/lua/plugins/lsp.lua deleted file mode 100644 index 15933fa..0000000 --- a/nvim/.config/nvim/lua/plugins/lsp.lua +++ /dev/null @@ -1,18 +0,0 @@ -return { - { - "mason-org/mason.nvim", - opts = {}, - }, - { - -- Installs language servers and enables them automatically. - -- Add "clangd" to ensure_installed for C/C++ later. - "mason-org/mason-lspconfig.nvim", - dependencies = { - "mason-org/mason.nvim", - "neovim/nvim-lspconfig", - }, - opts = { - ensure_installed = { "gopls", "pyright" }, - }, - }, -} diff --git a/nvim/.config/nvim/lua/plugins/neo-tree.lua b/nvim/.config/nvim/lua/plugins/neo-tree.lua deleted file mode 100644 index eba00dd..0000000 --- a/nvim/.config/nvim/lua/plugins/neo-tree.lua +++ /dev/null @@ -1,23 +0,0 @@ -return { - "nvim-neo-tree/neo-tree.nvim", - branch = "v3.x", - dependencies = { - "nvim-lua/plenary.nvim", - "MunifTanjim/nui.nvim", - "nvim-tree/nvim-web-devicons", - }, - lazy = false, - keys = { - { "e", "Neotree toggle float", desc = "Toggle Neo-tree" }, - }, - opts = { - close_if_last_window = true, - filesystem = { - follow_current_file = { enabled = true }, - use_libuv_file_watcher = true, - }, - window = { - position = "float", - }, - }, -} diff --git a/nvim/.config/nvim/lua/plugins/telescope.lua b/nvim/.config/nvim/lua/plugins/telescope.lua deleted file mode 100644 index 76f77c2..0000000 --- a/nvim/.config/nvim/lua/plugins/telescope.lua +++ /dev/null @@ -1,9 +0,0 @@ -return { - "nvim-telescope/telescope.nvim", - dependencies = { "nvim-lua/plenary.nvim" }, - keys = { - { "ff", "Telescope find_files", desc = "Find files" }, - { "fg", "Telescope live_grep", desc = "Search in files" }, - { "fb", "Telescope buffers", desc = "Open buffers" }, - }, -} diff --git a/nvim/.config/nvim/lua/plugins/treesitter.lua b/nvim/.config/nvim/lua/plugins/treesitter.lua deleted file mode 100644 index 9692f57..0000000 --- a/nvim/.config/nvim/lua/plugins/treesitter.lua +++ /dev/null @@ -1,16 +0,0 @@ -return { - "nvim-treesitter/nvim-treesitter", - branch = "master", - build = ":TSUpdate", - config = function() - require("nvim-treesitter.configs").setup({ - ensure_installed = { - "python", "go", "gomod", "gosum", - "lua", "vim", "vimdoc", - "markdown", "markdown_inline", "yaml", - }, - highlight = { enable = true }, - indent = { enable = true }, - }) - end, -} diff --git a/nvim/dot-config/nvim/after/syntax/markdown.vim b/nvim/dot-config/nvim/after/syntax/markdown.vim new file mode 100644 index 0000000..d9b0a80 --- /dev/null +++ b/nvim/dot-config/nvim/after/syntax/markdown.vim @@ -0,0 +1 @@ +syn clear markdownError diff --git a/nvim/dot-config/nvim/init.lua b/nvim/dot-config/nvim/init.lua index 0115b5d..f621504 100644 --- a/nvim/dot-config/nvim/init.lua +++ b/nvim/dot-config/nvim/init.lua @@ -1,28 +1,102 @@ -local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" -if not vim.loop.fs_stat(lazypath) then - vim.fn.system({ - "git", - "clone", - "--filter=blob:none", - "https://github.com/folke/lazy.nvim.git", - "--branch=stable", - lazypath, - }) -end -vim.opt.rtp:prepend(lazypath) +-- Basic options +vim.g.mapleader = " " +vim.g.maplocalleader = "\\" -vim.opt.expandtab = true -vim.opt.tabstop = 2 -vim.opt.softtabstop = 2 -vim.opt.shiftwidth = 2 vim.opt.number = true -vim.opt.swapfile = false -vim.opt.spell = true +vim.opt.relativenumber = false +vim.opt.mouse = "a" +vim.opt.ignorecase = true +vim.opt.smartcase = true +vim.opt.expandtab = true +vim.opt.softtabstop = 4 +vim.opt.shiftwidth = 4 +vim.opt.tabstop = 4 vim.opt.autoindent = true -vim.opt.smartindent = true +vim.opt.cindent = true +vim.opt.signcolumn = "yes" +vim.opt.termguicolors = true +vim.opt.splitright = true +vim.opt.splitbelow = true +vim.opt.clipboard = "unnamedplus" +vim.opt.undofile = true +vim.opt.cursorline = true +vim.opt.background="dark" +vim.opt.completeopt = { "menuone", "noinsert", "popup" } -vim.g.mapleader = " " +vim.cmd.colorscheme("habamax") + +-- Diagnostics: show messages as virtual text, no fancy UI +vim.diagnostic.config({ + virtual_text = true, + severity_sort = true, +}) -vim.keymap.set("n", "", "w") +-- Native LSP completion (NeoVim 0.11+), no completion plugin needed +vim.api.nvim_create_autocmd("LspAttach", { + callback = function(ev) + local client = vim.lsp.get_client_by_id(ev.data.client_id) + if client and client:supports_method("textDocument/completion") then + vim.lsp.completion.enable(true, client.id, ev.buf, { autotrigger = true }) + end + end, +}) + +vim.keymap.set("n", "gd", vim.lsp.buf.definition, { desc = "Go to definition" }) + +-- Go convention: organize imports and format on save (via gopls) +vim.api.nvim_create_autocmd("BufWritePre", { + pattern = "*.go", + callback = function() + local client = vim.lsp.get_clients({ bufnr = 0, name = "gopls" })[1] + if not client then + return + end + local params = vim.lsp.util.make_range_params(0, client.offset_encoding) + params.context = { only = { "source.organizeImports" } } + local result = vim.lsp.buf_request_sync(0, "textDocument/codeAction", params, 2000) + for _, res in pairs(result or {}) do + for _, action in pairs(res.result or {}) do + if action.edit then + vim.lsp.util.apply_workspace_edit(action.edit, client.offset_encoding) + end + end + end + vim.lsp.buf.format() + end, +}) + +-- Spell checking for markdown and git commit messages +vim.api.nvim_create_autocmd("FileType", { + pattern = { "markdown", "gitcommit" }, + callback = function() + vim.opt_local.spell = true + vim.opt_local.spelllang = "en_us" + end, +}) + + +-- Bootstrap lazy.nvim +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) -require("lazy").setup("plugins") +-- Setup lazy.nvim (loads all files in lua/plugins/) +require("lazy").setup({ + spec = { + { import = "plugins" }, + }, + install = { colorscheme = { "habamax" } }, + checker = { enabled = true, notify = false }, +}) diff --git a/nvim/dot-config/nvim/lazy-lock.json b/nvim/dot-config/nvim/lazy-lock.json index 51dfdad..c2c2f1a 100644 --- a/nvim/dot-config/nvim/lazy-lock.json +++ b/nvim/dot-config/nvim/lazy-lock.json @@ -1,24 +1,12 @@ { - "catppuccin": { "branch": "main", "commit": "4965db2d6155c25db4e8417465fc2703fdf4c2b7" }, - "copilot.vim": { "branch": "release", "commit": "87038123804796ca7af20d1b71c3428d858a9124" }, - "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, - "editorconfig-vim": { "branch": "master", "commit": "91bd0b0a2c6a72a110ab9feae335e1224480c233" }, - "lazy.nvim": { "branch": "main", "commit": "7527af40ddd4a93a02911be570b32609b9d4ea53" }, - "lazygit.nvim": { "branch": "main", "commit": "adc37c5a6d7d6e8d0a039f08f3c7837971a1c77a" }, - "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "f75e877f5266e87523eb5a18fcde2081820d087b" }, - "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, - "neo-tree.nvim": { "branch": "v3.x", "commit": "5d172e8315444dbc32867d1c7b04d8e7e68ec4e1" }, - "neogit": { "branch": "master", "commit": "63124cf520ff24d09deb3b850e053908ab0fc66a" }, - "nui.nvim": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" }, - "nvim-lspconfig": { "branch": "master", "commit": "66bc018936c6ff76beb75f89d986af6442db4001" }, - "nvim-treesitter": { "branch": "master", "commit": "cced713b4993ddbfba8f82e9e60fcab7cbee8101" }, - "nvim-web-devicons": { "branch": "master", "commit": "402377242b04be3f4f0f3720bd952df86e946c30" }, - "oil.nvim": { "branch": "master", "commit": "add50252b5e9147c0a09d36480d418c7e2737472" }, - "plenary.nvim": { "branch": "master", "commit": "3707cdb1e43f5cea73afb6037e6494e7ce847a66" }, - "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, - "vim-gitgutter": { "branch": "main", "commit": "7b0b5098e3e57be86bb96cfbf2b8902381eef57c" }, - "vim-glsl": { "branch": "master", "commit": "40dd0b143ef93f3930a8a409f60c1bb85e28b727" }, - "vim-rails": { "branch": "master", "commit": "d3954dfe3946c9330dc91b4fbf79ccacb2c626c0" }, - "zen-mode.nvim": { "branch": "main", "commit": "863f150ca321b3dd8aa1a2b69b5f411a220e144f" } + "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "67029ccdac1ef8941e13b826417bc0ffac24cc86" }, + "mason.nvim": { "branch": "main", "commit": "2a6940af80375532e5e9e7c1f2fc6319a1b7a69d" }, + "neo-tree.nvim": { "branch": "v3.x", "commit": "ebd66767191714e008ce73b769518a763ff31bdc" }, + "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, + "nvim-lspconfig": { "branch": "master", "commit": "1c0d8f70dbc8827263eedc3cf7021ceba0f68689" }, + "nvim-treesitter": { "branch": "master", "commit": "cf12346a3414fa1b06af75c79faebe7f76df080a" }, + "nvim-web-devicons": { "branch": "master", "commit": "2ae6958df7ced50baac5035cec0c15799eedfbf7" }, + "plenary.nvim": { "branch": "master", "commit": "74b06c6c75e4eeb3108ec01852001636d85a932b" }, + "telescope.nvim": { "branch": "master", "commit": "427b576c16792edad01a92b89721d923c19ad60f" } } diff --git a/nvim/dot-config/nvim/lua/asciidoc-preview/init.lua b/nvim/dot-config/nvim/lua/asciidoc-preview/init.lua deleted file mode 100644 index 9061888..0000000 --- a/nvim/dot-config/nvim/lua/asciidoc-preview/init.lua +++ /dev/null @@ -1,84 +0,0 @@ -local api = vim.api -local fn = vim.fn - -local augroup = api.nvim_create_augroup('AsciiDocPreview', { clear = true }) - -local config = { - convert_cmd = 'asciidoctor -o %html %adoc', - preview_cmd = 'xdg-open %html', - refresh_interval = 2000, -} - -local function get_html_path() - return fn.expand('%:p'):gsub('%.adoc$', '.html') -end - -local function convert_to_html() - local adoc_path = fn.expand('%:p') - local html_path = get_html_path() - - local cmd = config.convert_cmd - :gsub('%%adoc', adoc_path) - :gsub('%%html', html_path) - - fn.system(cmd) - - return html_path -end - -local function open_preview() - local html_path = get_html_path() - local cmd = string.format('%s %s', config.preview_cmd, html_path) - - fn.system(cmd) -end - -local refresh_timer = nil - -local function start_auto_refresh() - if refresh_timer then - refresh_timer:stop() - end - - refresh_timer = vim.loop.new_timer() - refresh_timer:start(0, config.refresh_interval, vim.schedule_wrap(function() - if api.nvim_buf_get_option(0, 'modified') then - api.nvim_command('write') - convert_to_html() - end - end)) -end - -local function stop_auto_refresh() - if refresh_timer then - refresh_timer:stop() - refresh_timer = nil - end -end - -api.nvim_create_user_command('AsciiDocPreviewStart', function() - convert_to_html() - open_preview() - start_auto_refresh() -end, {}) - -api.nvim_create_user_command('AsciiDocPreviewStop', function() - stop_auto_refresh() -end, {}) - -api.nvim_create_autocmd('VimLeave', { - group = augroup, - callback = function() - stop_auto_refresh() - end, -}) - -return { - start_preview = function() - convert_to_html() - open_preview() - start_auto_refresh() - end, - stop_preview = stop_auto_refresh, - config = config -} diff --git a/nvim/dot-config/nvim/lua/plugins/catppuccin.lua b/nvim/dot-config/nvim/lua/plugins/catppuccin.lua deleted file mode 100644 index 504fa2f..0000000 --- a/nvim/dot-config/nvim/lua/plugins/catppuccin.lua +++ /dev/null @@ -1,9 +0,0 @@ -return { - "catppuccin/nvim", - name = "catppuccin", - priority = 1000, - config = function() - require("catppuccin").setup() - vim.cmd.colorscheme "catppuccin" - end -} diff --git a/nvim/dot-config/nvim/lua/plugins/copilot.lua b/nvim/dot-config/nvim/lua/plugins/copilot.lua deleted file mode 100644 index 1ffa970..0000000 --- a/nvim/dot-config/nvim/lua/plugins/copilot.lua +++ /dev/null @@ -1,3 +0,0 @@ -return { - "github/copilot.vim" -} diff --git a/nvim/dot-config/nvim/lua/plugins/editorconfig.lua b/nvim/dot-config/nvim/lua/plugins/editorconfig.lua deleted file mode 100644 index 772cea6..0000000 --- a/nvim/dot-config/nvim/lua/plugins/editorconfig.lua +++ /dev/null @@ -1,3 +0,0 @@ -return { - "editorconfig/editorconfig-vim" -} diff --git a/nvim/dot-config/nvim/lua/plugins/lazygit.lua b/nvim/dot-config/nvim/lua/plugins/lazygit.lua deleted file mode 100644 index d91ed41..0000000 --- a/nvim/dot-config/nvim/lua/plugins/lazygit.lua +++ /dev/null @@ -1,17 +0,0 @@ -return { - "kdheepak/lazygit.nvim", - lazy = true, - cmd = { - "LazyGit", - "LazyGitConfig", - "LazyGitCurrentFile", - "LazyGitFilter", - "LazyGitFilterCurrentFile", - }, - dependencies = { - "nvim-lua/plenary.nvim", - }, - keys = { - { "lg", "LazyGit", desc = "LazyGit" } - } -} diff --git a/nvim/dot-config/nvim/lua/plugins/lsp.lua b/nvim/dot-config/nvim/lua/plugins/lsp.lua new file mode 100644 index 0000000..15933fa --- /dev/null +++ b/nvim/dot-config/nvim/lua/plugins/lsp.lua @@ -0,0 +1,18 @@ +return { + { + "mason-org/mason.nvim", + opts = {}, + }, + { + -- Installs language servers and enables them automatically. + -- Add "clangd" to ensure_installed for C/C++ later. + "mason-org/mason-lspconfig.nvim", + dependencies = { + "mason-org/mason.nvim", + "neovim/nvim-lspconfig", + }, + opts = { + ensure_installed = { "gopls", "pyright" }, + }, + }, +} diff --git a/nvim/dot-config/nvim/lua/plugins/lspconfig.lua b/nvim/dot-config/nvim/lua/plugins/lspconfig.lua deleted file mode 100644 index 474f777..0000000 --- a/nvim/dot-config/nvim/lua/plugins/lspconfig.lua +++ /dev/null @@ -1,35 +0,0 @@ -return { - { - "williamboman/mason.nvim", - lazy = false, - config = function() - require("mason").setup() - end - }, - { - "williamboman/mason-lspconfig.nvim", - config = function() - require("mason-lspconfig").setup({ - ensure_installed = { "pyright", "ruby_lsp", "html", "lua_ls" } - }) - end - }, - { - "neovim/nvim-lspconfig", - config = function() - local lspconfig = require("lspconfig") - - lspconfig.pyright.setup({}) - lspconfig.ruby_lsp.setup({}) - lspconfig.html.setup({}) - lspconfig.lua_ls.setup({}) - - vim.keymap.set("n", "K", vim.lsp.buf.hover, {}) - vim.keymap.set("n", "gd", vim.lsp.buf.definition, {}) - vim.keymap.set("n", "gr", vim.lsp.buf.references, {}) - vim.keymap.set("n", "gf", vim.lsp.buf.format, {}) - vim.keymap.set("n", "ca", vim.lsp.buf.code_action, {}) - vim.keymap.set("n", "rn", vim.lsp.buf.rename, {}) - end - } -} diff --git a/nvim/dot-config/nvim/lua/plugins/lualine.lua b/nvim/dot-config/nvim/lua/plugins/lualine.lua deleted file mode 100644 index 55693b9..0000000 --- a/nvim/dot-config/nvim/lua/plugins/lualine.lua +++ /dev/null @@ -1,11 +0,0 @@ -return { - "nvim-lualine/lualine.nvim", - dependencies = { "nvim-tree/nvim-web-devicons" }, - config = function() - require("lualine").setup({ - options = { - theme = "catppuccin" - } - }) - end -} diff --git a/nvim/dot-config/nvim/lua/plugins/neo-tree.lua b/nvim/dot-config/nvim/lua/plugins/neo-tree.lua index 2210d18..eba00dd 100644 --- a/nvim/dot-config/nvim/lua/plugins/neo-tree.lua +++ b/nvim/dot-config/nvim/lua/plugins/neo-tree.lua @@ -3,13 +3,21 @@ return { branch = "v3.x", dependencies = { "nvim-lua/plenary.nvim", + "MunifTanjim/nui.nvim", "nvim-tree/nvim-web-devicons", - "MunifTanjim/nui.nvim" }, - config = function() - vim.keymap.set("n", "df", ":Neotree toggle filesystem float") - vim.keymap.set("n", "db", ":Neotree toggle buffers float") - vim.keymap.set("n", "dg", ":Neotree toggle git_status float") - end + lazy = false, + keys = { + { "e", "Neotree toggle float", desc = "Toggle Neo-tree" }, + }, + opts = { + close_if_last_window = true, + filesystem = { + follow_current_file = { enabled = true }, + use_libuv_file_watcher = true, + }, + window = { + position = "float", + }, + }, } - diff --git a/nvim/dot-config/nvim/lua/plugins/neogit.lua b/nvim/dot-config/nvim/lua/plugins/neogit.lua deleted file mode 100644 index 1323236..0000000 --- a/nvim/dot-config/nvim/lua/plugins/neogit.lua +++ /dev/null @@ -1,8 +0,0 @@ -return { - "NeogitOrg/neogit", - dependencies = { - "nvim-lua/plenary.nvim", - "sindrets/diffview.nvim" - } -} - diff --git a/nvim/dot-config/nvim/lua/plugins/oil.lua b/nvim/dot-config/nvim/lua/plugins/oil.lua deleted file mode 100644 index ed8045f..0000000 --- a/nvim/dot-config/nvim/lua/plugins/oil.lua +++ /dev/null @@ -1,8 +0,0 @@ -return { - "stevearc/oil.nvim", - config = function() - require("oil").setup({ - default_file_explorer = true - }) - end, -} diff --git a/nvim/dot-config/nvim/lua/plugins/telescope.lua b/nvim/dot-config/nvim/lua/plugins/telescope.lua index d25f8d3..76f77c2 100644 --- a/nvim/dot-config/nvim/lua/plugins/telescope.lua +++ b/nvim/dot-config/nvim/lua/plugins/telescope.lua @@ -1,10 +1,9 @@ return { "nvim-telescope/telescope.nvim", - tag = "0.1.8", dependencies = { "nvim-lua/plenary.nvim" }, - config = function() - local builtin = require("telescope.builtin") - vim.keymap.set("n", "ff", builtin.find_files, {}) - vim.keymap.set("n", "fg", builtin.live_grep, {}) -- requires ripgrep - end + keys = { + { "ff", "Telescope find_files", desc = "Find files" }, + { "fg", "Telescope live_grep", desc = "Search in files" }, + { "fb", "Telescope buffers", desc = "Open buffers" }, + }, } diff --git a/nvim/dot-config/nvim/lua/plugins/treesitter.lua b/nvim/dot-config/nvim/lua/plugins/treesitter.lua index e88fb1e..9692f57 100644 --- a/nvim/dot-config/nvim/lua/plugins/treesitter.lua +++ b/nvim/dot-config/nvim/lua/plugins/treesitter.lua @@ -1,12 +1,16 @@ return { "nvim-treesitter/nvim-treesitter", + branch = "master", build = ":TSUpdate", config = function() - local configs = require("nvim-treesitter.configs") - configs.setup({ - ensure_installed = {"lua", "c", "cpp", "python", "ruby", "java", "haskell"}, + require("nvim-treesitter.configs").setup({ + ensure_installed = { + "python", "go", "gomod", "gosum", + "lua", "vim", "vimdoc", + "markdown", "markdown_inline", "yaml", + }, highlight = { enable = true }, indent = { enable = true }, }) - end + end, } diff --git a/nvim/dot-config/nvim/lua/plugins/vim-gitgutter.lua b/nvim/dot-config/nvim/lua/plugins/vim-gitgutter.lua deleted file mode 100644 index c484a70..0000000 --- a/nvim/dot-config/nvim/lua/plugins/vim-gitgutter.lua +++ /dev/null @@ -1,3 +0,0 @@ -return { - "airblade/vim-gitgutter" -} diff --git a/nvim/dot-config/nvim/lua/plugins/vim-glsl.lua b/nvim/dot-config/nvim/lua/plugins/vim-glsl.lua deleted file mode 100644 index ede8a34..0000000 --- a/nvim/dot-config/nvim/lua/plugins/vim-glsl.lua +++ /dev/null @@ -1,3 +0,0 @@ -return { - "tikhomirov/vim-glsl" -} diff --git a/nvim/dot-config/nvim/lua/plugins/vim-rails.lua b/nvim/dot-config/nvim/lua/plugins/vim-rails.lua deleted file mode 100644 index 50a7481..0000000 --- a/nvim/dot-config/nvim/lua/plugins/vim-rails.lua +++ /dev/null @@ -1,3 +0,0 @@ -return { - "tpope/vim-rails" -} diff --git a/nvim/dot-config/nvim/lua/plugins/zen-mode.lua b/nvim/dot-config/nvim/lua/plugins/zen-mode.lua deleted file mode 100644 index 0ab2cbf..0000000 --- a/nvim/dot-config/nvim/lua/plugins/zen-mode.lua +++ /dev/null @@ -1,6 +0,0 @@ -return { - "folke/zen-mode.nvim", - config = function() - vim.keymap.set("n", "zz", ":ZenMode") - end -} -- cgit v1.2.3