hermes: add nixd (new nix LSP)

This commit is contained in:
Payas Relekar 2023-06-13 16:48:06 +05:30
parent 6e117834dc
commit 2bdaed5fcf
4 changed files with 79 additions and 2 deletions

View file

@ -96,6 +96,24 @@
"type": "github"
}
},
"flake-parts": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 1685662779,
"narHash": "sha256-cKDDciXGpMEjP1n6HlzKinN0H+oLmNpgeCTzYnsA2po=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "71fb97f0d875fd4de4994dfb849f2c75e17eb6c3",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-utils": {
"inputs": {
"systems": "systems"
@ -155,6 +173,25 @@
"type": "github"
}
},
"nixd": {
"inputs": {
"flake-parts": "flake-parts",
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1686634163,
"narHash": "sha256-tnJ7miOrDGFJvsdFLUkjE2YRi9v6o+7asVSi1IfMf6I=",
"owner": "nix-community",
"repo": "nixd",
"rev": "093a4846322813e7cb1c40ace11f5edbe523ef00",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nixd",
"type": "github"
}
},
"nixos-hardware": {
"locked": {
"lastModified": 1686452266,
@ -209,7 +246,41 @@
"type": "github"
}
},
"nixpkgs-lib": {
"locked": {
"dir": "lib",
"lastModified": 1685564631,
"narHash": "sha256-8ywr3AkblY4++3lIVxmrWZFzac7+f32ZEhH/A8pNscI=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "4f53efe34b3a8877ac923b9350c874e3dcd5dc0a",
"type": "github"
},
"original": {
"dir": "lib",
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1686398752,
"narHash": "sha256-nGWNQVhSw4VSL+S0D0cbrNR9vs9Bq7rlYR+1K5f5j6w=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a30520bf8eabf8a5c37889d661e67a2dbcaa59e6",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1686501370,
"narHash": "sha256-G0WuM9fqTPRc2URKP9Lgi5nhZMqsfHGrdEbrLvAPJcg=",
@ -230,9 +301,10 @@
"agenix": "agenix",
"deploy-rs": "deploy-rs",
"home-manager": "home-manager_2",
"nixd": "nixd",
"nixos-hardware": "nixos-hardware",
"nixos-wsl": "nixos-wsl",
"nixpkgs": "nixpkgs_2"
"nixpkgs": "nixpkgs_3"
}
},
"systems": {

View file

@ -19,6 +19,7 @@
};
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
deploy-rs.url = "github:serokell/deploy-rs";
nixd.url = "github:nix-community/nixd";
};
outputs =
@ -29,6 +30,7 @@
, agenix
, nixos-hardware
, deploy-rs
, nixd
, ...
}:
let
@ -47,6 +49,8 @@
system = "x86_64-linux";
modules = common-modules ++ [
{ nixpkgs.overlays = [ nixd.overlays.default ]; }
# Modules and module config
./modules/users.nix
./modules/fonts.nix

View file

@ -887,7 +887,7 @@ mu4e + mbsync + msmtp:
(add-to-list 'eglot-server-programs '(elixir-mode . ("elixir-ls")))
(delete '(nix-mode "rnix-lsp") eglot-server-programs)
(add-to-list 'eglot-server-programs '(nix-mode . ("nil")))
(add-to-list 'eglot-server-programs '(nix-mode . ("nixd")))
(delete '((java-mode java-ts-mode) "jdtls") eglot-server-programs)
(add-to-list 'eglot-server-programs '((java-mode java-ts-mode) . ("jdt-language-server" "-config" "~/.cache/jdtls" "-data" ".jdtls-cache")))

View file

@ -89,6 +89,7 @@ in
# Nix things
nixpkgs-fmt
nil
nixd
# Java language server
jdt-language-server