summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--fnl/config/lsp/lsp-installer.fnl7
-rw-r--r--fnl/config/lsp/null-ls.fnl44
-rw-r--r--fnl/config/lsp/settings/jsonls.fnl18
-rw-r--r--fnl/config/lsp/settings/pyright.fnl6
4 files changed, 45 insertions, 30 deletions
diff --git a/fnl/config/lsp/lsp-installer.fnl b/fnl/config/lsp/lsp-installer.fnl
index 5775187..21afd5d 100644
--- a/fnl/config/lsp/lsp-installer.fnl
+++ b/fnl/config/lsp/lsp-installer.fnl
@@ -27,6 +27,7 @@
_ handler-opts))
(let [lsp-installer (util.load-plugin :nvim-lsp-installer)]
- (lsp-installer.on_server_ready (fn [server]
- (let [opts (get-server-opts server)]
- (server:setup opts)))))
+ (lsp-installer.on_server_ready
+ (fn [server]
+ (let [opts (get-server-opts server)]
+ (server:setup opts)))))
diff --git a/fnl/config/lsp/null-ls.fnl b/fnl/config/lsp/null-ls.fnl
index a7e49ec..b0fec48 100644
--- a/fnl/config/lsp/null-ls.fnl
+++ b/fnl/config/lsp/null-ls.fnl
@@ -5,23 +5,27 @@
(let [null-ls (util.load-plugin :null-ls)]
(let [formatting null-ls.builtins.formatting
diagnostics null-ls.builtins.diagnostics]
- (null-ls.setup {:debug false
- :sources [diagnostics.flake8
- diagnostics.golangci_lint
- diagnostics.jsonlint
- diagnostics.shellcheck
- diagnostics.yamllint
- (formatting.black.with {:extra_args [:--fast]})
- formatting.erlfmt
- formatting.fourmolu
- formatting.gofmt
- formatting.goimports
- formatting.nixfmt
- (formatting.prettier.with {:extra_args [:--no-semi
- :--single-quote
- :--jsx-single-quote]})
- formatting.rustfmt
- formatting.shfmt
- formatting.sqlformat
- formatting.stylua
- formatting.terraform_fmt]})))
+ (null-ls.setup
+ {:debug false
+ :sources [diagnostics.flake8
+ diagnostics.golangci_lint
+ diagnostics.jsonlint
+ diagnostics.shellcheck
+ diagnostics.yamllint
+ (formatting.black.with
+ {:extra_args [:--fast]})
+ formatting.erlfmt
+ formatting.fourmolu
+ formatting.gofmt
+ formatting.goimports
+ formatting.nixfmt
+ (formatting.prettier.with
+ {:extra_args
+ [:--no-semi
+ :--single-quote
+ :--jsx-single-quote]})
+ formatting.rustfmt
+ formatting.shfmt
+ formatting.sqlformat
+ formatting.stylua
+ formatting.terraform_fmt]})))
diff --git a/fnl/config/lsp/settings/jsonls.fnl b/fnl/config/lsp/settings/jsonls.fnl
index aa9f781..f8dfdc2 100644
--- a/fnl/config/lsp/settings/jsonls.fnl
+++ b/fnl/config/lsp/settings/jsonls.fnl
@@ -3,9 +3,15 @@
{autoload {util util}})
(let [schemastore (util.load-plugin :schemastore)]
- {:init_options {:providerFormatter false}
- :settings {:json {:schemas (schemastore.json.schemas)}}
- :setup {:commands {:Format [(fn []
- (vim.lsp.buf.range_formatting [] [0 0]
- [(vim.fn.line "$"
- 0)]))]}}})
+ {:init_options
+ {:providerFormatter false}
+ :settings
+ {:json
+ {:schemas
+ (schemastore.json.schemas)}}
+ :setup
+ {:commands
+ {:Format
+ [(fn []
+ (vim.lsp.buf.range_formatting
+ [] [0 0] [(vim.fn.line "$" 0)]))]}}})
diff --git a/fnl/config/lsp/settings/pyright.fnl b/fnl/config/lsp/settings/pyright.fnl
index 639ecff..b1fa064 100644
--- a/fnl/config/lsp/settings/pyright.fnl
+++ b/fnl/config/lsp/settings/pyright.fnl
@@ -1,4 +1,8 @@
;; Config for pyright language server.
(module config.lsp.settings.pyright)
-(def opts {:settings {:python {:analysis {:typeCheckingMode :off}}}})
+(def opts
+ {:settings
+ {:python
+ {:analysis
+ {:typeCheckingMode :off}}}})