Bladeren bron

chore: move plugins to an upper level

Mariano Z. 1 jaar geleden
bovenliggende
commit
99bcb4ca97
50 gewijzigde bestanden met toevoegingen van 69 en 69 verwijderingen
  1. 1 1
      lua/config/lazy.lua
  2. 0 53
      lua/config/plugins/fold.lua
  3. 0 11
      lua/config/plugins/ui/init.lua
  4. 0 0
      lua/plugins/ai.lua
  5. 0 0
      lua/plugins/blankline.lua
  6. 0 0
      lua/plugins/chezmoi.lua
  7. 0 0
      lua/plugins/colorizer.lua
  8. 0 0
      lua/plugins/comments.lua
  9. 0 0
      lua/plugins/completion.lua
  10. 0 0
      lua/plugins/db.lua
  11. 0 0
      lua/plugins/diagnostics.lua
  12. 0 0
      lua/plugins/env.lua
  13. 0 0
      lua/plugins/flash.lua
  14. 53 0
      lua/plugins/fold.lua
  15. 0 0
      lua/plugins/format.lua
  16. 0 0
      lua/plugins/fzf.lua
  17. 0 0
      lua/plugins/git.lua
  18. 0 0
      lua/plugins/harpoon.lua
  19. 0 0
      lua/plugins/lastplace.lua
  20. 0 0
      lua/plugins/lint.lua
  21. 0 0
      lua/plugins/lsp/extras/gopher.lua
  22. 0 0
      lua/plugins/lsp/extras/lazydev.lua
  23. 0 0
      lua/plugins/lsp/extras/typescript.lua
  24. 4 4
      lua/plugins/lsp/init.lua
  25. 0 0
      lua/plugins/lsp/servers/gopls.lua
  26. 0 0
      lua/plugins/lsp/servers/html.lua
  27. 0 0
      lua/plugins/lsp/servers/htmx.lua
  28. 0 0
      lua/plugins/lsp/servers/jsonls.lua
  29. 0 0
      lua/plugins/lsp/servers/lua_ls.lua
  30. 0 0
      lua/plugins/lsp/servers/omnisharp.lua
  31. 0 0
      lua/plugins/lsp/servers/yamlls.lua
  32. 0 0
      lua/plugins/markdown.lua
  33. 0 0
      lua/plugins/mini.lua
  34. 0 0
      lua/plugins/navic.lua
  35. 0 0
      lua/plugins/oil.lua
  36. 0 0
      lua/plugins/schema.lua
  37. 0 0
      lua/plugins/snips.lua
  38. 0 0
      lua/plugins/spectre.lua
  39. 0 0
      lua/plugins/sudo.lua
  40. 0 0
      lua/plugins/tpope.lua
  41. 0 0
      lua/plugins/treesitter.lua
  42. 0 0
      lua/plugins/ui/alpha.lua
  43. 0 0
      lua/plugins/ui/colors.lua
  44. 0 0
      lua/plugins/ui/dressing.lua
  45. 11 0
      lua/plugins/ui/init.lua
  46. 0 0
      lua/plugins/ui/noice.lua
  47. 0 0
      lua/plugins/ui/scroll.lua
  48. 0 0
      lua/plugins/ui/status.lua
  49. 0 0
      lua/plugins/ui/whichkey.lua
  50. 0 0
      lua/plugins/undo.lua

+ 1 - 1
lua/config/lazy.lua

