summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorseth <[email protected]>2023-05-15 18:40:40 -0400
committerseth <[email protected]>2023-05-15 18:40:40 -0400
commit3b728102b6ddba56f9b0c771695748500bb3bdf1 (patch)
treeb1120bf88b6819b13b33b08fe6ec7f1f7170d0ec
parent7d066e28c28b4ae6f9ba865290003e8ceb44be78 (diff)
remove nil input/overlay
latest snapshot has been merged into nixos-unstable
-rw-r--r--flake.lock52
-rw-r--r--flake.nix6
-rw-r--r--hosts/profiles.nix4
-rw-r--r--modules/flake/dev.nix4
4 files changed, 5 insertions, 61 deletions
diff --git a/flake.lock b/flake.lock
index 5ad7700..36217ef 100644
--- a/flake.lock
+++ b/flake.lock
@@ -387,30 +387,6 @@
"type": "github"
}
},
- "nil": {
- "inputs": {
- "flake-utils": [
- "flake-utils"
- ],
- "nixpkgs": [
- "nixpkgsUnstable"
- ],
- "rust-overlay": "rust-overlay_2"
- },
- "locked": {
- "lastModified": 1683653883,
- "narHash": "sha256-Xg3Cux5wQDatXRvQWsVD0YPfmxfijjG8+gxYqgoT6JE=",
- "owner": "oxalica",
- "repo": "nil",
- "rev": "18de045d7788df2343aec58df7b85c10d1f5d5dd",
- "type": "github"
- },
- "original": {
- "owner": "oxalica",
- "repo": "nil",
- "type": "github"
- }
- },
"nix-darwin": {
"inputs": {
"nixpkgs": [
@@ -597,7 +573,7 @@
"nixpkgs": [
"nixpkgsUnstable"
],
- "rust-overlay": "rust-overlay_3"
+ "rust-overlay": "rust-overlay_2"
},
"locked": {
"lastModified": 1682237245,
@@ -624,7 +600,6 @@
"hercules-ci-effects": "hercules-ci-effects",
"home-manager": "home-manager",
"lanzaboote": "lanzaboote",
- "nil": "nil",
"nixinate": "nixinate",
"nixos-hardware": "nixos-hardware",
"nixos-wsl": "nixos-wsl",
@@ -664,31 +639,6 @@
"rust-overlay_2": {
"inputs": {
"flake-utils": [
- "nil",
- "flake-utils"
- ],
- "nixpkgs": [
- "nil",
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1682907601,
- "narHash": "sha256-FfUAYvRJ+6s9WWjXNPdRzuuvAeu2VHIXIbUkPJr4t14=",
- "owner": "oxalica",
- "repo": "rust-overlay",
- "rev": "5eaff055dd57128c53ae373dc96af944f5849daa",
- "type": "github"
- },
- "original": {
- "owner": "oxalica",
- "repo": "rust-overlay",
- "type": "github"
- }
- },
- "rust-overlay_3": {
- "inputs": {
- "flake-utils": [
"ragenix",
"flake-utils"
],
diff --git a/flake.nix b/flake.nix
index 0cca7a5..d9dab8e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -63,12 +63,6 @@
inputs.flake-parts.follows = "flake-parts";
inputs.pre-commit-hooks-nix.follows = "pre-commit-hooks";
};
- # TODO: remove this when nil is updated in nixpkgs-unstable
- nil = {
- url = "github:oxalica/nil";
- inputs.nixpkgs.follows = "nixpkgsUnstable";
- inputs.flake-utils.follows = "flake-utils";
- };
nixinate = {
url = "github:MatthewCroughan/nixinate";
inputs.nixpkgs.follows = "nixpkgsUnstable";
diff --git a/hosts/profiles.nix b/hosts/profiles.nix
index f0903e5..d565840 100644
--- a/hosts/profiles.nix
+++ b/hosts/profiles.nix
@@ -2,7 +2,7 @@
inputs,
self,
}: let
- inherit (inputs) getchoo home-manager nil nixpkgs nixpkgsUnstable nur ragenix;
+ inherit (inputs) getchoo home-manager nixpkgs nixpkgsUnstable nur ragenix;
in {
personal = {
system = "x86_64-linux";
@@ -28,7 +28,7 @@ in {
};
nixpkgs = {
- overlays = [nil.overlays.nil nur.overlay getchoo.overlays.default];
+ overlays = [nur.overlay getchoo.overlays.default];
config.allowUnfree = true;
};
diff --git a/modules/flake/dev.nix b/modules/flake/dev.nix
index 712f334..089c77a 100644
--- a/modules/flake/dev.nix
+++ b/modules/flake/dev.nix
@@ -3,7 +3,7 @@
inputs,
...
}: let
- inherit (inputs) nil pre-commit-hooks ragenix;
+ inherit (inputs) pre-commit-hooks ragenix;
in {
perSystem = {
pkgs,
@@ -34,7 +34,7 @@ in {
alejandra
deadnix
just
- nil.packages.${system}.nil
+ nil
ragenix.packages.${system}.ragenix
statix
stylua