diff --git a/.gitmodules b/.gitmodules index 3508c6a..c00fbbb 100644 --- a/.gitmodules +++ b/.gitmodules @@ -58,9 +58,6 @@ [submodule "cheat-tldr"] path = config/cheat/cheatsheets/tldr url = https://github.com/ivuorinen/cheatsheet-tldr.git -[submodule "nvim-kickstart"] - path = config/nvim-kickstart - url = https://github.com/ivuorinen/kickstart.nvim [submodule "tmux/tmux-dark-notify"] path = config/tmux/plugins/tmux-dark-notify url = https://github.com/erikw/tmux-dark-notify.git diff --git a/add-submodules.sh b/add-submodules.sh index c49bb71..1a108bd 100755 --- a/add-submodules.sh +++ b/add-submodules.sh @@ -10,9 +10,6 @@ git submodule add --name dotbot-include \ git submodule add --name dotbot-pip \ -f https://github.com/sobolevn/dotbot-pip.git tools/dotbot-pip -git submodule add --name nvim-kickstart \ - -f https://github.com/ivuorinen/kickstart.nvim config/nvim-kickstart - # other repos git submodule add --name cheat-community \ -f https://github.com/cheat/cheatsheets.git config/cheat/cheatsheets/community @@ -54,3 +51,4 @@ done [ -d "config/tmux/plugins/tmux-menus" ] && rm -rf config/tmux/plugins/tmux-menus [ -d "tools/dotbot-crontab" ] && rm -rf tools/dotbot-crontab [ -d "tools/dotbot-snap" ] && rm -rf tools/dotbot-snap +[ -d "config/nvim-kickstart" ] && rm -rf config/nvim-kickstart diff --git a/config/alias b/config/alias index 1e65c9c..1885c49 100755 --- a/config/alias +++ b/config/alias @@ -63,13 +63,10 @@ alias tm='command tmux new-session -A -s main' alias ta='command tmux attach || command tmux' # nvim -alias nvim-ks='NVIM_APPNAME="nvim-kickstart" nvim' -alias ks='NVIM_APPNAME="nvim-kickstart" nvim' -alias nvim-lazy='NVIM_APPNAME="nvim-lazy" nvim' -alias nl='NVIM_APPNAME="nvim-lazy" nvim' -alias vim='nvim' -alias vi='nvim' alias c='nvim' +alias ks='nvim' +alias vi='nvim' +alias vim='nvim' # xdg-ninja aliases for better experience alias xdg='xdg-ninja --skip-ok --skip-unsupported' diff --git a/config/nvim-kickstart b/config/nvim-kickstart deleted file mode 160000 index d1d9f7b..0000000 --- a/config/nvim-kickstart +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d1d9f7b214166d0fb0d837e5f74cf91e89a7d09c diff --git a/config/nvim-lazy/.gitignore b/config/nvim-lazy/.gitignore deleted file mode 100644 index cc5457a..0000000 --- a/config/nvim-lazy/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -tt.* -.tests -doc/tags -debug -.repro -foo.* -*.log -data diff --git a/config/nvim-lazy/.luarc.json b/config/nvim-lazy/.luarc.json deleted file mode 100644 index c2d33c2..0000000 --- a/config/nvim-lazy/.luarc.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "diagnostics.globals": ["vim"] -} diff --git a/config/nvim-lazy/.neoconf.json b/config/nvim-lazy/.neoconf.json deleted file mode 100644 index 7c48087..0000000 --- a/config/nvim-lazy/.neoconf.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "neodev": { - "library": { - "enabled": true, - "plugins": true - } - }, - "neoconf": { - "plugins": { - "lua_ls": { - "enabled": true - } - } - } -} diff --git a/config/nvim-lazy/README.md b/config/nvim-lazy/README.md deleted file mode 100644 index 185280b..0000000 --- a/config/nvim-lazy/README.md +++ /dev/null @@ -1,4 +0,0 @@ -# 💤 LazyVim - -A starter template for [LazyVim](https://github.com/LazyVim/LazyVim). -Refer to the [documentation](https://lazyvim.github.io/installation) to get started. diff --git a/config/nvim-lazy/init.lua b/config/nvim-lazy/init.lua deleted file mode 100644 index 2514f9e..0000000 --- a/config/nvim-lazy/init.lua +++ /dev/null @@ -1,2 +0,0 @@ --- bootstrap lazy.nvim, LazyVim and your plugins -require("config.lazy") diff --git a/config/nvim-lazy/lazy-lock.json b/config/nvim-lazy/lazy-lock.json deleted file mode 100644 index 1dd3916..0000000 --- a/config/nvim-lazy/lazy-lock.json +++ /dev/null @@ -1,82 +0,0 @@ -{ - "LazyVim": { "branch": "main", "commit": "12818a6cb499456f4903c5d8e68af43753ebc869" }, - "LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" }, - "SchemaStore.nvim": { "branch": "main", "commit": "b546852f7a477276805b01f84ac79c28a962c55b" }, - "aerial.nvim": { "branch": "master", "commit": "b59e01e4380932b375ecff165b48a9400c4af929" }, - "animation.nvim": { "branch": "main", "commit": "fb77091ab72ec9971aee0562e7081182527aaa6a" }, - "bufdelete.nvim": { "branch": "master", "commit": "f6bcea78afb3060b198125256f897040538bcb81" }, - "bufferline.nvim": { "branch": "main", "commit": "2e3c8cc5a57ddd32f1edd2ffd2ccb10c09421f6c" }, - "catppuccin": { "branch": "main", "commit": "c9e205fe035d622b3c2d66ee42edf368c0c31fd5" }, - "cloak.nvim": { "branch": "main", "commit": "648aca6d33ec011dc3166e7af3b38820d01a71e4" }, - "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, - "cmp-emoji": { "branch": "main", "commit": "e8398e2adf512a03bb4e1728ca017ffeac670a9f" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, - "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, - "comment-box.nvim": { "branch": "main", "commit": "e04635ed2b423448b87ddb2f35c26d1a7b7b3f1c" }, - "conform.nvim": { "branch": "master", "commit": "0ebe875d9c306f5fc829db38492ffff2a70d8e9d" }, - "copilot-cmp": { "branch": "master", "commit": "b6e5286b3d74b04256d0a7e3bd2908eabec34b44" }, - "copilot.lua": { "branch": "master", "commit": "86537b286f18783f8b67bccd78a4ef4345679625" }, - "dashboard-nvim": { "branch": "master", "commit": "fabf5feec96185817c732d47d363f34034212685" }, - "dressing.nvim": { "branch": "master", "commit": "71349f24c6e07b39f33600985843c289ca735308" }, - "edgy.nvim": { "branch": "main", "commit": "ebb77fde6f5cb2745431c6c0fe57024f66471728" }, - "flit.nvim": { "branch": "main", "commit": "1ef72de6a02458d31b10039372c8a15ab8989e0d" }, - "friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" }, - "gitsigns.nvim": { "branch": "main", "commit": "0b04035bb7b3c83e999b9676e2fb46fd0aa9f910" }, - "glance.nvim": { "branch": "master", "commit": "51059bcf21016387b6233c89eed220cf47fca752" }, - "grug-far.nvim": { "branch": "main", "commit": "308e357be687197605cf19222f843fbb331f50f5" }, - "harpoon": { "branch": "harpoon2", "commit": "0378a6c428a0bed6a2781d459d7943843f374bce" }, - "indent-blankline.nvim": { "branch": "master", "commit": "3fe94b8034dd5241cb882bb73847303b58857ecf" }, - "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" }, - "lazydev.nvim": { "branch": "main", "commit": "491452cf1ca6f029e90ad0d0368848fac717c6d2" }, - "leap.nvim": { "branch": "main", "commit": "c6bfb191f1161fbabace1f36f578a20ac6c7642c" }, - "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, - "luvit-meta": { "branch": "main", "commit": "ce76f6f6cdc9201523a5875a4471dcfe0186eb60" }, - "markdown-preview.nvim": { "branch": "master", "commit": "9becceee5740b7db6914da87358a183ad11b2049" }, - "markdown.nvim": { "branch": "main", "commit": "a0777ec640acbf455da32aa856922d4187c5c27f" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "25c11854aa25558ee6c03432edfa0df0217324be" }, - "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" }, - "middleclass": { "branch": "master", "commit": "9fab4d5bca67262614960960ca35c4740eb2be2c" }, - "mini.ai": { "branch": "main", "commit": "a7e90f110e6274262616311b93cef12cd2667a2d" }, - "mini.animate": { "branch": "main", "commit": "0a35f6db55cfac04a0999abe3465f7b692dc56a7" }, - "mini.hipatterns": { "branch": "main", "commit": "427712c754bfdccd8da7073576cd8e2586c0fe93" }, - "mini.icons": { "branch": "main", "commit": "2d89252993fec829b24720097a687412d10f6c85" }, - "mini.pairs": { "branch": "main", "commit": "40261dfcec7623cd57be3c3beb50fa73f2650cdf" }, - "neo-tree.nvim": { "branch": "main", "commit": "29f7c215332ba95e470811c380ddbce2cebe2af4" }, - "neogen": { "branch": "main", "commit": "dc50715c009f89b8111197fd2f282f6042daa7ea" }, - "noice.nvim": { "branch": "main", "commit": "448bb9c524a7601035449210838e374a30153172" }, - "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, - "nvim-ansible": { "branch": "main", "commit": "9c3b4a771b8c8d7b4f2171466464d978cb3846f7" }, - "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, - "nvim-lint": { "branch": "master", "commit": "a7ce9c78a7c710c28bee56dfab10a5c0c80b7fb5" }, - "nvim-lspconfig": { "branch": "master", "commit": "0b8165cf95806bc4bb8f745bb0c92021b2ed4b98" }, - "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, - "nvim-regexplainer": { "branch": "main", "commit": "41c1b90a54e1d6c8f5b0d79ff05104c3877b5025" }, - "nvim-snippets": { "branch": "main", "commit": "5fae279c75d8b6bd608574a180b46a605b0a73c3" }, - "nvim-treesitter": { "branch": "master", "commit": "4770d9a1a77b0cc2b723c646c3dbe43a9133e5db" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "bf8d2ad35d1d1a687eae6c065c3d524f7ab61b23" }, - "nvim-ts-autotag": { "branch": "main", "commit": "e239a560f338be31337e7abc3ee42515daf23f5e" }, - "nvim-ufo": { "branch": "main", "commit": "a5390706f510d39951dd581f6d2a972741b3fa26" }, - "outline.nvim": { "branch": "main", "commit": "90fb2f96eed97abe3d1c5c3fef1103ae6bea3cf8" }, - "persistence.nvim": { "branch": "main", "commit": "c45ff862b53ce07a853a753fb0b33e148dbb99d2" }, - "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, - "promise-async": { "branch": "main", "commit": "38a4575da9497326badd3995e768b4ccf0bb153e" }, - "refactoring.nvim": { "branch": "master", "commit": "c406fc5fb4d7ba5fce7b668637075fad6e75e9f8" }, - "statuscol.nvim": { "branch": "main", "commit": "1022f922b77b44c36f8057ac29adbfd89ce86958" }, - "stickybuf.nvim": { "branch": "master", "commit": "2160fcd536d81f5fa43f7167dba6634e814e3154" }, - "tailwind-sorter.nvim": { "branch": "main", "commit": "efc34952eb0a20520f12c8a273ea44298c11a4fa" }, - "tailwindcss-colorizer-cmp.nvim": { "branch": "main", "commit": "3d3cd95e4a4135c250faf83dd5ed61b8e5502b86" }, - "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" }, - "telescope-terraform-doc.nvim": { "branch": "main", "commit": "7ac642765615e6ff164ecfc82eb278aa68d06840" }, - "telescope-terraform.nvim": { "branch": "main", "commit": "072c97023797ca1a874668aaa6ae0b74425335df" }, - "telescope.nvim": { "branch": "master", "commit": "5972437de807c3bc101565175da66a1aa4f8707a" }, - "todo-comments.nvim": { "branch": "main", "commit": "313b04e5b02d29ab9275c9295ff5e2b73921b0eb" }, - "tokyonight.nvim": { "branch": "main", "commit": "2cd12582c98a3552032824ffa67fd44b4d81184a" }, - "trouble.nvim": { "branch": "main", "commit": "40c5317a6e90fe3393f07b0fee580d9e93a216b4" }, - "ts-comments.nvim": { "branch": "main", "commit": "79e4337e4231ff8ca33dab85162b5ee8e78f22ce" }, - "venv-selector.nvim": { "branch": "regexp", "commit": "2543638b93f6f901614eebffd8536e8c1333e357" }, - "vim-repeat": { "branch": "master", "commit": "8106e142dfdc278ff3eaaadd7b362ad7949d4357" }, - "vim-wakatime": { "branch": "master", "commit": "87c6861ea81700ec4a6a27c81413cf07cb2c883c" }, - "which-key.nvim": { "branch": "main", "commit": "6c1584eb76b55629702716995cca4ae2798a9cca" }, - "windows.nvim": { "branch": "main", "commit": "c7492552b23d0ab30325e90b56066ec51242adc8" }, - "yanky.nvim": { "branch": "main", "commit": "9268018e92d02650a94e39dd5f5903c542f7ea11" } -} diff --git a/config/nvim-lazy/lazyvim.json b/config/nvim-lazy/lazyvim.json deleted file mode 100644 index 3470eb7..0000000 --- a/config/nvim-lazy/lazyvim.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "extras": [ - "lazyvim.plugins.extras.coding.copilot", - "lazyvim.plugins.extras.coding.yanky", - "lazyvim.plugins.extras.editor.aerial", - "lazyvim.plugins.extras.editor.aerial", - "lazyvim.plugins.extras.editor.harpoon2", - "lazyvim.plugins.extras.editor.leap", - "lazyvim.plugins.extras.editor.outline", - "lazyvim.plugins.extras.editor.refactoring", - "lazyvim.plugins.extras.formatting.black", - "lazyvim.plugins.extras.formatting.prettier", - "lazyvim.plugins.extras.lang.ansible", - "lazyvim.plugins.extras.lang.docker", - "lazyvim.plugins.extras.lang.go", - "lazyvim.plugins.extras.lang.json", - "lazyvim.plugins.extras.lang.markdown", - "lazyvim.plugins.extras.lang.php", - "lazyvim.plugins.extras.lang.python", - "lazyvim.plugins.extras.lang.tailwind", - "lazyvim.plugins.extras.lang.terraform", - "lazyvim.plugins.extras.lang.typescript", - "lazyvim.plugins.extras.lang.vue", - "lazyvim.plugins.extras.lang.yaml", - "lazyvim.plugins.extras.linting.eslint", - "lazyvim.plugins.extras.ui.edgy", - "lazyvim.plugins.extras.ui.mini-animate", - "lazyvim.plugins.extras.util.dot", - "lazyvim.plugins.extras.util.mini-hipatterns" - ], - "news": { - "NEWS.md": "6520" - }, - "version": 6 -} \ No newline at end of file diff --git a/config/nvim-lazy/lua/config/autocmds.lua b/config/nvim-lazy/lua/config/autocmds.lua deleted file mode 100644 index 27e9e06..0000000 --- a/config/nvim-lazy/lua/config/autocmds.lua +++ /dev/null @@ -1,3 +0,0 @@ --- Autocmds are automatically loaded on the VeryLazy event --- Default autocmds that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/autocmds.lua --- Add any additional autocmds here diff --git a/config/nvim-lazy/lua/config/keymaps.lua b/config/nvim-lazy/lua/config/keymaps.lua deleted file mode 100644 index a2d61c7..0000000 --- a/config/nvim-lazy/lua/config/keymaps.lua +++ /dev/null @@ -1,16 +0,0 @@ --- Keymaps are automatically loaded on the VeryLazy event --- Default keymaps that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/keymaps.lua --- Add any additional keymaps here -local wk = require("which-key") - --- ╭──────────────────────────────────────────────────────────╮ --- │ Comment box │ --- ╰──────────────────────────────────────────────────────────╯ -wk.add({ - { "bc", group = "□ Comment box" }, - { "bcb", "CBccbox", desc = "Box Title" }, - { "bcd", "CBd", desc = "Remove a box" }, - { "bcl", "CBline", desc = "Simple Line" }, - { "bcm", "CBllbox14", desc = "Marked" }, - { "bct", "CBllline", desc = "Titled Line" }, -}) diff --git a/config/nvim-lazy/lua/config/lazy.lua b/config/nvim-lazy/lua/config/lazy.lua deleted file mode 100644 index 98cc723..0000000 --- a/config/nvim-lazy/lua/config/lazy.lua +++ /dev/null @@ -1,63 +0,0 @@ -local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" -if not vim.loop.fs_stat(lazypath) then - -- bootstrap lazy.nvim - -- stylua: ignore - vim.fn.system({ "git", "clone", "--filter=blob:none", "https://github.com/folke/lazy.nvim.git", "--branch=stable", lazypath }) -end -vim.opt.rtp:prepend(vim.env.LAZY or lazypath) - -require("lazy").setup({ - spec = { - -- add LazyVim and import its plugins - { - "LazyVim/LazyVim", - import = "lazyvim.plugins", - opts = { - colorscheme = "tokyonight", - }, - }, - { - "folke/tokyonight.nvim", - lazy = false, - priority = 1000, - opts = { - style = "night", - transparent = true, - sidebars = { "qf", "vista_kind", "terminal", "packer" }, - styles = { - sidebars = "transparent", - floats = "transparent", - }, - dim_inactive = true, - lualine_bold = true, - }, - }, - { import = "plugins" }, - }, - defaults = { - -- By default, only LazyVim plugins will be lazy-loaded. Your custom plugins will load during startup. - -- If you know what you're doing, you can set this to `true` to have all your custom plugins lazy-loaded by default. - lazy = false, - -- It's recommended to leave version=false for now, since a lot the plugin that support versioning, - -- have outdated releases, which may break your Neovim install. - -- version = false, -- always use the latest git commit - version = "*", -- try installing the latest stable version for plugins that support semver - }, - install = { colorscheme = { "tokyonight" } }, - checker = { enabled = true }, -- automatically check for plugin updates - performance = { - rtp = { - -- disable some rtp plugins - disabled_plugins = { - "gzip", - -- "matchit", - -- "matchparen", - -- "netrwPlugin", - "tarPlugin", - "tohtml", - "tutor", - "zipPlugin", - }, - }, - }, -}) diff --git a/config/nvim-lazy/lua/config/options.lua b/config/nvim-lazy/lua/config/options.lua deleted file mode 100644 index 60c23af..0000000 --- a/config/nvim-lazy/lua/config/options.lua +++ /dev/null @@ -1,13 +0,0 @@ --- Options are automatically loaded before lazy.nvim startup --- Default options that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/options.lua --- Add any additional options here - -local opt = vim.opt - -opt.number = true -opt.relativenumber = true -opt.modeline = true -vim.g.root_spec = { "lsp", { ".git", "lua" }, "cwd" } - --- The line beneath this is called `modeline`. See `:help modeline` --- vim: ts=2 sts=2 sw=2 et diff --git a/config/nvim-lazy/lua/plugins/coding.lua b/config/nvim-lazy/lua/plugins/coding.lua deleted file mode 100644 index 84522e0..0000000 --- a/config/nvim-lazy/lua/plugins/coding.lua +++ /dev/null @@ -1,126 +0,0 @@ -return { - -- A better annotation generator. Supports multiple languages and annotation conventions. - -- https://github.com/danymat/neogen - { - "danymat/neogen", - dependencies = "nvim-treesitter/nvim-treesitter", - version = "*", - cmd = "Neogen", - opts = { - snippet_engine = "luasnip", - languages = { - lua = { template = { annotation_convention = "ldoc" } }, - typescript = { template = { annotation_convention = "tsdoc" } }, - typescriptreact = { template = { annotation_convention = "tsdoc" } }, - }, - }, - keys = { - { - "ba", - desc = "Annotations / Comments", - }, - { - "baa", - function() - require("neogen").generate({ type = "current" }) - end, - desc = "Current", - }, - { - "bac", - function() - require("neogen").generate({ type = "class" }) - end, - desc = "Class", - }, - { - "baf", - function() - require("neogen").generate({ type = "func" }) - end, - desc = "Function", - }, - { - "bat", - function() - require("neogen").generate({ type = "type" }) - end, - desc = "Type", - }, - { - "baF", - function() - require("neogen").generate({ type = "file" }) - end, - desc = "File", - }, - }, - }, - { - "laytan/tailwind-sorter.nvim", - dependencies = { "nvim-treesitter/nvim-treesitter", "nvim-lua/plenary.nvim" }, - build = "cd formatter && npm i && npm run build", - config = true, - opts = { - on_save_enabled = true, - }, - }, - -- Describe the regexp under the cursor - -- https://github.com/bennypowers/nvim-regexplainer - { - "bennypowers/nvim-regexplainer", - dependencies = { - "nvim-treesitter/nvim-treesitter", - "MunifTanjim/nui.nvim", - }, - opts = { - -- automatically show the explainer when the cursor enters a regexp - auto = true, - }, - }, - -- Clarify and beautify your comments using boxes and lines. - -- https://github.com/LudoPinelli/comment-box.nvim - { "LudoPinelli/comment-box.nvim", opts = {} }, - -- Mason - -- https://github.com/williamboman/mason.nvim - { - "williamboman/mason.nvim", - opts = function(_, opts) - vim.list_extend(opts.ensure_installed, { - "actionlint", - "ansible-language-server", - "ansible-lint", - "bash-language-server", - "blade-formatter", - "cfn-lint", - "codeql", - "codespell", - "commitlint", - "diagnostic-languageserver", - "docker-compose-language-service", - "dockerfile-language-server", - "editorconfig-checker", - "fixjson", - "flake8", - "html-lsp", - "jq", - "jsonlint", - "luacheck", - "nginx-language-server", - "php-cs-fixer", - "phpcs", - "phpmd", - "semgrep", - "shellcheck", - "shfmt", - "sonarlint-language-server", - "stylelint", - "stylua", - "yamllint", - }) - end, - }, - -- Vim plugin for automatic time tracking and metrics generated from your programming activity. - -- https://github.com/wakatime/vim-wakatime - { "wakatime/vim-wakatime", lazy = false, enabled = true }, -} diff --git a/config/nvim-lazy/lua/plugins/example.lua b/config/nvim-lazy/lua/plugins/example.lua deleted file mode 100644 index 11a0c28..0000000 --- a/config/nvim-lazy/lua/plugins/example.lua +++ /dev/null @@ -1,266 +0,0 @@ --- since this is just an example spec, don't actually load anything here and return an empty spec --- stylua: ignore -if true then return {} end - --- every spec file under the "plugins" directory will be loaded automatically by lazy.nvim --- --- In your plugin files, you can: --- * add extra plugins --- * disable/enabled LazyVim plugins --- * override the configuration of LazyVim plugins -return { - -- add gruvbox - { "ellisonleao/gruvbox.nvim" }, - - -- Configure LazyVim to load gruvbox - { - "LazyVim/LazyVim", - opts = { - colorscheme = "gruvbox", - }, - }, - - -- change trouble config - { - "folke/trouble.nvim", - -- opts will be merged with the parent spec - opts = { use_diagnostic_signs = true }, - }, - - -- disable trouble - { "folke/trouble.nvim", enabled = false }, - - -- add symbols-outline - { - "simrat39/symbols-outline.nvim", - cmd = "SymbolsOutline", - keys = { { "cs", "SymbolsOutline", desc = "Symbols Outline" } }, - config = true, - }, - - -- override nvim-cmp and add cmp-emoji - { - "hrsh7th/nvim-cmp", - dependencies = { "hrsh7th/cmp-emoji" }, - ---@param opts cmp.ConfigSchema - opts = function(_, opts) - local cmp = require("cmp") - opts.sources = cmp.config.sources(vim.list_extend(opts.sources, { { name = "emoji" } })) - end, - }, - - -- change some telescope options and a keymap to browse plugin files - { - "nvim-telescope/telescope.nvim", - keys = { - -- add a keymap to browse plugin files - -- stylua: ignore - { - "fp", - function() require("telescope.builtin").find_files({ cwd = require("lazy.core.config").options.root }) end, - desc = "Find Plugin File", - }, - }, - -- change some options - opts = { - defaults = { - layout_strategy = "horizontal", - layout_config = { prompt_position = "top" }, - sorting_strategy = "ascending", - winblend = 0, - }, - }, - }, - - -- add telescope-fzf-native - { - "telescope.nvim", - dependencies = { - "nvim-telescope/telescope-fzf-native.nvim", - build = "make", - config = function() - require("telescope").load_extension("fzf") - end, - }, - }, - - -- add pyright to lspconfig - { - "neovim/nvim-lspconfig", - ---@class PluginLspOpts - opts = { - ---@type lspconfig.options - servers = { - -- pyright will be automatically installed with mason and loaded with lspconfig - pyright = {}, - }, - }, - }, - - -- add tsserver and setup with typescript.nvim instead of lspconfig - { - "neovim/nvim-lspconfig", - dependencies = { - "jose-elias-alvarez/typescript.nvim", - init = function() - require("lazyvim.util.lsp").on_attach(function(_, buffer) - -- stylua: ignore - vim.keymap.set("n", "co", "TypescriptOrganizeImports", { buffer = buffer, desc = "Organize Imports" }) - vim.keymap.set("n", "cR", "TypescriptRenameFile", { desc = "Rename File", buffer = buffer }) - end) - end, - }, - ---@class PluginLspOpts - opts = { - ---@type lspconfig.options - servers = { - -- tsserver will be automatically installed with mason and loaded with lspconfig - tsserver = {}, - }, - -- you can do any additional lsp server setup here - -- return true if you don't want this server to be setup with lspconfig - ---@type table - setup = { - -- example to setup with typescript.nvim - tsserver = function(_, opts) - require("typescript").setup({ server = opts }) - return true - end, - -- Specify * to use this function as a fallback for any server - -- ["*"] = function(server, opts) end, - }, - }, - }, - - -- for typescript, LazyVim also includes extra specs to properly setup lspconfig, - -- treesitter, mason and typescript.nvim. So instead of the above, you can use: - { import = "lazyvim.plugins.extras.lang.typescript" }, - - -- add more treesitter parsers - { - "nvim-treesitter/nvim-treesitter", - opts = { - ensure_installed = { - "bash", - "html", - "javascript", - "json", - "lua", - "markdown", - "markdown_inline", - "python", - "query", - "regex", - "tsx", - "typescript", - "vim", - "yaml", - }, - }, - }, - - -- since `vim.tbl_deep_extend`, can only merge tables and not lists, the code above - -- would overwrite `ensure_installed` with the new value. - -- If you'd rather extend the default config, use the code below instead: - { - "nvim-treesitter/nvim-treesitter", - opts = function(_, opts) - -- add tsx and treesitter - vim.list_extend(opts.ensure_installed, { - "tsx", - "typescript", - }) - end, - }, - - -- the opts function can also be used to change the default opts: - { - "nvim-lualine/lualine.nvim", - event = "VeryLazy", - opts = function(_, opts) - table.insert(opts.sections.lualine_x, "😄") - end, - }, - - -- or you can return new options to override all the defaults - { - "nvim-lualine/lualine.nvim", - event = "VeryLazy", - opts = function() - return { - --[[add your custom lualine config here]] - } - end, - }, - - -- use mini.starter instead of alpha - { import = "lazyvim.plugins.extras.ui.mini-starter" }, - - -- add jsonls and schemastore packages, and setup treesitter for json, json5 and jsonc - { import = "lazyvim.plugins.extras.lang.json" }, - - -- add any tools you want to have installed below - { - "williamboman/mason.nvim", - opts = { - ensure_installed = { - "stylua", - "shellcheck", - "shfmt", - "flake8", - }, - }, - }, - - -- Use for completion and snippets (supertab) - -- first: disable default and behavior in LuaSnip - { - "L3MON4D3/LuaSnip", - keys = function() - return {} - end, - }, - -- then: setup supertab in cmp - { - "hrsh7th/nvim-cmp", - dependencies = { - "hrsh7th/cmp-emoji", - }, - ---@param opts cmp.ConfigSchema - opts = function(_, opts) - local has_words_before = function() - unpack = unpack or table.unpack - local line, col = unpack(vim.api.nvim_win_get_cursor(0)) - return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match("%s") == nil - end - - local luasnip = require("luasnip") - local cmp = require("cmp") - - opts.mapping = vim.tbl_extend("force", opts.mapping, { - [""] = cmp.mapping(function(fallback) - if cmp.visible() then - cmp.select_next_item() - -- You could replace the expand_or_jumpable() calls with expand_or_locally_jumpable() - -- this way you will only jump inside the snippet region - elseif luasnip.expand_or_jumpable() then - luasnip.expand_or_jump() - elseif has_words_before() then - cmp.complete() - else - fallback() - end - end, { "i", "s" }), - [""] = cmp.mapping(function(fallback) - if cmp.visible() then - cmp.select_prev_item() - elseif luasnip.jumpable(-1) then - luasnip.jump(-1) - else - fallback() - end - end, { "i", "s" }), - }) - end, - }, -} diff --git a/config/nvim-lazy/lua/plugins/lang-php.lua b/config/nvim-lazy/lua/plugins/lang-php.lua deleted file mode 100644 index ada34ed..0000000 --- a/config/nvim-lazy/lua/plugins/lang-php.lua +++ /dev/null @@ -1,48 +0,0 @@ -return { - { - "nvim-treesitter/nvim-treesitter", - opts = function(_, opts) - vim.list_extend(opts.ensure_installed, { - "php", - }) - end, - }, - { - "williamboman/mason.nvim", - opts = function(_, opts) - vim.list_extend(opts.ensure_installed, { - "phpactor", - "intelephense", - }) - end, - }, - { - "neovim/nvim-lspconfig", - opts = { - servers = { - phpactor = {}, - }, - }, - }, - { - "mfussenegger/nvim-dap", - optional = true, - dependencies = { - "williamboman/mason.nvim", - opts = function(_, opts) - if type(opts.ensure_installed) == "table" then - table.insert(opts.ensure_installed, "php-debug-adapter") - end - end, - }, - opts = function() - local dap = require("dap") - local path = require("mason-registry").get_package("php-debug-adapter"):get_install_path() - dap.adapters.php = { - type = "executable", - command = "node", - args = { path .. "/extension/out/phpDebug.js" }, - } - end, - }, -} diff --git a/config/nvim-lazy/lua/plugins/nvim-lspconfig.lua b/config/nvim-lazy/lua/plugins/nvim-lspconfig.lua deleted file mode 100644 index 893b5df..0000000 --- a/config/nvim-lazy/lua/plugins/nvim-lspconfig.lua +++ /dev/null @@ -1,20 +0,0 @@ -return { - "neovim/nvim-lspconfig", - opts = { - servers = { - eslint = {}, - tflint = {}, - }, - setup = { - eslint = function() - require("lazyvim.util.lsp").on_attach(function(client) - if client.name == "eslint" then - client.server_capabilities.documentFormattingProvider = true - elseif client.name == "tsserver" then - client.server_capabilities.documentFormattingProvider = false - end - end) - end, - }, - }, -} diff --git a/config/nvim-lazy/lua/plugins/supertab.lua b/config/nvim-lazy/lua/plugins/supertab.lua deleted file mode 100644 index 59d81d9..0000000 --- a/config/nvim-lazy/lua/plugins/supertab.lua +++ /dev/null @@ -1,53 +0,0 @@ -return { - -- Use for completion and snippets (supertab) - -- first: disable default and behavior in LuaSnip - { - "L3MON4D3/LuaSnip", - keys = function() - return {} - end, - }, - -- then: setup supertab in cmp - { - "hrsh7th/nvim-cmp", - dependencies = { - "hrsh7th/cmp-emoji", - }, - ---@param opts cmp.ConfigSchema - opts = function(_, opts) - local has_words_before = function() - unpack = unpack or table.unpack - local line, col = unpack(vim.api.nvim_win_get_cursor(0)) - return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match("%s") == nil - end - - local luasnip = require("luasnip") - local cmp = require("cmp") - - opts.mapping = vim.tbl_extend("force", opts.mapping, { - [""] = cmp.mapping(function(fallback) - if cmp.visible() then - cmp.select_next_item() - -- You could replace the expand_or_jumpable() calls with expand_or_locally_jumpable() - -- this way you will only jump inside the snippet region - elseif luasnip.expand_or_jumpable() then - luasnip.expand_or_jump() - elseif has_words_before() then - cmp.complete() - else - fallback() - end - end, { "i", "s" }), - [""] = cmp.mapping(function(fallback) - if cmp.visible() then - cmp.select_prev_item() - elseif luasnip.jumpable(-1) then - luasnip.jump(-1) - else - fallback() - end - end, { "i", "s" }), - }) - end, - }, -} diff --git a/config/nvim-lazy/lua/plugins/treesitter.lua b/config/nvim-lazy/lua/plugins/treesitter.lua deleted file mode 100644 index 8bcd4e1..0000000 --- a/config/nvim-lazy/lua/plugins/treesitter.lua +++ /dev/null @@ -1,23 +0,0 @@ -return { - { - "nvim-treesitter/nvim-treesitter", - opts = function(_, opts) - vim.list_extend(opts.ensure_installed, { - "bash", - "html", - "javascript", - "json", - "lua", - "markdown", - "markdown_inline", - "python", - "query", - "regex", - "tsx", - "typescript", - "vim", - "yaml", - }) - end, - }, -} diff --git a/config/nvim-lazy/lua/plugins/ui.lua b/config/nvim-lazy/lua/plugins/ui.lua deleted file mode 100644 index eba6764..0000000 --- a/config/nvim-lazy/lua/plugins/ui.lua +++ /dev/null @@ -1,135 +0,0 @@ --- luacheck: globals vim -return { - -- Neotree configuration - { - "nvim-neo-tree/neo-tree.nvim", - opts = { - filesystem = { - filtered_items = { - always_show = { - ".github", - ".gitignore", - ".editorconfig", - ".python-version", - ".nvmrc", - ".env", - ".env.example", - }, - }, - }, - }, - }, - -- Cloak allows you to overlay *'s over defined patterns in defined files. - -- https://github.com/laytan/cloak.nvim - { "laytan/cloak.nvim" }, - -- Not UFO in the sky, but an ultra fold in Neovim. - -- https://github.com/kevinhwang91/nvim-ufo/ - { - "kevinhwang91/nvim-ufo", - lazy = false, - enabled = true, - dependencies = { - "kevinhwang91/promise-async", - { "nvim-treesitter/nvim-treesitter", run = ":TSUpdate" }, - { - "luukvbaal/statuscol.nvim", - config = function() - local builtin = require("statuscol.builtin") - require("statuscol").setup({ - relculright = true, - segments = { - { text = { builtin.foldfunc }, click = "v:lua.ScFa" }, - { text = { "%s" }, click = "v:lua.ScSa" }, - { text = { builtin.lnumfunc, " " }, click = "v:lua.ScLa" }, - }, - }) - end, - }, - }, - init = function() - vim.o.fillchars = [[eob: ,fold: ,foldopen:,foldsep: ,foldclose:]] - vim.o.foldcolumn = "1" -- '0' is not bad - vim.o.foldlevel = 99 -- Using ufo provider need a large value, feel free to decrease the value - vim.o.foldlevelstart = 99 - vim.o.foldenable = true - end, - opts = { - open_fold_hl_timeout = 150, - close_fold_kinds_for_ft = { "imports", "comment" }, - preview = { - win_config = { - border = { "", "─", "", "", "", "─", "", "" }, - winhighlight = "Normal:Folded", - winblend = 0, - }, - mappings = { - scrollU = "", - scrollD = "", - jumpTop = "[", - jumpBot = "]", - }, - }, - provider_selector = function(_, _, _) -- bufnr, filetype, buftype - return { "treesitter", "indent" } - end, - fold_virt_text_handler = function(virtText, lnum, endLnum, width, truncate) - local newVirtText = {} - local suffix = (" 󰁂 %d "):format(endLnum - lnum) - local sufWidth = vim.fn.strdisplaywidth(suffix) - local targetWidth = width - sufWidth - local curWidth = 0 - for _, chunk in ipairs(virtText) do - local chunkText = chunk[1] - local chunkWidth = vim.fn.strdisplaywidth(chunkText) - if targetWidth > curWidth + chunkWidth then - table.insert(newVirtText, chunk) - else - chunkText = truncate(chunkText, targetWidth - curWidth) - local hlGroup = chunk[2] - table.insert(newVirtText, { chunkText, hlGroup }) - chunkWidth = vim.fn.strdisplaywidth(chunkText) - -- str width returned from truncate() may less than 2nd argument, need padding - if curWidth + chunkWidth < targetWidth then - suffix = suffix .. (" "):rep(targetWidth - curWidth - chunkWidth) - end - break - end - curWidth = curWidth + chunkWidth - end - table.insert(newVirtText, { suffix, "MoreMsg" }) - return newVirtText - end, - }, - }, - -- Indent guides for Neovim - -- https://github.com/lukas-reineke/indent-blankline.nvim - { "lukas-reineke/indent-blankline.nvim" }, - -- Git integration for buffers - -- https://github.com/lewis6991/gitsigns.nvim - { "lewis6991/gitsigns.nvim" }, - -- Close buffer without messing up with the window. - -- https://github.com/famiu/bufdelete.nvim - { "famiu/bufdelete.nvim" }, - -- Neovim plugin for locking a buffer to a window - -- https://github.com/stevearc/stickybuf.nvim - { "stevearc/stickybuf.nvim", opts = {} }, - -- A pretty window for previewing, navigating and editing your LSP locations - -- https://github.com/DNLHC/glance.nvim - { "dnlhc/glance.nvim" }, - -- Automatically expand width of the current window. - -- Maximizes and restore it. And all this with nice animations! - -- https://github.com/anuvyklack/windows.nvim - { - "anuvyklack/windows.nvim", - dependencies = { - "anuvyklack/middleclass", - "anuvyklack/animation.nvim", - }, - config = function() - vim.o.winwidth = 15 - vim.o.winminwidth = 10 - vim.o.equalalways = false - require("windows").setup() - end, - }, -} diff --git a/config/nvim-lazy/spell/en.utf-8.add b/config/nvim-lazy/spell/en.utf-8.add deleted file mode 100644 index 3859461..0000000 --- a/config/nvim-lazy/spell/en.utf-8.add +++ /dev/null @@ -1,3 +0,0 @@ -Plugins -lua -plugins diff --git a/config/nvim-lazy/stylua.toml b/config/nvim-lazy/stylua.toml deleted file mode 100644 index 0f90030..0000000 --- a/config/nvim-lazy/stylua.toml +++ /dev/null @@ -1,3 +0,0 @@ -indent_type = "Spaces" -indent_width = 2 -column_width = 120