From 071be15dc147f90f51dd461c0b06d173f2ea2ee4 Mon Sep 17 00:00:00 2001 From: aleidk Date: Wed, 20 Nov 2024 15:11:55 -0300 Subject: [PATCH] re-structure neovim plugins also delete unused ones --- .dotter/global.toml | 18 +++++ .dotter/work-laptop.toml | 3 + config/nvim/.luarc.json | 5 ++ config/nvim/init.lua | 21 +---- config/nvim/lazy-lock.json | 14 +--- config/nvim/lua/aleidk/lazy.lua | 35 ++++++++ .../{plugins => plugins-base}/auto-pairs.lua | 0 .../{plugins => plugins-base}/bookmarks.lua | 0 .../{plugins => plugins-base}/comments.lua | 15 ---- .../{plugins => plugins-base}/dressing.lua | 0 .../file-explorer.lua | 2 +- .../indent-blankline.lua | 0 .../{plugins => plugins-base}/noice.lua | 0 .../{plugins => plugins-base}/quickfix.lua | 0 .../{plugins => plugins-base}/treesitter.lua | 0 .../lua/aleidk/plugins-base/undo-tree.lua | 13 +++ .../{plugins => plugins-core}/colorscheme.lua | 0 config/nvim/lua/aleidk/plugins-core/init.lua | 14 ++++ .../{plugins => plugins-core}/key-help.lua | 0 .../{plugins => plugins-core}/lualine.lua | 0 .../{plugins => plugins-core}/markdown.lua | 0 .../smart-splits.lua | 0 .../{plugins => plugins-core}/surround.lua | 0 .../{plugins => plugins-core}/telescope.lua | 0 .../todo-comments.lua | 0 .../aleidk/{plugins => plugins-ide}/ai.lua | 0 .../lua/aleidk/plugins-ide/color-picker.lua | 15 ++++ .../{plugins => plugins-ide}/completion.lua | 0 .../{plugins => plugins-ide}/database.lua | 2 +- .../nvim/lua/aleidk/plugins-ide/doc-gen.lua | 15 ++++ .../{plugins => plugins-ide}/formatter.lua | 0 .../aleidk/{plugins => plugins-ide}/git.lua | 23 +----- .../{plugins => plugins-ide}/linters.lua | 0 .../aleidk/{plugins => plugins-ide}/lsp.lua | 0 .../{plugins => plugins-ide}/luasnip.lua | 0 .../aleidk/{plugins => plugins-ide}/mason.lua | 0 .../{plugins => plugins-ide}/remote-sshfs.lua | 0 .../{plugins => plugins-ide}/task-runner.lua | 0 .../{plugins => plugins-ide}/trouble.lua | 0 .../ts-node-action.lua | 0 .../aleidk/plugins-ide/typescript-tools.lua | 18 +++++ config/nvim/lua/aleidk/plugins/init.lua | 56 ------------- .../nvim/lua/aleidk/plugins/pretty-fold.lua | 43 ---------- config/nvim/lua/aleidk/plugins/sessions.lua | 23 ------ config/nvim/lua/aleidk/plugins/zen.lua | 81 ------------------- config/nvim/lua/aleidk/utils.lua | 7 ++ config/yazi/keymap.toml | 6 +- 47 files changed, 155 insertions(+), 274 deletions(-) create mode 100644 config/nvim/.luarc.json create mode 100644 config/nvim/lua/aleidk/lazy.lua rename config/nvim/lua/aleidk/{plugins => plugins-base}/auto-pairs.lua (100%) rename config/nvim/lua/aleidk/{plugins => plugins-base}/bookmarks.lua (100%) rename config/nvim/lua/aleidk/{plugins => plugins-base}/comments.lua (72%) rename config/nvim/lua/aleidk/{plugins => plugins-base}/dressing.lua (100%) rename config/nvim/lua/aleidk/{plugins => plugins-base}/file-explorer.lua (98%) rename config/nvim/lua/aleidk/{plugins => plugins-base}/indent-blankline.lua (100%) rename config/nvim/lua/aleidk/{plugins => plugins-base}/noice.lua (100%) rename config/nvim/lua/aleidk/{plugins => plugins-base}/quickfix.lua (100%) rename config/nvim/lua/aleidk/{plugins => plugins-base}/treesitter.lua (100%) create mode 100644 config/nvim/lua/aleidk/plugins-base/undo-tree.lua rename config/nvim/lua/aleidk/{plugins => plugins-core}/colorscheme.lua (100%) create mode 100644 config/nvim/lua/aleidk/plugins-core/init.lua rename config/nvim/lua/aleidk/{plugins => plugins-core}/key-help.lua (100%) rename config/nvim/lua/aleidk/{plugins => plugins-core}/lualine.lua (100%) rename config/nvim/lua/aleidk/{plugins => plugins-core}/markdown.lua (100%) rename config/nvim/lua/aleidk/{plugins => plugins-core}/smart-splits.lua (100%) rename config/nvim/lua/aleidk/{plugins => plugins-core}/surround.lua (100%) rename config/nvim/lua/aleidk/{plugins => plugins-core}/telescope.lua (100%) rename config/nvim/lua/aleidk/{plugins => plugins-core}/todo-comments.lua (100%) rename config/nvim/lua/aleidk/{plugins => plugins-ide}/ai.lua (100%) create mode 100644 config/nvim/lua/aleidk/plugins-ide/color-picker.lua rename config/nvim/lua/aleidk/{plugins => plugins-ide}/completion.lua (100%) rename config/nvim/lua/aleidk/{plugins => plugins-ide}/database.lua (94%) create mode 100644 config/nvim/lua/aleidk/plugins-ide/doc-gen.lua rename config/nvim/lua/aleidk/{plugins => plugins-ide}/formatter.lua (100%) rename config/nvim/lua/aleidk/{plugins => plugins-ide}/git.lua (82%) rename config/nvim/lua/aleidk/{plugins => plugins-ide}/linters.lua (100%) rename config/nvim/lua/aleidk/{plugins => plugins-ide}/lsp.lua (100%) rename config/nvim/lua/aleidk/{plugins => plugins-ide}/luasnip.lua (100%) rename config/nvim/lua/aleidk/{plugins => plugins-ide}/mason.lua (100%) rename config/nvim/lua/aleidk/{plugins => plugins-ide}/remote-sshfs.lua (100%) rename config/nvim/lua/aleidk/{plugins => plugins-ide}/task-runner.lua (100%) rename config/nvim/lua/aleidk/{plugins => plugins-ide}/trouble.lua (100%) rename config/nvim/lua/aleidk/{plugins => plugins-ide}/ts-node-action.lua (100%) create mode 100644 config/nvim/lua/aleidk/plugins-ide/typescript-tools.lua delete mode 100644 config/nvim/lua/aleidk/plugins/init.lua delete mode 100644 config/nvim/lua/aleidk/plugins/pretty-fold.lua delete mode 100644 config/nvim/lua/aleidk/plugins/sessions.lua delete mode 100644 config/nvim/lua/aleidk/plugins/zen.lua create mode 100644 config/nvim/lua/aleidk/utils.lua diff --git a/.dotter/global.toml b/.dotter/global.toml index 6fcfa77..7770d4f 100644 --- a/.dotter/global.toml +++ b/.dotter/global.toml @@ -45,6 +45,24 @@ depends = ["rust"] [nvim.files] "config/nvim" = "~/.config/nvim" +[nvim.files."config/nvim/lua/aleidk/lazy.lua"] +target = "~/.config/nvim/lua/aleidk/lazy.lua" +type = "template" +prepend = """ +local enabled_plugins = { + nvim_core = {{ nvim-core }}, + nvim_base = {{ nvim-base }}, + nvim_ide = {{ nvim-ide }}, +} + +""" + +# Handle package activation from Lazy instead of dotter +# This will prevent conflics in lazy-lock.json for having different plugins +[nvim.variables] +nvim-core = true +nvim-base = false +nvim-ide = false [rust.variables] cargo.packages = [] diff --git a/.dotter/work-laptop.toml b/.dotter/work-laptop.toml index 9b0a673..d990e6b 100644 --- a/.dotter/work-laptop.toml +++ b/.dotter/work-laptop.toml @@ -4,3 +4,6 @@ packages = ["cli", "dev", "mise"] [files] [variables] +nvim-core = true +nvim-base = true +nvim-ide = true diff --git a/config/nvim/.luarc.json b/config/nvim/.luarc.json new file mode 100644 index 0000000..1aa7674 --- /dev/null +++ b/config/nvim/.luarc.json @@ -0,0 +1,5 @@ +{ + "diagnostics.globals": [ + "enabled_plugins" + ] +} \ No newline at end of file diff --git a/config/nvim/init.lua b/config/nvim/init.lua index a9b3bcc..2925f22 100644 --- a/config/nvim/init.lua +++ b/config/nvim/init.lua @@ -1,26 +1,7 @@ -- Loadnoptions before anything require("aleidk.options") --- Init PLugins - --- Install package manager https://github.com/folke/lazy.nvim -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", -- latest stable release - lazypath, - }) -end -vim.opt.rtp:prepend(lazypath) - --- Load plugins -require("lazy").setup("aleidk.plugins") - --- Rest of configuratin +require("aleidk.lazy") require("aleidk.keymaps") require("aleidk.autocmds") diff --git a/config/nvim/lazy-lock.json b/config/nvim/lazy-lock.json index 9e59165..7bafe03 100644 --- a/config/nvim/lazy-lock.json +++ b/config/nvim/lazy-lock.json @@ -1,9 +1,6 @@ { "LuaSnip": { "branch": "master", "commit": "ce0a05ab4e2839e1c48d072c5236cce846a387bc" }, - "auto-session": { "branch": "main", "commit": "4b0728715e674ad9c18f1519127dcaed59f9981b" }, "ccc.nvim": { "branch": "main", "commit": "4fb5abaef2f2e0540fe22d4d74a9841205fff9e4" }, - "chezmoi.nvim": { "branch": "main", "commit": "faf61465718424696269b2647077331b3e4605f1" }, - "chezmoi.vim": { "branch": "main", "commit": "10f2692791b5e512a2c1bb4dc560b42ca5bf71fd" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, "cmp-conventionalcommits": { "branch": "master", "commit": "a4dfacf0601130b7f8afa7c948d735c27802fb7f" }, @@ -21,10 +18,9 @@ "dressing.nvim": { "branch": "master", "commit": "6741f1062d3dc6e4755367a7e9b347b553623f04" }, "friendly-snippets": { "branch": "main", "commit": "45a1b96e46efe5fce8af325d4bed45feb9d29d0f" }, "gitsigns.nvim": { "branch": "main", "commit": "e9c4187c3774a46df2d086a66cf3a7e6bea4c432" }, - "gopher.nvim": { "branch": "main", "commit": "f55c15ada8e02398000c04a96ef44d986cd01051" }, "grapple.nvim": { "branch": "main", "commit": "7aedc261b05a6c030397c4bc26416efbe746ebf1" }, "indent-blankline.nvim": { "branch": "master", "commit": "65e20ab94a26d0e14acac5049b8641336819dfc7" }, - "lazy.nvim": { "branch": "main", "commit": "b02c9eae6a250f98908c146d1dc1a891f5019f0a" }, + "lazy.nvim": { "branch": "main", "commit": "56ead98e05bb37a4ec28930a54d836d033cf00f2" }, "lazygit.nvim": { "branch": "main", "commit": "dc56df433bfbf107fee0139e187eb9750878fa84" }, "lualine.nvim": { "branch": "master", "commit": "6a40b530539d2209f7dc0492f3681c8c126647ad" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "37a336b653f8594df75c827ed589f1c91d91ff6c" }, @@ -49,10 +45,8 @@ "nvim-ts-autotag": { "branch": "main", "commit": "323a3e16ed603e2e17b26b1c836d1e86c279f726" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "6b5f95aa4d24f2c629a74f2c935c702b08dbde62" }, "nvim-web-devicons": { "branch": "master", "commit": "c0cfc1738361b5da1cd0a962dd6f774cc444f856" }, - "octo.nvim": { "branch": "master", "commit": "aa5dfa573220a0a511a25ee14ce1570b6c23e56a" }, "overseer.nvim": { "branch": "master", "commit": "15b6249eaf71ebbc8bf0ed279e045f2bc1f28007" }, "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, - "pretty-fold.nvim": { "branch": "master", "commit": "a7d8b424abe0eedf50116c460fbe6dfd5783b1d5" }, "remote-sshfs.nvim": { "branch": "main", "commit": "8f05563150fbd713027471eed56f391b053ba8b8" }, "render-markdown": { "branch": "main", "commit": "123048b428eb85618780fcef9ea9f4d68b5d2508" }, "smart-splits.nvim": { "branch": "master", "commit": "95833675cd92538bf9cded1d2d58d1fc271c5428" }, @@ -62,15 +56,13 @@ "treesj": { "branch": "main", "commit": "6e8bd008bacd5ad001c3953017c1dca20709e915" }, "trouble.nvim": { "branch": "main", "commit": "03c1fbf518bef683422a3be9643c3da190903488" }, "ts-node-action": { "branch": "master", "commit": "6d3b60754fd87963d70eadaa2f77873b447eac26" }, - "twilight.nvim": { "branch": "main", "commit": "2b632c169a4b51b1eba5be90fde22a80c51c990e" }, "typescript-tools.nvim": { "branch": "master", "commit": "5da4d695d66f676eb6ea766b946e86f93baaafe7" }, "undotree": { "branch": "master", "commit": "56c684a805fe948936cda0d1b19505b84ad7e065" }, - "vim-dadbod": { "branch": "master", "commit": "7888cb7164d69783d3dce4e0283decd26b82538b" }, - "vim-dadbod-completion": { "branch": "master", "commit": "8c9051c1cfc73fcf5bfe9a84db7097e4f7c0180d" }, + "vim-dadbod": { "branch": "master", "commit": "fe5a55e92b2dded7c404006147ef97fb073d8b1b" }, + "vim-dadbod-completion": { "branch": "master", "commit": "da0e75c09c27a82aad078d993bb1b2f4afd43427" }, "vim-dadbod-ui": { "branch": "master", "commit": "f74a31e8c6c5a9dccc63450a09d5cd64a9294330" }, "vim-illuminate": { "branch": "master", "commit": "5eeb7951fc630682c322e88a9bbdae5c224ff0aa" }, "vim-sleuth": { "branch": "master", "commit": "1cc4557420f215d02c4d2645a748a816c220e99b" }, "yazi.nvim": { "branch": "main", "commit": "faa03e9acb894533b91c811d0dafd816b995088f" }, - "zen-mode.nvim": { "branch": "main", "commit": "2694c5a2bc4dc26c7a9e74b9e2b812920c90a830" }, "zk-nvim": { "branch": "main", "commit": "dbf4eeab55b08856c9d6b6722dbff39630bb35eb" } } diff --git a/config/nvim/lua/aleidk/lazy.lua b/config/nvim/lua/aleidk/lazy.lua new file mode 100644 index 0000000..31c475e --- /dev/null +++ b/config/nvim/lua/aleidk/lazy.lua @@ -0,0 +1,35 @@ +-- Bootstrap lazy.nvim +-- Load this file after options has been set + +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) + +-- enabled_plugins is injected as a local variable in the top of the file by the dotfile manager +-- See: .dotter/global.toml inside [nvim.files] & [nvim.variables] table +require("lazy").setup({ + spec = { + { import = "aleidk.plugins-core", enabled = enabled_plugins.nvim_core }, + { import = "aleidk.plugins-base", enabled = enabled_plugins.nvim_base }, + { import = "aleidk.plugins-ide", enabled = enabled_plugins.nvim_ide }, + }, + + install = { colorscheme = { "catppuccin" } }, + checker = { enabled = true }, +}) + +return { + enabled_plugins +} diff --git a/config/nvim/lua/aleidk/plugins/auto-pairs.lua b/config/nvim/lua/aleidk/plugins-base/auto-pairs.lua similarity index 100% rename from config/nvim/lua/aleidk/plugins/auto-pairs.lua rename to config/nvim/lua/aleidk/plugins-base/auto-pairs.lua diff --git a/config/nvim/lua/aleidk/plugins/bookmarks.lua b/config/nvim/lua/aleidk/plugins-base/bookmarks.lua similarity index 100% rename from config/nvim/lua/aleidk/plugins/bookmarks.lua rename to config/nvim/lua/aleidk/plugins-base/bookmarks.lua diff --git a/config/nvim/lua/aleidk/plugins/comments.lua b/config/nvim/lua/aleidk/plugins-base/comments.lua similarity index 72% rename from config/nvim/lua/aleidk/plugins/comments.lua rename to config/nvim/lua/aleidk/plugins-base/comments.lua index e9e3be9..083aaff 100644 --- a/config/nvim/lua/aleidk/plugins/comments.lua +++ b/config/nvim/lua/aleidk/plugins-base/comments.lua @@ -31,19 +31,4 @@ return { MAP({ "n", "v" }, "gcl", cb.llline, "Create a comment line") end, }, - { - "danymat/neogen", - opts = { snippet_engine = "luasnip" }, - dependencies = { "nvim-treesitter/nvim-treesitter" }, - version = "*", -- stable releases - keys = { - { - "gcd", - function() - require("neogen").generate() - end, - desc = "Generate comment docstring", - }, - }, - }, } diff --git a/config/nvim/lua/aleidk/plugins/dressing.lua b/config/nvim/lua/aleidk/plugins-base/dressing.lua similarity index 100% rename from config/nvim/lua/aleidk/plugins/dressing.lua rename to config/nvim/lua/aleidk/plugins-base/dressing.lua diff --git a/config/nvim/lua/aleidk/plugins/file-explorer.lua b/config/nvim/lua/aleidk/plugins-base/file-explorer.lua similarity index 98% rename from config/nvim/lua/aleidk/plugins/file-explorer.lua rename to config/nvim/lua/aleidk/plugins-base/file-explorer.lua index ab03cca..b0dfa3e 100644 --- a/config/nvim/lua/aleidk/plugins/file-explorer.lua +++ b/config/nvim/lua/aleidk/plugins-base/file-explorer.lua @@ -11,7 +11,7 @@ return { }, { -- Open in the current working directory - "-", + "E", "Yazi cwd", desc = "Open the file manager in nvim's working directory", }, diff --git a/config/nvim/lua/aleidk/plugins/indent-blankline.lua b/config/nvim/lua/aleidk/plugins-base/indent-blankline.lua similarity index 100% rename from config/nvim/lua/aleidk/plugins/indent-blankline.lua rename to config/nvim/lua/aleidk/plugins-base/indent-blankline.lua diff --git a/config/nvim/lua/aleidk/plugins/noice.lua b/config/nvim/lua/aleidk/plugins-base/noice.lua similarity index 100% rename from config/nvim/lua/aleidk/plugins/noice.lua rename to config/nvim/lua/aleidk/plugins-base/noice.lua diff --git a/config/nvim/lua/aleidk/plugins/quickfix.lua b/config/nvim/lua/aleidk/plugins-base/quickfix.lua similarity index 100% rename from config/nvim/lua/aleidk/plugins/quickfix.lua rename to config/nvim/lua/aleidk/plugins-base/quickfix.lua diff --git a/config/nvim/lua/aleidk/plugins/treesitter.lua b/config/nvim/lua/aleidk/plugins-base/treesitter.lua similarity index 100% rename from config/nvim/lua/aleidk/plugins/treesitter.lua rename to config/nvim/lua/aleidk/plugins-base/treesitter.lua diff --git a/config/nvim/lua/aleidk/plugins-base/undo-tree.lua b/config/nvim/lua/aleidk/plugins-base/undo-tree.lua new file mode 100644 index 0000000..ba5adb4 --- /dev/null +++ b/config/nvim/lua/aleidk/plugins-base/undo-tree.lua @@ -0,0 +1,13 @@ +return { + { + "mbbill/undotree", + config = function() + vim.g.undotree_WindowLayout = 2 + vim.g.undotree_ShortIndicators = 1 + vim.g.undotree_SetFocusWhenToggle = 1 + end, + keys = { + { "fu", vim.cmd.UndotreeToggle, desc = "Undo tree" }, + }, + }, +} diff --git a/config/nvim/lua/aleidk/plugins/colorscheme.lua b/config/nvim/lua/aleidk/plugins-core/colorscheme.lua similarity index 100% rename from config/nvim/lua/aleidk/plugins/colorscheme.lua rename to config/nvim/lua/aleidk/plugins-core/colorscheme.lua diff --git a/config/nvim/lua/aleidk/plugins-core/init.lua b/config/nvim/lua/aleidk/plugins-core/init.lua new file mode 100644 index 0000000..3499f7d --- /dev/null +++ b/config/nvim/lua/aleidk/plugins-core/init.lua @@ -0,0 +1,14 @@ +return { + -- Detect tabstop and shiftwidth automatically + "tpope/vim-sleuth", + { "nvim-tree/nvim-web-devicons", lazy = true }, + { + -- Highlight word under cursor + "RRethy/vim-illuminate", + event = { "BufReadPost", "BufNewFile" }, + opts = { delay = 200 }, + config = function(_, opts) + require("illuminate").configure(opts) + end, + }, +} diff --git a/config/nvim/lua/aleidk/plugins/key-help.lua b/config/nvim/lua/aleidk/plugins-core/key-help.lua similarity index 100% rename from config/nvim/lua/aleidk/plugins/key-help.lua rename to config/nvim/lua/aleidk/plugins-core/key-help.lua diff --git a/config/nvim/lua/aleidk/plugins/lualine.lua b/config/nvim/lua/aleidk/plugins-core/lualine.lua similarity index 100% rename from config/nvim/lua/aleidk/plugins/lualine.lua rename to config/nvim/lua/aleidk/plugins-core/lualine.lua diff --git a/config/nvim/lua/aleidk/plugins/markdown.lua b/config/nvim/lua/aleidk/plugins-core/markdown.lua similarity index 100% rename from config/nvim/lua/aleidk/plugins/markdown.lua rename to config/nvim/lua/aleidk/plugins-core/markdown.lua diff --git a/config/nvim/lua/aleidk/plugins/smart-splits.lua b/config/nvim/lua/aleidk/plugins-core/smart-splits.lua similarity index 100% rename from config/nvim/lua/aleidk/plugins/smart-splits.lua rename to config/nvim/lua/aleidk/plugins-core/smart-splits.lua diff --git a/config/nvim/lua/aleidk/plugins/surround.lua b/config/nvim/lua/aleidk/plugins-core/surround.lua similarity index 100% rename from config/nvim/lua/aleidk/plugins/surround.lua rename to config/nvim/lua/aleidk/plugins-core/surround.lua diff --git a/config/nvim/lua/aleidk/plugins/telescope.lua b/config/nvim/lua/aleidk/plugins-core/telescope.lua similarity index 100% rename from config/nvim/lua/aleidk/plugins/telescope.lua rename to config/nvim/lua/aleidk/plugins-core/telescope.lua diff --git a/config/nvim/lua/aleidk/plugins/todo-comments.lua b/config/nvim/lua/aleidk/plugins-core/todo-comments.lua similarity index 100% rename from config/nvim/lua/aleidk/plugins/todo-comments.lua rename to config/nvim/lua/aleidk/plugins-core/todo-comments.lua diff --git a/config/nvim/lua/aleidk/plugins/ai.lua b/config/nvim/lua/aleidk/plugins-ide/ai.lua similarity index 100% rename from config/nvim/lua/aleidk/plugins/ai.lua rename to config/nvim/lua/aleidk/plugins-ide/ai.lua diff --git a/config/nvim/lua/aleidk/plugins-ide/color-picker.lua b/config/nvim/lua/aleidk/plugins-ide/color-picker.lua new file mode 100644 index 0000000..221ed52 --- /dev/null +++ b/config/nvim/lua/aleidk/plugins-ide/color-picker.lua @@ -0,0 +1,15 @@ +return { + { + -- Color Picker + "uga-rosa/ccc.nvim", + event = "VeryLazy", + opts = { + auto_enable = true, + lsp = true, + }, + keys = { + { "uc", "CccPick", desc = "Open Color picker" }, + { "uC", "CccHighlighterToggle", desc = "Toggle Color highlight" }, + }, + }, +} diff --git a/config/nvim/lua/aleidk/plugins/completion.lua b/config/nvim/lua/aleidk/plugins-ide/completion.lua similarity index 100% rename from config/nvim/lua/aleidk/plugins/completion.lua rename to config/nvim/lua/aleidk/plugins-ide/completion.lua diff --git a/config/nvim/lua/aleidk/plugins/database.lua b/config/nvim/lua/aleidk/plugins-ide/database.lua similarity index 94% rename from config/nvim/lua/aleidk/plugins/database.lua rename to config/nvim/lua/aleidk/plugins-ide/database.lua index 941e717..175697b 100644 --- a/config/nvim/lua/aleidk/plugins/database.lua +++ b/config/nvim/lua/aleidk/plugins-ide/database.lua @@ -1,7 +1,7 @@ return { "kristijanhusak/vim-dadbod-ui", dependencies = { - { "tpope/vim-dadbod", lazy = true }, + { "tpope/vim-dadbod", lazy = true }, { "kristijanhusak/vim-dadbod-completion", ft = { "sql", "mysql", "plsql" }, lazy = true }, }, cmd = { diff --git a/config/nvim/lua/aleidk/plugins-ide/doc-gen.lua b/config/nvim/lua/aleidk/plugins-ide/doc-gen.lua new file mode 100644 index 0000000..199ce62 --- /dev/null +++ b/config/nvim/lua/aleidk/plugins-ide/doc-gen.lua @@ -0,0 +1,15 @@ +return { + "danymat/neogen", + opts = { snippet_engine = "luasnip" }, + dependencies = { "nvim-treesitter/nvim-treesitter" }, + version = "*", -- stable releases + keys = { + { + "gcd", + function() + require("neogen").generate() + end, + desc = "Generate comment docstring", + }, + }, +} diff --git a/config/nvim/lua/aleidk/plugins/formatter.lua b/config/nvim/lua/aleidk/plugins-ide/formatter.lua similarity index 100% rename from config/nvim/lua/aleidk/plugins/formatter.lua rename to config/nvim/lua/aleidk/plugins-ide/formatter.lua diff --git a/config/nvim/lua/aleidk/plugins/git.lua b/config/nvim/lua/aleidk/plugins-ide/git.lua similarity index 82% rename from config/nvim/lua/aleidk/plugins/git.lua rename to config/nvim/lua/aleidk/plugins-ide/git.lua index db22509..a248abf 100644 --- a/config/nvim/lua/aleidk/plugins/git.lua +++ b/config/nvim/lua/aleidk/plugins-ide/git.lua @@ -27,7 +27,7 @@ return { map("n", "u", gs.undo_stage_hunk, "Undo Stage Hunk") map("n", "R", gs.reset_buffer, "Reset Buffer") map("n", "", gs.preview_hunk, "Preview Hunk") - map("n", "l", function() gs.blame_line({full = true}) end, "Blame Line") + map("n", "l", function() gs.blame_line({ full = true }) end, "Blame Line") map("n", "d", gs.diffthis, "Diff This") end, }, @@ -45,9 +45,9 @@ return { { "NeogitOrg/neogit", dependencies = { - "nvim-lua/plenary.nvim", -- required + "nvim-lua/plenary.nvim", -- required "nvim-telescope/telescope.nvim", -- optional - "sindrets/diffview.nvim", -- optional + "sindrets/diffview.nvim", -- optional }, config = true, opts = { @@ -94,21 +94,4 @@ return { }, }, }, - - { - "pwntester/octo.nvim", - dependencies = { - "nvim-lua/plenary.nvim", - "nvim-telescope/telescope.nvim", - "nvim-tree/nvim-web-devicons", - }, - opts = { enable_builtin = true }, - keys = { - { - "go", - "Octo", - desc = "Octo.nvim", - }, - }, - }, } diff --git a/config/nvim/lua/aleidk/plugins/linters.lua b/config/nvim/lua/aleidk/plugins-ide/linters.lua similarity index 100% rename from config/nvim/lua/aleidk/plugins/linters.lua rename to config/nvim/lua/aleidk/plugins-ide/linters.lua diff --git a/config/nvim/lua/aleidk/plugins/lsp.lua b/config/nvim/lua/aleidk/plugins-ide/lsp.lua similarity index 100% rename from config/nvim/lua/aleidk/plugins/lsp.lua rename to config/nvim/lua/aleidk/plugins-ide/lsp.lua diff --git a/config/nvim/lua/aleidk/plugins/luasnip.lua b/config/nvim/lua/aleidk/plugins-ide/luasnip.lua similarity index 100% rename from config/nvim/lua/aleidk/plugins/luasnip.lua rename to config/nvim/lua/aleidk/plugins-ide/luasnip.lua diff --git a/config/nvim/lua/aleidk/plugins/mason.lua b/config/nvim/lua/aleidk/plugins-ide/mason.lua similarity index 100% rename from config/nvim/lua/aleidk/plugins/mason.lua rename to config/nvim/lua/aleidk/plugins-ide/mason.lua diff --git a/config/nvim/lua/aleidk/plugins/remote-sshfs.lua b/config/nvim/lua/aleidk/plugins-ide/remote-sshfs.lua similarity index 100% rename from config/nvim/lua/aleidk/plugins/remote-sshfs.lua rename to config/nvim/lua/aleidk/plugins-ide/remote-sshfs.lua diff --git a/config/nvim/lua/aleidk/plugins/task-runner.lua b/config/nvim/lua/aleidk/plugins-ide/task-runner.lua similarity index 100% rename from config/nvim/lua/aleidk/plugins/task-runner.lua rename to config/nvim/lua/aleidk/plugins-ide/task-runner.lua diff --git a/config/nvim/lua/aleidk/plugins/trouble.lua b/config/nvim/lua/aleidk/plugins-ide/trouble.lua similarity index 100% rename from config/nvim/lua/aleidk/plugins/trouble.lua rename to config/nvim/lua/aleidk/plugins-ide/trouble.lua diff --git a/config/nvim/lua/aleidk/plugins/ts-node-action.lua b/config/nvim/lua/aleidk/plugins-ide/ts-node-action.lua similarity index 100% rename from config/nvim/lua/aleidk/plugins/ts-node-action.lua rename to config/nvim/lua/aleidk/plugins-ide/ts-node-action.lua diff --git a/config/nvim/lua/aleidk/plugins-ide/typescript-tools.lua b/config/nvim/lua/aleidk/plugins-ide/typescript-tools.lua new file mode 100644 index 0000000..7f106b0 --- /dev/null +++ b/config/nvim/lua/aleidk/plugins-ide/typescript-tools.lua @@ -0,0 +1,18 @@ +return { + "pmizio/typescript-tools.nvim", + dependencies = { "nvim-lua/plenary.nvim", "neovim/nvim-lspconfig" }, + opts = { + init_options = { + preferences = { + disableSuggestions = true, + }, + }, + settings = { + -- array of strings("fix_all"|"add_missing_imports"|"remove_unused"| + -- "remove_unused_imports"|"organize_imports") -- or string "all" + -- to include all supported code actions + -- specify commands exposed as code_actions + expose_as_code_action = "all", + }, + }, +} diff --git a/config/nvim/lua/aleidk/plugins/init.lua b/config/nvim/lua/aleidk/plugins/init.lua deleted file mode 100644 index 4c6fcb8..0000000 --- a/config/nvim/lua/aleidk/plugins/init.lua +++ /dev/null @@ -1,56 +0,0 @@ -return { - -- Detect tabstop and shiftwidth automatically - "tpope/vim-sleuth", - { "nvim-tree/nvim-web-devicons", lazy = true }, - { - "mbbill/undotree", - config = function() - vim.g.undotree_WindowLayout = 2 - vim.g.undotree_ShortIndicators = 1 - vim.g.undotree_SetFocusWhenToggle = 1 - end, - keys = { - { "fu", vim.cmd.UndotreeToggle, desc = "Undo tree" }, - }, - }, - { - -- Highlight word under cursor - "RRethy/vim-illuminate", - event = { "BufReadPost", "BufNewFile" }, - opts = { delay = 200 }, - config = function(_, opts) - require("illuminate").configure(opts) - end, - }, - { - -- Color Picker - "uga-rosa/ccc.nvim", - event = "VeryLazy", - opts = { - auto_enable = true, - lsp = true, - }, - keys = { - { "uc", "CccPick", desc = "Open Color picker" }, - { "uC", "CccHighlighterToggle", desc = "Toggle Color highlight" }, - }, - }, - { - "pmizio/typescript-tools.nvim", - dependencies = { "nvim-lua/plenary.nvim", "neovim/nvim-lspconfig" }, - opts = { - init_options = { - preferences = { - disableSuggestions = true, - }, - }, - settings = { - -- array of strings("fix_all"|"add_missing_imports"|"remove_unused"| - -- "remove_unused_imports"|"organize_imports") -- or string "all" - -- to include all supported code actions - -- specify commands exposed as code_actions - expose_as_code_action = "all", - }, - }, - }, -} diff --git a/config/nvim/lua/aleidk/plugins/pretty-fold.lua b/config/nvim/lua/aleidk/plugins/pretty-fold.lua deleted file mode 100644 index 665525c..0000000 --- a/config/nvim/lua/aleidk/plugins/pretty-fold.lua +++ /dev/null @@ -1,43 +0,0 @@ -return { - enabled = false, - "anuvyklack/pretty-fold.nvim", - opts = { - sections = { - left = { - "+", - function() - return string.rep("-", vim.v.foldlevel) - end, - " ", - "content", - " ", - "number_of_folded_lines", - " ", - function() - return string.rep("-", vim.v.foldlevel) - end, - "+", - }, - }, - fill_char = " ", - - -- Possible values: - -- "delete" : Delete all comment signs from the fold string. - -- "spaces" : Replace all comment signs with equal number of spaces. - -- false : Do nothing with comment signs. - process_comment_signs = "delete", - - -- List of patterns that will be removed from content foldtext section. - stop_words = { - "@brief%s*", -- (for C++) Remove '@brief' and all spaces after. - }, - - matchup_patterns = { - { "{", "}" }, - { "%(", ")" }, -- % to escape lua pattern char - { "%[", "]" }, -- % to escape lua pattern char - }, - - ft_ignore = { "neorg" }, - }, -} diff --git a/config/nvim/lua/aleidk/plugins/sessions.lua b/config/nvim/lua/aleidk/plugins/sessions.lua deleted file mode 100644 index d6e19a8..0000000 --- a/config/nvim/lua/aleidk/plugins/sessions.lua +++ /dev/null @@ -1,23 +0,0 @@ -return { - -- sessions - "rmagatti/auto-session", - config = function() - ---@diagnostic disable-next-line: missing-fields - require("auto-session").setup({ - log_level = "error", - auto_session_suppress_dirs = { - "/", - "~/", - "~/.config/**", - "~/.local/share/chezmoi/", - "~/.local/share/db_ui", - "~/.local/share/db_ui/**", - "~/Downloads", - }, - bypass_session_save_file_types = { - "NeogitStatus", - "Lazy", - }, - }) - end, -} diff --git a/config/nvim/lua/aleidk/plugins/zen.lua b/config/nvim/lua/aleidk/plugins/zen.lua deleted file mode 100644 index 14374e5..0000000 --- a/config/nvim/lua/aleidk/plugins/zen.lua +++ /dev/null @@ -1,81 +0,0 @@ -return { - "folke/zen-mode.nvim", - dependencies = { - { - "folke/twilight.nvim", - opts = { - -- your configuration comes here - -- or leave it empty to use the default settings - -- refer to the configuration section below - }, - }, - }, - keys = { - { - "uz", - function() - require("zen-mode").toggle({}) - end, - desc = "Toggle zen mode", - }, - }, - opts = { - window = { - backdrop = 0.95, -- shade the backdrop of the Zen window. Set to 1 to keep the same as Normal - -- height and width can be: - -- * an absolute number of cells when > 1 - -- * a percentage of the width / height of the editor when <= 1 - -- * a function that returns the width or the height - width = 0.8, -- width of the Zen window - height = 1, -- height of the Zen window - -- by default, no options are changed for the Zen window - -- uncomment any of the options below, or add other vim.wo options you want to apply - options = { - -- signcolumn = "no", -- disable signcolumn - -- number = false, -- disable number column - -- relativenumber = false, -- disable relative numbers - cursorline = false, -- disable cursorline - -- cursorcolumn = false, -- disable cursor column - -- foldcolumn = "0", -- disable fold column - list = false, -- disable whitespace characters - }, - }, - plugins = { - -- disable some global vim options (vim.o...) - -- comment the lines to not apply the options - options = { - enabled = true, - ruler = true, -- disables the ruler text in the cmd line area - showcmd = false, -- disables the command in the last line of the screen - -- you may turn on/off statusline in zen mode by setting 'laststatus' - -- statusline will be shown only if 'laststatus' == 3 - laststatus = 0, -- turn off the statusline in zen mode - }, - twilight = { enabled = true }, -- enable to start Twilight when zen mode opens - gitsigns = { enabled = false }, -- disables git signs - tmux = { enabled = true }, -- disables the tmux statusline - -- this will change the font size on kitty when in zen mode - -- to make this work, you need to set the following kitty options: - -- - allow_remote_control socket-only - -- - listen_on unix:/tmp/kitty - kitty = { - enabled = true, - font = "+8", -- font size increment - }, - -- this will change the font size on alacritty when in zen mode - -- requires Alacritty Version 0.10.0 or higher - -- uses `alacritty msg` subcommand to change font size - alacritty = { - enabled = true, - font = "14", -- font size - }, - -- this will change the font size on wezterm when in zen mode - -- See else also the Plugins/Wezterm section in this projects README - wezterm = { - enabled = true, - -- can be either an absolute font size or the number of incremental steps - font = "+4", -- (10% increase per step) - }, - }, - }, -} diff --git a/config/nvim/lua/aleidk/utils.lua b/config/nvim/lua/aleidk/utils.lua new file mode 100644 index 0000000..96d3f8f --- /dev/null +++ b/config/nvim/lua/aleidk/utils.lua @@ -0,0 +1,7 @@ +local M = {} + +function M.plugin_should_be_enabled() + print("Plugin should be enabled") +end + +return M diff --git a/config/yazi/keymap.toml b/config/yazi/keymap.toml index 4c37eb5..8b24d00 100644 --- a/config/yazi/keymap.toml +++ b/config/yazi/keymap.toml @@ -45,11 +45,11 @@ keymap = [ { on = ["J"], run = "seek 5", desc = "Seek down 5 units in the preview" }, # Selection - { on = [ "" ], run = [ "toggle", "arrow 1" ], desc = "Toggle the current selection state" }, + { on = [ "" ], run = [ "select", "arrow 1" ], desc = "Toggle the current selection state" }, { on = [ "v" ], run = "visual_mode", desc = "Enter visual mode (selection mode)" }, { on = [ "V" ], run = "visual_mode --unset", desc = "Enter visual mode (unset mode)" }, - { on = [ "" ], run = "toggle_all", desc = "Select all files" }, - { on = [ "" ], run = "toggle_all on", desc = "Inverse selection of all files" }, + { on = [ "" ], run = "select_all --state=true", desc = "Select all files" }, + { on = [ "" ], run = "select_all --state=none", desc = "Inverse selection of all files" }, # Operation { on = [ "o" ], run = "open", desc = "Open the selected files" },