update and replace nixd with nil

This commit is contained in:
Tim Schubert 2023-06-09 00:50:52 +02:00
parent 51c656a344
commit 6b7642dc76
Signed by: dadada
GPG key ID: EEB8D1CE62C4DFEA
5 changed files with 2 additions and 66 deletions

View file

@ -8,7 +8,7 @@
agenix agenix
nixpkgs-fmt nixpkgs-fmt
nixos-rebuild nixos-rebuild
nixd nil
]; ];
commands = [ commands = [

58
flake.lock generated
View file

@ -130,24 +130,6 @@
"type": "github" "type": "github"
} }
}, },
"flake-parts": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib_2"
},
"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-registry": { "flake-registry": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -334,27 +316,6 @@
"type": "github" "type": "github"
} }
}, },
"nixd": {
"inputs": {
"flake-parts": "flake-parts",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1686235158,
"narHash": "sha256-xnp65zqxlX4CaeWSbH2rRakSq2fgz8ukep/R3ga8UXA=",
"owner": "nix-community",
"repo": "nixd",
"rev": "b5079c4d79905048d3c0b39e1a2a6a66067f1111",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nixd",
"type": "github"
}
},
"nixlib": { "nixlib": {
"locked": { "locked": {
"lastModified": 1685840432, "lastModified": 1685840432,
@ -441,24 +402,6 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-lib_2": {
"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": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1629226339, "lastModified": 1629226339,
@ -568,7 +511,6 @@
"helix": "helix", "helix": "helix",
"home-manager": "home-manager", "home-manager": "home-manager",
"homePage": "homePage", "homePage": "homePage",
"nixd": "nixd",
"nixos-generators": "nixos-generators", "nixos-generators": "nixos-generators",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_3",

View file

@ -32,10 +32,6 @@
flake = false; flake = false;
}; };
helix.url = "github:helix-editor/helix/23.03"; helix.url = "github:helix-editor/helix/23.03";
nixd = {
url = "github:nix-community/nixd";
inputs.nixpkgs.follows = "nixpkgs";
};
}; };
outputs = { ... } @ args: import ./outputs.nix args; outputs = { ... } @ args: import ./outputs.nix args;

View file

@ -12,4 +12,4 @@ roots = []
[[language]] [[language]]
name = "nix" name = "nix"
file-types = ["nix"] file-types = ["nix"]
language-server = { command = "nixd" } language-server = { command = "nil" }

View file

@ -10,7 +10,6 @@
, agenix , agenix
, devshell , devshell
, helix , helix
, nixd
, ... , ...
} @ inputs: } @ inputs:
(flake-utils.lib.eachDefaultSystem (system: (flake-utils.lib.eachDefaultSystem (system:
@ -25,7 +24,6 @@
overlays = [ overlays = [
agenix.overlay agenix.overlay
devshell.overlays.default devshell.overlays.default
(final: prev: { nixd = nixd.packages.${system}.nixd; })
]; ];
}; };
extraModules = [ "${devshell}/extra/git/hooks.nix" ]; extraModules = [ "${devshell}/extra/git/hooks.nix" ];