NotAShelf/nvf
2
1
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2025-09-06 10:21:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #998 from imnotpoz/nil-nixpkgs
Some checks failed
Set up binary cache / cachix (default) (push) Has been cancelled
Details
Set up binary cache / cachix (maximal) (push) Has been cancelled
Details
Set up binary cache / cachix (nix) (push) Has been cancelled
Details
Treewide Checks / Validate flake (push) Has been cancelled
Details
Treewide Checks / Check formatting (push) Has been cancelled
Details
Treewide Checks / Check source tree for typos (push) Has been cancelled
Details
Treewide Checks / Validate documentation builds (push) Has been cancelled
Details
Treewide Checks / Validate hyperlinks in documentation sources (push) Has been cancelled
Details
Treewide Checks / Validate Editorconfig conformance (push) Has been cancelled
Details
Build and deploy documentation / Check latest commit (push) Has been cancelled
Details
Build and deploy documentation / publish (push) Has been cancelled
Details

Browse source 
drop nil input, switch to pkgs.nil
This commit is contained in:
raf 2025-07-07 14:17:53 +03:00 • committed by GitHub
commit d70c3a8340
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 2 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

21
flake.lock generated
View file

@ -51,26 +51,6 @@
"type": "github" "type": "github"
} }
}, },
"nil": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1750047244,
"narHash": "sha256-vluLARrk4485npdyHOj8XKr0yk6H22pNf+KVRNL+i/Y=",
"owner": "oxalica",
"repo": "nil",
"rev": "870a4b1b5f12004832206703ac15aa85c42c247b",
"type": "github"
},
"original": {
"owner": "oxalica",
"repo": "nil",
"type": "github"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1750215678, "lastModified": 1750215678,
@ -107,7 +87,6 @@
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"mnw": "mnw", "mnw": "mnw",
"nil": "nil",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"systems": "systems_2" "systems": "systems_2"
} }

7
flake.nix
View file

@ -82,12 +82,5 @@
# Alternate neovim-wrapper # Alternate neovim-wrapper
mnw.url = "github:Gerg-L/mnw"; mnw.url = "github:Gerg-L/mnw";
## Language servers (use master instead of nixpkgs)
# Nix LSP
nil = {
url = "github:oxalica/nil";
inputs.nixpkgs.follows = "nixpkgs";
};
}; };
} }

2
flake/develop.nix
View file

@ -10,7 +10,7 @@
default = self'.devShells.lsp; default = self'.devShells.lsp;
nvim-nix = pkgs.mkShellNoCC {packages = [config.packages.nix];}; nvim-nix = pkgs.mkShellNoCC {packages = [config.packages.nix];};
lsp = pkgs.mkShellNoCC { lsp = pkgs.mkShellNoCC {
packages = with pkgs; [inputs'.nil.packages.default statix deadnix alejandra npins]; packages = with pkgs; [nil statix deadnix alejandra npins];
}; };
}; };

3
modules/plugins/languages/nix.nix
View file

@ -2,7 +2,6 @@
config, config,
pkgs, pkgs,
lib, lib,
inputs,
... ...
}: let }: let
inherit (builtins) attrNames; inherit (builtins) attrNames;
@ -28,7 +27,7 @@
else ''{"${package}/bin/${defaultCmd}"}''; else ''{"${package}/bin/${defaultCmd}"}'';
servers = { servers = {
nil = { nil = {
package = inputs.nil.packages.${pkgs.stdenv.system}.nil; package = pkgs.nil;
internalFormatter = true; internalFormatter = true;
lspConfig = '' lspConfig = ''
lspconfig.nil_ls.setup{ lspconfig.nil_ls.setup{