summaryrefslogtreecommitdiff
path: root/home/neovim
diff options
context:
space:
mode:
authorLinnnus <[email protected]>2024-02-13 17:27:18 +0100
committerLinnnus <[email protected]>2024-02-13 17:27:18 +0100
commitbbbdbd1094f1f09b8075da88f6b412d2e4af80ca (patch)
treebe62e8cf55aa8546068eb1bb93257a3f60280ad2 /home/neovim
parenta908af9a955e64828f0b4f0c3b1c5770775c9794 (diff)
parent1bbdd3f63a9d8c46b1772cbf2ad9fd83d7ef213b (diff)
tmp: Merge branch 'main' into reorg
Otherwise, we'd get a conflict when we moved duksebot.
Diffstat (limited to 'home/neovim')
-rw-r--r--home/neovim/filetype.nix1
-rw-r--r--home/neovim/lsp.nix19
2 files changed, 2 insertions, 18 deletions
diff --git a/home/neovim/filetype.nix b/home/neovim/filetype.nix
index 08b5e46..cb47420 100644
--- a/home/neovim/filetype.nix
+++ b/home/neovim/filetype.nix
@@ -8,5 +8,6 @@
vim-noweb
vim-janet
vim-crystal
+ vim-svelte
];
}
diff --git a/home/neovim/lsp.nix b/home/neovim/lsp.nix
index 20de898..0c2e290 100644
--- a/home/neovim/lsp.nix
+++ b/home/neovim/lsp.nix
@@ -49,24 +49,7 @@
-- map buffer local keybindings when the language server attaches
local servers = {
pyright = { cmd = { "${pkgs.pyright}/bin/pyright-langserver", "--stdio" } },
- nil_ls = {
- cmd = { "${pkgs.nil}/bin/nil" },
- settings = {
- ["nil"] = {
- formatting = {
- command = {"nix", "run", "nixpkgs#alejandra"},
- },
- nix = {
- flake = {
- -- calls `nix flake archive` to put a flake and its output to store
- autoArchive = true,
- -- auto eval flake inputs for improved completion
- autoEvalInputs = true,
- },
- },
- },
- },
- },
+ nixd = { cmd = { "${pkgs.nixd}/bin/nixd" } },
denols = {
init_options = {
enable = true,