Add more language server support, fix neovim config initialiser paths

This commit is contained in:
Curt Spark 2024-07-18 06:41:12 +01:00
parent 614f8d5a9f
commit 8a262041eb
4 changed files with 103 additions and 7 deletions

View File

@ -399,6 +399,39 @@
"type": "github" "type": "github"
} }
}, },
"flake-parts_5": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib_2"
},
"locked": {
"lastModified": 1714606777,
"narHash": "sha256-bMkNmAXLj8iyTvxaaD/StcLSadbj1chPcJOjtuVnLmA=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "4d34ce6412bc450b1d4208c953dc97c7fc764f1a",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-root": {
"locked": {
"lastModified": 1713493429,
"narHash": "sha256-ztz8JQkI08tjKnsTpfLqzWoKFQF4JGu2LRz8bkdnYUk=",
"owner": "srid",
"repo": "flake-root",
"rev": "bc748b93b86ee76e2032eecda33440ceb2532fcd",
"type": "github"
},
"original": {
"owner": "srid",
"repo": "flake-root",
"type": "github"
}
},
"flake-utils": { "flake-utils": {
"inputs": { "inputs": {
"systems": "systems" "systems": "systems"
@ -688,6 +721,26 @@
"type": "github" "type": "github"
} }
}, },
"nixd": {
"inputs": {
"flake-parts": "flake-parts_5",
"flake-root": "flake-root",
"nixpkgs": "nixpkgs_7"
},
"locked": {
"lastModified": 1721140729,
"narHash": "sha256-f+RjBJ4BZ8Uv6QuQ/TEaA8crKP+Uw6DZXdtRY2EvwlQ=",
"owner": "nix-community",
"repo": "nixd",
"rev": "334da32238a641c24ca7bff59d7a7d38c48fea06",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nixd",
"type": "github"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1700612854, "lastModified": 1700612854,
@ -716,6 +769,24 @@
"url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz" "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz"
} }
}, },
"nixpkgs-lib_2": {
"locked": {
"dir": "lib",
"lastModified": 1714253743,
"narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994",
"type": "github"
},
"original": {
"dir": "lib",
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1720954236, "lastModified": 1720954236,
@ -805,6 +876,22 @@
} }
}, },
"nixpkgs_7": { "nixpkgs_7": {
"locked": {
"lastModified": 1714562304,
"narHash": "sha256-Mr3U37Rh6tH0FbaDFu0aZDwk9mPAe7ASaqDOGgLqqLU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "bcd44e224fd68ce7d269b4f44d24c2220fd821e7",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_8": {
"locked": { "locked": {
"lastModified": 1720957393, "lastModified": 1720957393,
"narHash": "sha256-oedh2RwpjEa+TNxhg5Je9Ch6d3W1NKi7DbRO1ziHemA=", "narHash": "sha256-oedh2RwpjEa+TNxhg5Je9Ch6d3W1NKi7DbRO1ziHemA=",
@ -933,7 +1020,8 @@
"inputs": { "inputs": {
"home-manager": "home-manager", "home-manager": "home-manager",
"niri": "niri", "niri": "niri",
"nixpkgs": "nixpkgs_7" "nixd": "nixd",
"nixpkgs": "nixpkgs_8"
} }
}, },
"systems": { "systems": {

View File

@ -14,6 +14,11 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nixd = {
url = "github:nix-community/nixd";
};
}; };
outputs = { self, nixpkgs, ... }@inputs: { outputs = { self, nixpkgs, ... }@inputs: {

View File

@ -206,9 +206,9 @@ in
systemd.user.services.neovim-config-initialiser = let systemd.user.services.neovim-config-initialiser = let
script = pkgs.writeShellScript "neovim-config-initialiser-script" script = pkgs.writeShellScript "neovim-config-initialiser-script"
'' ''
if [[ ! -d $HOME/.config/neovim ]]; then if [[ ! -d $HOME/.config/nvim ]]; then
mkdir -p $HOME/.config/neovim mkdir -p $HOME/.config/nvim
git clone https://git.cspark.dev/cspark/Neovim-Configuration $HOME/.config/neovim git clone https://git.cspark.dev/cspark/Neovim-Configuration $HOME/.config/nvim
else else
exit 0 exit 0
fi fi

View File

@ -28,11 +28,14 @@
clang-tools # clangd clang-tools # clangd
gnumake gnumake
cargo cargo
vscode-langservers-extracted
lua-language-server lua-language-server
yaml-language-server
nodePackages.prettier nodePackages.prettier
nodePackages.typescript-language-server nodePackages.typescript-language-server
nodePackages.bash-language-server nodePackages.bash-language-server
python312Packages.jedi-language-server python312Packages.jedi-language-server
nixd
neovim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. neovim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
fastfetch fastfetch
@ -196,9 +199,9 @@
Group = "root"; Group = "root";
}; };
script = " script = "
if [[ ! -d $HOME/.config/neovim ]]; then if [[ ! -d $HOME/.config/nvim ]]; then
mkdir -p $HOME/.config/neovim mkdir -p $HOME/.config/nvim
git clone https://git.cspark.dev/cspark/Neovim-Configuration $HOME/.neovim.d git clone https://git.cspark.dev/cspark/Neovim-Configuration $HOME/.config/nvim
else else
exit 0 exit 0
fi fi