summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README.md2
-rw-r--r--lua/getchoo/plugins/lsp.lua22
-rw-r--r--neovim.nix4
3 files changed, 18 insertions, 10 deletions
diff --git a/README.md b/README.md
index 4c617fd..beff358 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,3 @@
# getchvim
-my "from scratch" neovim config. figured i would make it separate from my overengineered [flake](https://github.com/getchoo/flake)
+My "from scratch" Neovim config. Figured I would make it separate from my [Flake](https://github.com/getchoo/borealis)
diff --git a/lua/getchoo/plugins/lsp.lua b/lua/getchoo/plugins/lsp.lua
index d7bcefc..f62d839 100644
--- a/lua/getchoo/plugins/lsp.lua
+++ b/lua/getchoo/plugins/lsp.lua
@@ -45,21 +45,29 @@ local lsp_servers = {
},
},
- nil_ls = {
- binary = "nil",
+ nim_langserver = {
+ binary = "nimlangserver",
+ },
+
+ nixd = {
+ binary = "nixd",
extraOptions = {
settings = {
- ["nil"] = {
+ nixd = {
formatting = { command = { "nixfmt" } },
+ nixpkgs = {
+ expr = "import <nixpkgs> { config = { allowUnfree = true; }; overlays = [ ]; }",
+ },
+ options = {
+ nixos = {
+ expr = '((import <nixpkgs> { config = { allowUnfree = true; }; overlays = [ ]; }).nixos { }).options',
+ },
+ },
},
},
},
},
- nim_langserver = {
- binary = "nimlangserver",
- },
-
pyright = {
extraOptions = {
settings = {
diff --git a/neovim.nix b/neovim.nix
index 82168d2..b56a5b6 100644
--- a/neovim.nix
+++ b/neovim.nix
@@ -5,7 +5,7 @@
actionlint,
glow,
- nil,
+ nixd,
nixfmt-rfc-style,
nodePackages,
shellcheck,
@@ -34,7 +34,7 @@ mkNeovimDerivation {
nodePackages.bash-language-server
shellcheck
shfmt
- nil
+ nixd
nixfmt-rfc-style
# Linters