From cb64d9e1f2649ffb76e90e1c8c03215ace7f1c7f Mon Sep 17 00:00:00 2001
From: Eric Olerud <eric@olerud.com>
Date: Sun, 30 Mar 2025 23:34:29 -0400
Subject: [PATCH] more cleanup

---
 init.lua              | 90 -------------------------------------------
 lua/lsp/blink.lua     | 40 +++++++++++++++++++
 lua/lsp/fuzzy.lua     | 18 +++++++++
 lua/lsp/godot_dap.lua | 22 +++++++++++
 4 files changed, 80 insertions(+), 90 deletions(-)
 create mode 100644 lua/lsp/blink.lua
 create mode 100644 lua/lsp/fuzzy.lua
 create mode 100644 lua/lsp/godot_dap.lua

diff --git a/init.lua b/init.lua
index 07081d3c..e7eaea9f 100644
--- a/init.lua
+++ b/init.lua
@@ -253,96 +253,6 @@ require('lazy').setup({
     },
   },
 
-  -- NOTE: Plugins can specify dependencies.
-  --
-  -- The dependencies are proper plugin specifications as well - anything
-  -- you do for a plugin at the top level, you can do for a dependency.
-  --
-  -- Use the `dependencies` key to specify the dependencies of a particular plugin
-
-  { -- blink autocompletion
-    'saghen/blink.cmp',
-    dependencies = { 'rafamadriz/friendly-snippets' },
-    version = '*',
-    ---@module 'blink.cmp'
-    ---@type blink.cmp.Config
-    opts = {
-      completion = {
-        list = {
-          selection = {
-            preselect = false,
-          },
-        },
-      },
-      keymap = {
-        preset = 'enter',
-        ['<Tab>'] = { 'select_next', 'fallback' },
-        ['<S-Tab>'] = { 'select_prev', 'fallback' },
-      },
-      appearance = {
-        nerd_font_variant = 'normal',
-      },
-      completion = {
-        documentation = { auto_show = true },
-      },
-      sources = {
-        -- add lazydev to your completion providers
-        default = { 'lazydev', 'lsp', 'path', 'snippets', 'buffer' },
-        providers = {
-          lazydev = {
-            name = 'LazyDev',
-            module = 'lazydev.integrations.blink',
-            -- make lazydev completions top priority (see `:h blink.cmp`)
-            score_offset = 100,
-          },
-        },
-      },
-    },
-    opts_extend = { 'sources.default' },
-  },
-
-  { -- FZF (Telescope replacement)
-    'ibhagwan/fzf-lua',
-    -- optional for icon support
-    dependencies = { 'nvim-tree/nvim-web-devicons' },
-    -- or if using mini.icons/mini.nvim
-    -- dependencies = { 'echasnovski/mini.icons' },
-    opts = {},
-    -- [[ fzf keybinds]]
-    config = function()
-      local fzf = require 'fzf-lua'
-      vim.keymap.set('n', '<leader>sw', fzf.grep_cword, { desc = '[S]earch [W]ord' })
-      vim.keymap.set('n', '<leader>sf', fzf.files, { desc = '[S]earch [F]iles' })
-      vim.keymap.set('n', '<leader>sg', fzf.live_grep, { desc = '[S]earch by [G]rep' })
-      vim.keymap.set('n', '<leader>sg', fzf.live_grep, { desc = '[S]earch by [G]rep' })
-      vim.keymap.set('n', '<leader>sr', fzf.resume, { desc = '[S]earch [R]esume' })
-      vim.keymap.set('n', '<leader>/', fzf.blines, { desc = '[/] Fuzzily search in current buffer' })
-    end,
-  },
-
-  { -- DAP for Godot - https://docs.godotengine.org/en/stable/tutorials/editor/external_editor.html#lsp-dap-support
-    'mfussenegger/nvim-dap',
-    config = function()
-      local dap = require 'dap'
-      dap.adapters.godot = {
-        type = 'server',
-        host = '127.0.0.1',
-        port = 6006,
-      }
-
-      dap.configurations.gdscript = {
-        {
-          launch_game_instance = false,
-          launch_scene = false,
-          name = 'Launch scene',
-          project = '${workspaceFolder}',
-          request = 'launch',
-          type = 'godot',
-        },
-      }
-    end,
-  },
-
   { -- Autoformat
     'stevearc/conform.nvim',
     lazy = false,
diff --git a/lua/lsp/blink.lua b/lua/lsp/blink.lua
new file mode 100644
index 00000000..672ff94c
--- /dev/null
+++ b/lua/lsp/blink.lua
@@ -0,0 +1,40 @@
+return { -- blink autocompletion
+  'saghen/blink.cmp',
+  dependencies = { 'rafamadriz/friendly-snippets' },
+  version = '*',
+  ---@module 'blink.cmp'
+  ---@type blink.cmp.Config
+  opts = {
+    completion = {
+      list = {
+        selection = {
+          preselect = false,
+        },
+      },
+    },
+    keymap = {
+      preset = 'enter',
+      ['<Tab>'] = { 'select_next', 'fallback' },
+      ['<S-Tab>'] = { 'select_prev', 'fallback' },
+    },
+    appearance = {
+      nerd_font_variant = 'normal',
+    },
+    completion = {
+      documentation = { auto_show = true },
+    },
+    sources = {
+      -- add lazydev to your completion providers
+      default = { 'lazydev', 'lsp', 'path', 'snippets', 'buffer' },
+      providers = {
+        lazydev = {
+          name = 'LazyDev',
+          module = 'lazydev.integrations.blink',
+          -- make lazydev completions top priority (see `:h blink.cmp`)
+          score_offset = 100,
+        },
+      },
+    },
+  },
+  opts_extend = { 'sources.default' },
+}
diff --git a/lua/lsp/fuzzy.lua b/lua/lsp/fuzzy.lua
new file mode 100644
index 00000000..c40d50e7
--- /dev/null
+++ b/lua/lsp/fuzzy.lua
@@ -0,0 +1,18 @@
+return { -- FZF (Telescope replacement)
+  'ibhagwan/fzf-lua',
+  -- optional for icon support
+  dependencies = { 'nvim-tree/nvim-web-devicons' },
+  -- or if using mini.icons/mini.nvim
+  -- dependencies = { 'echasnovski/mini.icons' },
+  opts = {},
+  -- [[ fzf keybinds]]
+  config = function()
+    local fzf = require 'fzf-lua'
+    vim.keymap.set('n', '<leader>sw', fzf.grep_cword, { desc = '[S]earch [W]ord' })
+    vim.keymap.set('n', '<leader>sf', fzf.files, { desc = '[S]earch [F]iles' })
+    vim.keymap.set('n', '<leader>sg', fzf.live_grep, { desc = '[S]earch by [G]rep' })
+    vim.keymap.set('n', '<leader>sg', fzf.live_grep, { desc = '[S]earch by [G]rep' })
+    vim.keymap.set('n', '<leader>sr', fzf.resume, { desc = '[S]earch [R]esume' })
+    vim.keymap.set('n', '<leader>/', fzf.blines, { desc = '[/] Fuzzily search in current buffer' })
+  end,
+}
diff --git a/lua/lsp/godot_dap.lua b/lua/lsp/godot_dap.lua
new file mode 100644
index 00000000..3413878e
--- /dev/null
+++ b/lua/lsp/godot_dap.lua
@@ -0,0 +1,22 @@
+return { -- DAP for Godot - https://docs.godotengine.org/en/stable/tutorials/editor/external_editor.html#lsp-dap-support
+  'mfussenegger/nvim-dap',
+  config = function()
+    local dap = require 'dap'
+    dap.adapters.godot = {
+      type = 'server',
+      host = '127.0.0.1',
+      port = 6006,
+    }
+
+    dap.configurations.gdscript = {
+      {
+        launch_game_instance = false,
+        launch_scene = false,
+        name = 'Launch scene',
+        project = '${workspaceFolder}',
+        request = 'launch',
+        type = 'godot',
+      },
+    }
+  end,
+}