2 files changed, 47 insertions, 44 deletions

diff --git a/dotfiles/vim/lua/myConfig/exports.lua b/dotfiles/vim/lua/myConfig/exports.lua
new file mode 100644
index 0000000..f6eb1ce
--- /dev/null
+++ b/dotfiles/vim/lua/myConfig/exports.lua
@@ -0,0 +1,46 @@
+local M = {}
+
+function M.on_attach(client, bufnr)
+        local opts = { noremap = true, silent = true, buffer = bufnr }
+
+        local telescope_builtin = require "telescope.builtin"
+
+        local function desc(tbl1, description)
+                return vim.tbl_extend("force", tbl1, { desc = description })
+        end
+
+        vim.keymap.set("n", "gD", vim.lsp.buf.declaration, desc(opts, "LSP declaration"))
+        vim.keymap.set("n", "gd", telescope_builtin.lsp_definitions, desc(opts, "LSP Definitions"))
+        vim.keymap.set("n", "K", vim.lsp.buf.hover, desc(opts, "LSP Hover"))
+
+        vim.keymap.set({"n", "v"}, "gr", telescope_builtin.lsp_references, desc(opts, "LSP References"))
+
+        vim.keymap.set({"n", "v"}, "<leader>sa", vim.lsp.buf.code_action, desc(opts, "LSP Code Actions"))
+        vim.keymap.set("n", "<leader>se", vim.diagnostic.open_float, desc(opts, "Local Diagnostics"))
+        vim.keymap.set("n", "<leader>sE", telescope_builtin.diagnostics, desc(opts, "Global Diagnostics"))
+        vim.keymap.set("n", "<leader>sl", vim.diagnostic.setloclist, desc(opts, "Diagnostics set LocList"))
+        vim.keymap.set("n", "<leader>sq", vim.diagnostic.setqflist, desc(opts, "Diagnostics set QFList"))
+        vim.keymap.set("n", "<leader>sr", vim.lsp.buf.rename, desc(opts, "LSP Rename"))
+        vim.keymap.set("n", "<leader>ss", telescope_builtin.lsp_document_symbols, desc(opts, "LSP Document Symbols"))
+        vim.keymap.set("n", "<leader>sS", telescope_builtin.lsp_workspace_symbols, desc(opts, "LSP Workspace Symbols"))
+
+        vim.keymap.set("n", "[d", vim.diagnostic.goto_prev, desc(opts, "Goto Next Diagnostic"))
+        vim.keymap.set("n", "]d", vim.diagnostic.goto_next, desc(opts, "Goto Prev Diagnostic"))
+
+        -- Capability specific
+
+        if client.server_capabilities.documentFormattingProvider then
+                vim.keymap.set({"n", "v"}, "<leader>sf", vim.lsp.buf.format, desc(opts, "Format buffer"))
+        end
+
+        -- Rust specific
+        vim.keymap.set("n", "<leader>sh", "<cmd>RustToggleInlayHints<CR>", opts)
+
+        require("lsp_signature").on_attach {
+                hint_prefix = "param: ",
+        }
+end
+
+M.capabilities = require("cmp_nvim_lsp").default_capabilities()
+
+return M
diff --git a/dotfiles/vim/lua/vim-dev.lua b/dotfiles/vim/lua/vim-dev.lua
index a823835..00fba3e 100644
--- a/dotfiles/vim/lua/vim-dev.lua
+++ b/dotfiles/vim/lua/vim-dev.lua
@@ -1,47 +1,4 @@
-local lspconfig = require "lspconfig"
-
-local function on_attach(client, bufnr)
-        local opts = { noremap = true, silent = true, buffer = bufnr }
-
-        local telescope_builtin = require "telescope.builtin"
-
-        local function desc(tbl1, description)
-                return vim.tbl_extend("force", tbl1, { desc = description })
-        end
-
-        vim.keymap.set("n", "gD", vim.lsp.buf.declaration, desc(opts, "LSP declaration"))
-        vim.keymap.set("n", "gd", telescope_builtin.lsp_definitions, desc(opts, "LSP Definitions"))
-        vim.keymap.set("n", "K", vim.lsp.buf.hover, desc(opts, "LSP Hover"))
-
-        vim.keymap.set({"n", "v"}, "gr", telescope_builtin.lsp_references, desc(opts, "LSP References"))
-
-        vim.keymap.set({"n", "v"}, "<leader>sa", vim.lsp.buf.code_action, desc(opts, "LSP Code Actions"))
-        vim.keymap.set("n", "<leader>se", vim.diagnostic.open_float, desc(opts, "Local Diagnostics"))
-        vim.keymap.set("n", "<leader>sE", telescope_builtin.diagnostics, desc(opts, "Global Diagnostics"))
-        vim.keymap.set("n", "<leader>sl", vim.diagnostic.setloclist, desc(opts, "Diagnostics set LocList"))
-        vim.keymap.set("n", "<leader>sq", vim.diagnostic.setqflist, desc(opts, "Diagnostics set QFList"))
-        vim.keymap.set("n", "<leader>sr", vim.lsp.buf.rename, desc(opts, "LSP Rename"))
-        vim.keymap.set("n", "<leader>ss", telescope_builtin.lsp_document_symbols, desc(opts, "LSP Document Symbols"))
-        vim.keymap.set("n", "<leader>sS", telescope_builtin.lsp_workspace_symbols, desc(opts, "LSP Workspace Symbols"))
-
-        vim.keymap.set("n", "[d", vim.diagnostic.goto_prev, desc(opts, "Goto Next Diagnostic"))
-        vim.keymap.set("n", "]d", vim.diagnostic.goto_next, desc(opts, "Goto Prev Diagnostic"))
-
-        -- Capability specific
-
-        if client.server_capabilities.documentFormattingProvider then
-                vim.keymap.set({"n", "v"}, "<leader>sf", vim.lsp.buf.format, desc(opts, "Format buffer"))
-        end
-
-        -- Rust specific
-        vim.keymap.set("n", "<leader>sh", "<cmd>RustToggleInlayHints<CR>", opts)
-
-        require("lsp_signature").on_attach {
-                hint_prefix = "param: ",
-        }
-end
-
-local capabilities = require("cmp_nvim_lsp").default_capabilities()
+local on_attach = require('myConfig.exports').on_attach
 
 require("rust-tools").setup {
         server = {