diff --git a/nvim/.config/nvim/fnl/dotfiles/plugin/mason.fnl b/nvim/.config/nvim/fnl/dotfiles/plugin/mason.fnl index 37a6949..37d19c1 100644 --- a/nvim/.config/nvim/fnl/dotfiles/plugin/mason.fnl +++ b/nvim/.config/nvim/fnl/dotfiles/plugin/mason.fnl @@ -1,14 +1,14 @@ -(local mason (require :mason)) -(local mason-lspconf (require :mason-lspconfig)) -(local lspconfig (require :dotfiles.plugin.lspconfig)) - -(fn setup [] - (mason.setup {:ui {:icons {:package_installed "✓"}}}) - (when mason-lspconf - (mason-lspconf.setup {:ensure_installed [:lua_ls] :automatic_enable true}) - (lspconfig.setup-handlers (mason-lspconf.get_installed_servers)))) - -(setup) +; (local mason (require :mason)) +; (local mason-lspconf (require :mason-lspconfig)) +; (local lspconfig (require :dotfiles.plugin.lspconfig)) +; +; (fn setup [] +; (mason.setup {:ui {:icons {:package_installed "✓"}}}) +; (when mason-lspconf +; (mason-lspconf.setup {:ensure_installed [:lua_ls] :automatic_enable true}) +; (lspconfig.setup-handlers (mason-lspconf.get_installed_servers)))) +; +; (setup) ;; (mason.setup) ;; ;; (when-let [mason-lspconfig (require :mason-lspconfig)] diff --git a/nvim/.config/nvim/fnl/plugins/lsp.fnl b/nvim/.config/nvim/fnl/plugins/lsp.fnl index 7527339..042d7c4 100644 --- a/nvim/.config/nvim/fnl/plugins/lsp.fnl +++ b/nvim/.config/nvim/fnl/plugins/lsp.fnl @@ -138,7 +138,7 @@ (vim.lsp.enable lsp-lang)) [(tx :folke/lsp-colors.nvim {}) - (tx :williamboman/mason.nvim {:tag :v1.11.0 :opts {}}) + (tx :mason-org/mason.nvim {:opts {:ui {:icons {:package_installed "✓"}}}}) (tx :stevearc/conform.nvim {:dependencies [:rcarriga/nvim-notify] :opts {;;:default_format_opts {:lsp_format :fallback} @@ -190,13 +190,12 @@ (vim.notify (.. "Set vim.g.dotfiles_format_on_save to " (tostring vim.g.dotfiles_format_on_save)))) {:desc "Toggle global formatting"})]}) - (tx :williamboman/mason-lspconfig.nvim - {:tag :v1.32.0 - :dependencies [:williamboman/mason.nvim] - :opts {:ensure_installed lsps :automatic_installation true}}) + (tx :mason-org/mason-lspconfig.nvim + {:dependencies [:mason-org/mason.nvim] + :opts {:ensure_installed lsps}}) (tx :neovim/nvim-lspconfig {:lazy false - :dependencies [:williamboman/mason-lspconfig.nvim + :dependencies [:mason-org/mason-lspconfig.nvim :hrsh7th/cmp-nvim-lsp :stevearc/conform.nvim :Olical/nfnl] @@ -322,13 +321,14 @@ :format)))})) (print "LSP Client Attached.")) - (mlsp.setup_handlers (tx (fn [server-name] - (vim.lsp.config server-name - {:capabilities caps - : on_attach}) - (vim.lsp.enable server-name))))))}) + (each [_ config (pairs (vim.lsp.get_configs {:enabled true}))] + (let [server-name (. config :name)] + (vim.lsp.config server-name + {:capabilities caps + : on_attach}) + (vim.lsp.enable server-name)))))}) (tx :RubixDev/mason-update-all {:cmd :MasonUpdateAll - :dependencies [:williamboman/mason.nvim + :dependencies [:mason-org/mason.nvim :Olical/nfnl] :main :mason-update-all :opts {}})] diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json index 2327233..e67c1ae 100644 --- a/nvim/.config/nvim/lazy-lock.json +++ b/nvim/.config/nvim/lazy-lock.json @@ -12,18 +12,18 @@ "fennel.vim": { "branch": "main", "commit": "0a5c89e7f31d2721a36f7043ee98e24e22e6325e" }, "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" }, "lsp-colors.nvim": { "branch": "main", "commit": "2bbe7541747fd339bdd8923fc45631a09bb4f1e5" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "21c5b3ebeaa0412e28096bb0701434c51c1fbf76" }, "mason-update-all": { "branch": "main", "commit": "332aa2586295f93a32643eb2b580f899458215a1" }, - "mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" }, + "mason.nvim": { "branch": "main", "commit": "2a6940af80375532e5e9e7c1f2fc6319a1b7a69d" }, "neo-tree.nvim": { "branch": "v3.x", "commit": "ebd66767191714e008ce73b769518a763ff31bdc" }, - "neogit": { "branch": "master", "commit": "5d1b65d6215928e941e1a6a4e76e02fd45ada31f" }, + "neogit": { "branch": "master", "commit": "43ea1a0854052e583f647e0b35879f0158a70a78" }, "nfnl": { "branch": "main", "commit": "ac0177c5549df7abba7a19554c18a7765386c894" }, "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, "nvim-autopairs": { "branch": "master", "commit": "7b9923abad60b903ece7c52940e1321d39eccc79" }, "nvim-cmp": { "branch": "main", "commit": "a1d504892f2bc56c2e79b65c6faded2fd21f3eca" }, - "nvim-dap": { "branch": "master", "commit": "531771530d4f82ad2d21e436e3cc052d68d7aebb" }, + "nvim-dap": { "branch": "master", "commit": "9e848e09a697ee95302a3ef2dd43fd6eb709e570" }, "nvim-dap-ui": { "branch": "master", "commit": "1a66cabaa4a4da0be107d5eda6d57242f0fe7e49" }, - "nvim-lspconfig": { "branch": "master", "commit": "a683e0ddf0cf64c6cd689e18ffb480ade3c162b7" }, + "nvim-lspconfig": { "branch": "master", "commit": "bfcc0171a43f22afa61d927ffe9fcb6cb85dc99e" }, "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" }, "nvim-notify": { "branch": "master", "commit": "8701bece920b38ea289b457f902e2ad184131a5d" }, "nvim-treesitter": { "branch": "main", "commit": "4916d6592ede8c07973490d9322f187e07dfefac" }, @@ -32,7 +32,7 @@ "plenary.nvim": { "branch": "master", "commit": "74b06c6c75e4eeb3108ec01852001636d85a932b" }, "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" }, "rainbow-delimiters.nvim": { "branch": "master", "commit": "a798325b7f36acc62741d1029930a7b96d4dd4bf" }, - "smart-splits.nvim": { "branch": "master", "commit": "2aad9808f289f5d65cfa77840a04b8590e5e34e9" }, + "smart-splits.nvim": { "branch": "master", "commit": "c02d70257e5d6065d4154acd596ec8054a725724" }, "telescope.nvim": { "branch": "master", "commit": "5255aa27c422de944791318024167ad5d40aad20" }, "todo-comments.nvim": { "branch": "main", "commit": "31e3c38ce9b29781e4422fc0322eb0a21f4e8668" }, "toggleterm.nvim": { "branch": "main", "commit": "9a88eae817ef395952e08650b3283726786fb5fb" }, diff --git a/nvim/.config/nvim/lua/dotfiles/plugin/mason.lua b/nvim/.config/nvim/lua/dotfiles/plugin/mason.lua index 4b5001d..ae13548 100644 --- a/nvim/.config/nvim/lua/dotfiles/plugin/mason.lua +++ b/nvim/.config/nvim/lua/dotfiles/plugin/mason.lua @@ -1,14 +1,2 @@ -- [nfnl] fnl/dotfiles/plugin/mason.fnl -local mason = require("mason") -local mason_lspconf = require("mason-lspconfig") -local lspconfig = require("dotfiles.plugin.lspconfig") -local function setup() - mason.setup({ui = {icons = {package_installed = "\226\156\147"}}}) - if mason_lspconf then - mason_lspconf.setup({ensure_installed = {"lua_ls"}, automatic_enable = true}) - return lspconfig["setup-handlers"](mason_lspconf.get_installed_servers()) - else - return nil - end -end -return setup() + diff --git a/nvim/.config/nvim/lua/plugins/lsp.lua b/nvim/.config/nvim/lua/plugins/lsp.lua index f4282b4..0a8265c 100644 --- a/nvim/.config/nvim/lua/plugins/lsp.lua +++ b/nvim/.config/nvim/lua/plugins/lsp.lua @@ -196,16 +196,17 @@ local function _23_() end return print("LSP Client Attached.") end - local function _34_(server_name) + for _, config in pairs(vim.lsp.get_configs({enabled = true})) do + local server_name = config.name vim.lsp.config(server_name, {capabilities = caps, on_attach = on_attach}) - return vim.lsp.enable(server_name) + vim.lsp.enable(server_name) end - return mlsp.setup_handlers({_34_}) + return nil end -local function _35_() +local function _34_() return vim.lsp.buf.code_action() end -local function _36_() +local function _35_() return require("conform").format() end -return {{"folke/lsp-colors.nvim"}, {"williamboman/mason.nvim", opts = {}, tag = "v1.11.0"}, {"stevearc/conform.nvim", config = _14_, dependencies = {"rcarriga/nvim-notify"}, keys = {{"tbf", _18_, desc = "Toggle buffer formatting"}, {"tgf", _20_, desc = "Toggle global formatting"}}, opts = {formatters_by_ft = filetype__3eformatters, format_on_save = _21_}}, {"williamboman/mason-lspconfig.nvim", dependencies = {"williamboman/mason.nvim"}, opts = {ensure_installed = lsps, automatic_installation = true}, tag = "v1.32.0"}, {"neovim/nvim-lspconfig", config = _23_, dependencies = {"williamboman/mason-lspconfig.nvim", "hrsh7th/cmp-nvim-lsp", "stevearc/conform.nvim", "Olical/nfnl"}, keys = {{"ca", _35_, desc = "Invoke code_action, prompting for an action to take at the cursor"}, {"fa", _36_, desc = "LSP format"}, {"rn", vim.lsp.buf.rename, desc = "LSP rename"}, {"gd", vim.lsp.buf.definition, desc = "Go to Definition"}, {"gD", vim.lsp.buf.declaration, desc = "Go to Declaration"}, {"gi", vim.lsp.buf.implementation, desc = "Go to Implementation"}, {"gr", vim.lsp.buf.references, desc = "Show References"}, {"K", vim.lsp.buf.hover, desc = "LSP Hover"}, {"[g", vim.lsp.diagnostic.goto_prev, desc = "Previous Diagnostic"}, {"]g", vim.lsp.diagnostic.goto_next, desc = "Next Diagnostic"}, {"", vim.lsp.buf.signature_help, desc = "Signature Help"}}, lazy = false}, {"RubixDev/mason-update-all", cmd = "MasonUpdateAll", dependencies = {"williamboman/mason.nvim", "Olical/nfnl"}, main = "mason-update-all", opts = {}}} +return {{"folke/lsp-colors.nvim"}, {"mason-org/mason.nvim", opts = {ui = {icons = {package_installed = "\226\156\147"}}}}, {"stevearc/conform.nvim", config = _14_, dependencies = {"rcarriga/nvim-notify"}, keys = {{"tbf", _18_, desc = "Toggle buffer formatting"}, {"tgf", _20_, desc = "Toggle global formatting"}}, opts = {formatters_by_ft = filetype__3eformatters, format_on_save = _21_}}, {"mason-org/mason-lspconfig.nvim", dependencies = {"mason-org/mason.nvim"}, opts = {ensure_installed = lsps}}, {"neovim/nvim-lspconfig", config = _23_, dependencies = {"mason-org/mason-lspconfig.nvim", "hrsh7th/cmp-nvim-lsp", "stevearc/conform.nvim", "Olical/nfnl"}, keys = {{"ca", _34_, desc = "Invoke code_action, prompting for an action to take at the cursor"}, {"fa", _35_, desc = "LSP format"}, {"rn", vim.lsp.buf.rename, desc = "LSP rename"}, {"gd", vim.lsp.buf.definition, desc = "Go to Definition"}, {"gD", vim.lsp.buf.declaration, desc = "Go to Declaration"}, {"gi", vim.lsp.buf.implementation, desc = "Go to Implementation"}, {"gr", vim.lsp.buf.references, desc = "Show References"}, {"K", vim.lsp.buf.hover, desc = "LSP Hover"}, {"[g", vim.lsp.diagnostic.goto_prev, desc = "Previous Diagnostic"}, {"]g", vim.lsp.diagnostic.goto_next, desc = "Next Diagnostic"}, {"", vim.lsp.buf.signature_help, desc = "Signature Help"}}, lazy = false}, {"RubixDev/mason-update-all", cmd = "MasonUpdateAll", dependencies = {"mason-org/mason.nvim", "Olical/nfnl"}, main = "mason-update-all", opts = {}}} diff --git a/nvim/.config/nvim/lua/plugins/mason.lua b/nvim/.config/nvim/lua/plugins/mason.lua new file mode 100644 index 0000000..7e3bf96 --- /dev/null +++ b/nvim/.config/nvim/lua/plugins/mason.lua @@ -0,0 +1,2 @@ +-- [nfnl] fnl/plugins/mason.fnl +return {"mason-org/mason.nvim", opts = {ui = {icons = {package_installed = "\226\156\147"}}}}