@@ -23,7 +23,7 @@ vim.opt.rtp:prepend(lazypath)
 
 require("lazy").setup({
   spec = {
-    { import = "config.plugins" },
+    { import = "plugins" },
   },
   performance = {
     rtp = {

+ 0 - 53
lua/config/plugins/fold.lua

@@ -1,53 +0,0 @@
-return {
-  "bbjornstad/pretty-fold.nvim",
-  enabled = true,
-  config = function()
-    local global_setup = {
-      sections = {
-        left = { "content" },
-        right = {
-          " ",
-          function()
-            return ("[%dL]"):format(vim.v.foldend - vim.v.foldstart)
-          end,
-          "[",
-          "percentage",
-          "]",
-        },
-      },
-      matchup_patterns = {
-        { "{", "}" },
-        { "%(", ")" }, -- % to escape lua pattern char
-        { "%[", "]" }, -- % to escape lua pattern char
-      },
-      -- add_close_pattern = true,
-      process_comment_signs = ({ "delete", "spaces", false })[2],
-    }
-
-    local function ft_setup(lang, options) -- {{{
-      local opts = vim.tbl_deep_extend("force", global_setup, options)
-      -- combine global and ft specific matchup_patterns
-      if opts and opts.matchup_patterns and global_setup.matchup_patterns then
-        opts.matchup_patterns = vim.list_extend(opts.matchup_patterns, global_setup.matchup_patterns)
-      end
-      require("pretty-fold").ft_setup(lang, opts)
-    end -- }}}
-
-    require("pretty-fold").setup(global_setup)
-
-    ft_setup("lua", { -- {{{
-      matchup_patterns = {
-        { "^%s*do$", "end" }, -- do ... end blocks
-        { "^%s*if", "end" }, -- if ... end
-        { "^%s*for", "end" }, -- for
-        { "function[^%(]*%(", "end" }, -- 'function( or 'function (''
-      },
-    }) -- }}}
-
-    ft_setup("vim", { -- {{{
-      matchup_patterns = {
-        { "^%s*function!?[^%(]*%(", "endfunction" },
-      },
-    }) -- }}}
-  end,
-}

+ 0 - 11
lua/config/plugins/ui/init.lua

@@ -1,11 +0,0 @@
-local M = {
-  require("config.plugins.ui.colors"),
-  require("config.plugins.ui.alpha"),
-  require("config.plugins.ui.dressing"),
-  require("config.plugins.ui.whichkey"),
-  require("config.plugins.ui.noice"),
-  require("config.plugins.ui.scroll"),
-  require("config.plugins.ui.status"),
-}
-
-return M

+ 0 - 0
lua/config/plugins/ai.lua → lua/plugins/ai.lua


+ 0 - 0
lua/config/plugins/blankline.lua → lua/plugins/blankline.lua


+ 0 - 0
lua/config/plugins/chezmoi.lua → lua/plugins/chezmoi.lua


+ 0 - 0
lua/config/plugins/colorizer.lua → lua/plugins/colorizer.lua


+ 0 - 0
lua/config/plugins/comments.lua → lua/plugins/comments.lua


+ 0 - 0
lua/config/plugins/completion.lua → lua/plugins/completion.lua


+ 0 - 0
lua/config/plugins/db.lua → lua/plugins/db.lua


+ 0 - 0
lua/config/plugins/diagnostics.lua → lua/plugins/diagnostics.lua


+ 0 - 0
lua/config/plugins/env.lua → lua/plugins/env.lua


+ 0 - 0
lua/config/plugins/flash.lua → lua/plugins/flash.lua


+ 53 - 0
lua/plugins/fold.lua

@@ -0,0 +1,53 @@
+local M = {
+  "bbjornstad/pretty-fold.nvim",
+}
+
+M.config = function()
+  local global_setup = {
+    sections = {
+      left = { "content" },
+      right = {
+        " ",
+        function()
+          return ("[%dL]"):format(vim.v.foldend - vim.v.foldstart)
+        end,
+        "[",
+        "percentage",
+        "]",
+      },
+    },
+    matchup_patterns = {
+      { "{", "}" },
+      { "%(", ")" },
+      { "%[", "]" },
+    },
+    process_comment_signs = ({ "delete", "spaces", false })[2],
+  }
+
+  local function ft_setup(lang, options) -- {{{
+    local opts = vim.tbl_deep_extend("force", global_setup, options)
+    if opts and opts.matchup_patterns and global_setup.matchup_patterns then
+      opts.matchup_patterns = vim.list_extend(opts.matchup_patterns, global_setup.matchup_patterns)
+    end
+    require("pretty-fold").ft_setup(lang, opts)
+  end -- }}}
+
+  require("pretty-fold").setup(global_setup)
+
+  ft_setup("lua", {
+    matchup_patterns = {
+      { "^%s*do$", "end" },
+      { "^%s*if", "end" },
+      { "^%s*for", "end" },
+      { "function[^%(]*%(", "end" },
+    },
+  })
+
+  ft_setup("vim", {
+    matchup_patterns = {
+      { "^%s*function!?[^%(]*%(", "endfunction" },
+    },
+  })
+end
+
+return M

+ 0 - 0
lua/config/plugins/format.lua → lua/plugins/format.lua


+ 0 - 0
lua/config/plugins/fzf.lua → lua/plugins/fzf.lua


+ 0 - 0
lua/config/plugins/git.lua → lua/plugins/git.lua


+ 0 - 0
lua/config/plugins/harpoon.lua → lua/plugins/harpoon.lua


+ 0 - 0
lua/config/plugins/lastplace.lua → lua/plugins/lastplace.lua


+ 0 - 0
lua/config/plugins/lint.lua → lua/plugins/lint.lua


+ 0 - 0
lua/config/plugins/lsp/extras/gopher.lua → lua/plugins/lsp/extras/gopher.lua


+ 0 - 0
lua/config/plugins/lsp/extras/lazydev.lua → lua/plugins/lsp/extras/lazydev.lua


+ 0 - 0
lua/config/plugins/lsp/extras/typescript.lua → lua/plugins/lsp/extras/typescript.lua


+ 4 - 4
lua/config/plugins/lsp/init.lua → lua/plugins/lsp/init.lua

@@ -4,9 +4,9 @@ local M = {
     "saghen/blink.cmp",
     "williamboman/mason.nvim",
     "williamboman/mason-lspconfig.nvim",
-    require("config.plugins.lsp.extras.lazydev"),
-    require("config.plugins.lsp.extras.gopher"),
-    require("config.plugins.lsp.extras.typescript"),
+    require("plugins.lsp.extras.lazydev"),
+    require("plugins.lsp.extras.gopher"),
+    require("plugins.lsp.extras.typescript"),
   },
 }
 
@@ -124,7 +124,7 @@ function M.config()
         }
 
         -- Try to load server-specific configuration
-        local ok, server_opts = pcall(require, "config.plugins.lsp.servers." .. server_name)
+        local ok, server_opts = pcall(require, "plugins.lsp.servers." .. server_name)
         if ok then
           base_opts = vim.tbl_deep_extend("force", base_opts, server_opts)
         end

+ 0 - 0
lua/config/plugins/lsp/servers/gopls.lua → lua/plugins/lsp/servers/gopls.lua


+ 0 - 0
lua/config/plugins/lsp/servers/html.lua → lua/plugins/lsp/servers/html.lua


+ 0 - 0
lua/config/plugins/lsp/servers/htmx.lua → lua/plugins/lsp/servers/htmx.lua


+ 0 - 0
lua/config/plugins/lsp/servers/jsonls.lua → lua/plugins/lsp/servers/jsonls.lua


+ 0 - 0
lua/config/plugins/lsp/servers/lua_ls.lua → lua/plugins/lsp/servers/lua_ls.lua


+ 0 - 0
lua/config/plugins/lsp/servers/omnisharp.lua → lua/plugins/lsp/servers/omnisharp.lua


+ 0 - 0
lua/config/plugins/lsp/servers/yamlls.lua → lua/plugins/lsp/servers/yamlls.lua


+ 0 - 0
lua/config/plugins/markdown.lua → lua/plugins/markdown.lua


+ 0 - 0
lua/config/plugins/mini.lua → lua/plugins/mini.lua


+ 0 - 0
lua/config/plugins/navic.lua → lua/plugins/navic.lua


+ 0 - 0
lua/config/plugins/oil.lua → lua/plugins/oil.lua


+ 0 - 0
lua/config/plugins/schema.lua → lua/plugins/schema.lua


+ 0 - 0
lua/config/plugins/snips.lua → lua/plugins/snips.lua


+ 0 - 0
lua/config/plugins/spectre.lua → lua/plugins/spectre.lua


+ 0 - 0
lua/config/plugins/sudo.lua → lua/plugins/sudo.lua


+ 0 - 0
lua/config/plugins/tpope.lua → lua/plugins/tpope.lua


+ 0 - 0
lua/config/plugins/treesitter.lua → lua/plugins/treesitter.lua


+ 0 - 0
lua/config/plugins/ui/alpha.lua → lua/plugins/ui/alpha.lua


+ 0 - 0
lua/config/plugins/ui/colors.lua → lua/plugins/ui/colors.lua


+ 0 - 0
lua/config/plugins/ui/dressing.lua → lua/plugins/ui/dressing.lua


+ 11 - 0
lua/plugins/ui/init.lua

@@ -0,0 +1,11 @@
+local M = {
+  require("plugins.ui.colors"),
+  require("plugins.ui.alpha"),
+  require("plugins.ui.dressing"),
+  require("plugins.ui.whichkey"),
+  require("plugins.ui.noice"),
+  require("plugins.ui.scroll"),
+  require("plugins.ui.status"),
+}
+
+return M

+ 0 - 0
lua/config/plugins/ui/noice.lua → lua/plugins/ui/noice.lua


+ 0 - 0
lua/config/plugins/ui/scroll.lua → lua/plugins/ui/scroll.lua


+ 0 - 0
lua/config/plugins/ui/status.lua → lua/plugins/ui/status.lua


+ 0 - 0
lua/config/plugins/ui/whichkey.lua → lua/plugins/ui/whichkey.lua


+ 0 - 0
lua/config/plugins/undo.lua → lua/plugins/undo.lua