This commit is contained in:
Talon 2023-07-27 20:26:13 -06:00
parent afb4e5d5f6
commit 865530b154
2 changed files with 13 additions and 10 deletions

View file

@ -34,7 +34,7 @@
(let [telescope (require :telescope)] (let [telescope (require :telescope)]
(pcall (telescope.load_extension :fzf))) (pcall (telescope.load_extension :fzf)))
;; Syntax support via Treesitter ;; Syntax Highlighting via Treesitter
;; NOTE: if you add a language to treesitter for syntax highlighting or otherwise ;; NOTE: if you add a language to treesitter for syntax highlighting or otherwise
;; consider also adding the LSP via Mason below... ;; consider also adding the LSP via Mason below...
(let (let
@ -49,7 +49,6 @@
:indent {:enable true}})) :indent {:enable true}}))
;; Language Server Protocols via Mason ;; Language Server Protocols via Mason
;; TODO fix lua_ls checking .fnl files?
(let (let
[neodev (require :neodev) [neodev (require :neodev)
mason (require :mason) mason (require :mason)
@ -57,15 +56,19 @@
servers servers
{:lua_ls {:lua_ls
{:filetypes [:lua] {:filetypes [:lua]
:Lua :Lua
{:workspace {:checkThirdParty false} {:workspace {:checkThirdParty false} }
:telemetry {:enable false}} :telemetry {:enable false}
:diagnostics {:globals [:vim]}} :diagnostics {:globals
[:vim
]}}
:fennel_language_server :fennel_language_server
{:filetypes [:fennel] {:filetypes [:fennel]
:fennel :fennel
{:workspace {:library (vim.api.nvim_list_runtime_paths)} {:workspace {:library (vim.api.nvim_list_runtime_paths)}
:diagnostics {:globals [:vim]}}} :diagnostics {:globals
[:vim
]}}}
:bashls {:filetypes [:bash]} :bashls {:filetypes [:bash]}
} }
on_attach (fn [_ bufnr] on_attach (fn [_ bufnr]
@ -76,8 +79,9 @@
(nmap :gd vim.lsp.buf.definition "[G]o to [D]efiniton") (nmap :gd vim.lsp.buf.definition "[G]o to [D]efiniton")
(nmap :gr telescope.lsp_references "[G]o to [R]eferences") (nmap :gr telescope.lsp_references "[G]o to [R]eferences")
(nmap :gI vim.lsp.buf.implementation "[G]o to [I]mplementation") (nmap :gI vim.lsp.buf.implementation "[G]o to [I]mplementation")
(vim.api.nvim_buf_create_user_command bufnr "Format" #(vim.lsp.buf.format) (vim.api.nvim_buf_create_user_command bufnr "Format"
"Format current buffer with LSP"))) #(vim.lsp.buf.format)
"Format current buffer with LSP")))
] ]
(neodev.setup) (neodev.setup)
(mason.setup) (mason.setup)

View file

@ -7,7 +7,6 @@
"neodev.nvim": { "branch": "main", "commit": "f57e5210d450b47aa02ea6d9e50a37414f570b4c" }, "neodev.nvim": { "branch": "main", "commit": "f57e5210d450b47aa02ea6d9e50a37414f570b4c" },
"nvim-lspconfig": { "branch": "master", "commit": "b6091272422bb0fbd729f7f5d17a56d37499c54f" }, "nvim-lspconfig": { "branch": "master", "commit": "b6091272422bb0fbd729f7f5d17a56d37499c54f" },
"nvim-treesitter": { "branch": "master", "commit": "6aababfca4e3d72cb1e8fbbdac4115a5f88107d0" }, "nvim-treesitter": { "branch": "master", "commit": "6aababfca4e3d72cb1e8fbbdac4115a5f88107d0" },
"nvim-treesitter-textobjects": { "branch": "master", "commit": "9e519b6146512c8e2e702faf8ac48420f4f5deec" },
"plenary.nvim": { "branch": "master", "commit": "267282a9ce242bbb0c5dc31445b6d353bed978bb" }, "plenary.nvim": { "branch": "master", "commit": "267282a9ce242bbb0c5dc31445b6d353bed978bb" },
"telescope-fzf-native.nvim": { "branch": "main", "commit": "9bc8237565ded606e6c366a71c64c0af25cd7a50" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "9bc8237565ded606e6c366a71c64c0af25cd7a50" },
"telescope.nvim": { "branch": "master", "commit": "776b509f80dd49d8205b9b0d94485568236d1192" } "telescope.nvim": { "branch": "master", "commit": "776b509f80dd49d8205b9b0d94485568236d1192" }