diff options
| -rw-r--r-- | fnl/plugins/core/lazy.fnl | 3 | ||||
| -rw-r--r-- | fnl/plugins/lsp/lspconfig.fnl | 19 | ||||
| -rw-r--r-- | fnl/plugins/lsp/mason.fnl | 3 | ||||
| -rw-r--r-- | lazy-lock.json | 26 |
4 files changed, 27 insertions, 24 deletions
diff --git a/fnl/plugins/core/lazy.fnl b/fnl/plugins/core/lazy.fnl index 5e5a98e..8c86de4 100644 --- a/fnl/plugins/core/lazy.fnl +++ b/fnl/plugins/core/lazy.fnl @@ -9,7 +9,8 @@ :tohtml :tutor :zipPlugin]}} - :ui {:icons {:cmd " " + :ui {:border :single + :icons {:cmd " " :config " " :event " " :ft " " diff --git a/fnl/plugins/lsp/lspconfig.fnl b/fnl/plugins/lsp/lspconfig.fnl index b2ee792..fc25a04 100644 --- a/fnl/plugins/lsp/lspconfig.fnl +++ b/fnl/plugins/lsp/lspconfig.fnl @@ -1,27 +1,28 @@ ;; Setup of lsps. (fn on-attach [] - (vim.api.nvim_create_autocmd :LspAttach - {:callback (fn [args] - (let [keymaps (require :plugins.lsp.keymaps) - bufnr (. args :buf)] - (keymaps.on-attach bufnr)))})) + (vim.api.nvim_create_autocmd :LspAttach + {:callback (fn [args] + (let [keymaps (require :plugins.lsp.keymaps) + bufnr (. args :buf)] + (keymaps.on-attach bufnr)))})) (fn capabilities [] - (let [cmp-lsp (require :cmp_nvim_lsp)] - (cmp-lsp.default_capabilities (vim.lsp.protocol.make_client_capabilities)))) + (let [cmp-lsp (require :cmp_nvim_lsp)] + (cmp-lsp.default_capabilities (vim.lsp.protocol.make_client_capabilities)))) (fn mason-opts [servers] - {:ensure_installed (vim.tbl_keys servers) :automatic_installation true}) + {:ensure_installed (vim.tbl_keys servers) :automatic_installation true}) (fn setup [] - (let [diagnostics (require :plugins.lsp.diagnostics) lspconfig (require :lspconfig) + lspconfig-win (require :lspconfig.ui.windows) mason-lspconfig (require :mason-lspconfig) servers (require :plugins.lsp.servers)] (diagnostics.setup) (on-attach) + (set lspconfig-win.default_options.border :single) (mason-lspconfig.setup (mason-opts servers)) (mason-lspconfig.setup_handlers [(fn [server-name] (let [server-config (. lspconfig diff --git a/fnl/plugins/lsp/mason.fnl b/fnl/plugins/lsp/mason.fnl index bf57de5..bc63e23 100644 --- a/fnl/plugins/lsp/mason.fnl +++ b/fnl/plugins/lsp/mason.fnl @@ -1,6 +1,7 @@ ;; Mason manages external tooling, e.g. lsp, formatters, and linters. -(local opts {:ui {:icons {:package_installed " " +(local opts {:ui {:border :single + :icons {:package_installed " " :package_pending " " :package_uninstalled " "}} :max_concurrent_installers 10}) diff --git a/lazy-lock.json b/lazy-lock.json index c18af09..d5352e6 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,11 +1,11 @@ { - "Comment.nvim": { "branch": "master", "commit": "418d3117dab2f54c4340ea73e0070dd78fc81753" }, + "Comment.nvim": { "branch": "master", "commit": "6821b3ae27a57f1f3cf8ed030e4a55d70d0c4e43" }, "LuaSnip": { "branch": "master", "commit": "58fbfc627a93281a77f7d161d4ff702e639677b1" }, "SchemaStore.nvim": { "branch": "main", "commit": "a4798a9fb5fd3ac8e132065597b397cab347d3ca" }, - "alpha-nvim": { "branch": "main", "commit": "d35b99e36e32040ba06c48a25b5bd3e75be2a566" }, + "alpha-nvim": { "branch": "main", "commit": "b3eef69e95674905bf26c7740dd4bbb09b355494" }, "better-escape.nvim": { "branch": "master", "commit": "5cd64c0afb82688748d415710d0187df5bdb96f9" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, - "cmp-cmdline": { "branch": "main", "commit": "23c51b2a3c00f6abc4e922dbd7c3b9aca6992063" }, + "cmp-cmdline": { "branch": "main", "commit": "8fcc934a52af96120fe26358985c10c035984b53" }, "cmp-nvim-lsp": { "branch": "main", "commit": "0e6b2ed705ddcff9738ec4ea838141654f12eeef" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp-spell": { "branch": "master", "commit": "60584cb75e5e8bba5a0c9e4c3ab0791e0698bffa" }, @@ -14,31 +14,31 @@ "diffview.nvim": { "branch": "main", "commit": "11827d46e939b4748dbdb7e0df4982a63bd59d26" }, "flit.nvim": { "branch": "main", "commit": "980e80e8fe44caaeb9de501c8e97a559b17db2f4" }, "friendly-snippets": { "branch": "main", "commit": "1645e7cd98ed99e766c84ab3cf13a1612c77dcee" }, - "gitsigns.nvim": { "branch": "main", "commit": "5f1451ea7d9a9005b3f0bedeab20cef7a4c65993" }, + "gitsigns.nvim": { "branch": "main", "commit": "f388995990aba04cfdc7c3ab870c33e280601109" }, "harpoon": { "branch": "master", "commit": "8c0bb0a328e57278f4783bb0e2ea32f296d36db1" }, "hotpot.nvim": { "branch": "master", "commit": "9fd5d6e341861c776ec9c69a2fc524deae67b541" }, - "lazy.nvim": { "branch": "main", "commit": "e916f41df26e33b01f1b3ebe28881090da3a7281" }, + "lazy.nvim": { "branch": "main", "commit": "8186cc5db31bd5968b5be838a30c4cf1465cb3f9" }, "leap.nvim": { "branch": "main", "commit": "a2e57b7f8cfd01bb8bfb5abadf5e99acb9559700" }, "lir.nvim": { "branch": "master", "commit": "248f6b1da1f597e51513dd970672c7e57253f92a" }, "lspkind-nvim": { "branch": "master", "commit": "c68b3a003483cf382428a43035079f78474cd11e" }, "lualine-lsp-progress": { "branch": "master", "commit": "56842d097245a08d77912edf5f2a69ba29f275d7" }, "lualine.nvim": { "branch": "master", "commit": "e99d733e0213ceb8f548ae6551b04ae32e590c80" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "93e58e100f37ef4fb0f897deeed20599dae9d128" }, - "mason-null-ls.nvim": { "branch": "main", "commit": "9ad7503c32545ee6e8000e52d9ae4a93d49231fb" }, - "mason.nvim": { "branch": "main", "commit": "28b27ad71c8aba165d81853981655b087794f4ce" }, + "mason-null-ls.nvim": { "branch": "main", "commit": "3a588ae89981ae67ae2704f2f22d5ca6bba52f07" }, + "mason.nvim": { "branch": "main", "commit": "511457c94cc47e5edbc82cf35469dcd09d56856f" }, "minibar.nvim": { "branch": "master", "commit": "353ca4efaf7fff1566bb02e0d7cb51133c41f660" }, "neogit": { "branch": "master", "commit": "089d388876a535032ac6a3f80e19420f09e4ddda" }, - "no-clown-fiesta.nvim": { "branch": "master", "commit": "dd85efc80d0ff2e3d256daa49cd82a7bdd3fdc72" }, - "null-ls.nvim": { "branch": "main", "commit": "a75bba0ae5e89df03f01c17a1d913884eeebcc2e" }, + "no-clown-fiesta.nvim": { "branch": "master", "commit": "c2f222643b83eb27331bc99f3cb4b3e6dbffb6e5" }, + "null-ls.nvim": { "branch": "main", "commit": "a82aa08c0063843926947f3688b0e61fd71db680" }, "nvim-autopairs": { "branch": "master", "commit": "45ae3122a4c7744db41298b41f9f5a3f092123e6" }, "nvim-bqf": { "branch": "main", "commit": "7a278012efb0a12bc49ecc3e16ec5591c41fae88" }, - "nvim-bufdel": { "branch": "main", "commit": "a60b3531e5bd56f8602acb4ba7f5b2eeb782d54b" }, - "nvim-cmp": { "branch": "main", "commit": "208d69f233d65526a22c6497ed57d0c80d99fa5f" }, + "nvim-bufdel": { "branch": "main", "commit": "458467859d59b43812e10ba78b4c2e14fad533bb" }, + "nvim-cmp": { "branch": "main", "commit": "ea9eaff5739856f3187d228d2c1181ea49fd4697" }, "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, "nvim-lspconfig": { "branch": "master", "commit": "649137cbc53a044bffde36294ce3160cb18f32c7" }, "nvim-spectre": { "branch": "master", "commit": "1d8b7a40677fd87da7648d246c4675c3612a7582" }, "nvim-surround": { "branch": "main", "commit": "90821ad682aac189cd0a38fd83fc96f0cbcc5d29" }, - "nvim-treesitter": { "branch": "master", "commit": "b44871afb59e456bbff4113e416405c06c991cf5" }, + "nvim-treesitter": { "branch": "master", "commit": "b23856a88e04e1468e1603d6e0900f2372709e22" }, "nvim-web-devicons": { "branch": "master", "commit": "bb6d4fd1e010300510172b173ab5205d37af084f" }, "nvim-window-picker": { "branch": "main", "commit": "5902827d0e338890a22849e2f18dc80d1cc1a8db" }, "orgmode": { "branch": "master", "commit": "313ce5a04e7fc3d677ad906a94fc49c1f54d1572" }, @@ -54,7 +54,7 @@ "telescope.nvim": { "branch": "master", "commit": "203bf5609137600d73e8ed82703d6b0e320a5f36" }, "toggleterm.nvim": { "branch": "main", "commit": "19aad0f41f47affbba1274f05e3c067e6d718e1e" }, "trim.nvim": { "branch": "master", "commit": "909150606eab44979eb9595145796f5bcb067955" }, - "trouble.nvim": { "branch": "main", "commit": "556ef3089709a6e253df1e500381fec5eb48e48a" }, + "trouble.nvim": { "branch": "main", "commit": "3bd029284d368cf70cc6fb4a5cbb9ae2231c239d" }, "undotree": { "branch": "master", "commit": "1a23ea84bd02c34f50d8e10a8b4bfc89597ffe4e" }, "vim-slash": { "branch": "master", "commit": "31aee09b7ea8893a18fa34f65e63e364fc998444" }, "which-key.nvim": { "branch": "main", "commit": "5224c261825263f46f6771f1b644cae33cd06995" }, |