diff --git a/flake.lock b/flake.lock index e5a638bd..05057ec6 100644 --- a/flake.lock +++ b/flake.lock @@ -327,24 +327,6 @@ "type": "github" } }, - "flake-utils": { - "inputs": { - "systems": "systems_4" - }, - "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "git-hooks": { "inputs": { "flake-compat": "flake-compat_2", @@ -889,27 +871,6 @@ "type": "github" } }, - "nuenv": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ], - "rust-overlay": "rust-overlay_2" - }, - "locked": { - "lastModified": 1731006591, - "narHash": "sha256-zCh7F0XKC5IEJKBTSNnUQ3SwJz3izPdxEU3C4udG8qI=", - "owner": "DeterminateSystems", - "repo": "nuenv", - "rev": "45693a438df82b3a604f855c3372f4f7d9efb3eb", - "type": "github" - }, - "original": { - "owner": "DeterminateSystems", - "repo": "nuenv", - "type": "github" - } - }, "nur-ryan4yin": { "inputs": { "nixpkgs": [ @@ -1015,7 +976,6 @@ "nixpkgs-stable": "nixpkgs-stable", "nixvim": "nixvim", "nu_scripts": "nu_scripts", - "nuenv": "nuenv", "nur-ryan4yin": "nur-ryan4yin", "pre-commit-hooks": "pre-commit-hooks", "preservation": "preservation", @@ -1043,28 +1003,6 @@ "type": "github" } }, - "rust-overlay_2": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": [ - "nuenv", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1701397143, - "narHash": "sha256-nYUJxZXwCWWVBYZXPgRxGDuQcZRhKTtD/Jp5Jl+9EWU=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "bb71557c93cad40f5921b2342d7fd69f9e6497ab", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, "systems": { "locked": { "lastModified": 1681028828, @@ -1110,21 +1048,6 @@ "type": "github" } }, - "systems_4": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ diff --git a/flake.nix b/flake.nix index 509ca905..79efd6e5 100644 --- a/flake.nix +++ b/flake.nix @@ -112,11 +112,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - nuenv = { - url = "github:DeterminateSystems/nuenv"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - haumea = { url = "github:nix-community/haumea/v0.2.2"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/modules/base/overlays.nix b/modules/base/overlays.nix index d652c04e..84ba43d7 100644 --- a/modules/base/overlays.nix +++ b/modules/base/overlays.nix @@ -1,7 +1,3 @@ -{ nuenv, ... }@args: -{ - nixpkgs.overlays = [ - nuenv.overlays.default - ] - ++ (import ../../overlays args); +args: { + nixpkgs.overlays = import ../../overlays args; } diff --git a/nixos-installer/flake.nix b/nixos-installer/flake.nix index e9b12e8e..fc674d08 100644 --- a/nixos-installer/flake.nix +++ b/nixos-installer/flake.nix @@ -6,7 +6,6 @@ preservation.url = "github:nix-community/preservation"; disko.url = "github:nix-community/disko/v1.11.0"; disko.inputs.nixpkgs.follows = "nixpkgs"; - nuenv.url = "github:DeterminateSystems/nuenv"; nixos-apple-silicon = { # 2025-10-07 asahi-6.16.8-1