diff --git a/flake.lock b/flake.lock index 8a3b04b2..ca05194a 100644 --- a/flake.lock +++ b/flake.lock @@ -153,6 +153,21 @@ "type": "github" } }, + "nix-std": { + "locked": { + "lastModified": 1710870712, + "narHash": "sha256-e+7MJF2gsgTBuOWv4mCimSP0D9+naeFSw9a7N3yEmv4=", + "owner": "chessai", + "repo": "nix-std", + "rev": "31bbc925750cc9d8f828fe55cee1a2bd985e0c00", + "type": "github" + }, + "original": { + "owner": "chessai", + "repo": "nix-std", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1711703276, @@ -185,22 +200,6 @@ "type": "github" } }, - "nur": { - "locked": { - "lastModified": 1712097892, - "narHash": "sha256-YEROpZs8saHffMKmSisTwhYdF/G3VMHgka4MAhz7Q9A=", - "owner": "nix-community", - "repo": "nur", - "rev": "2b655318c106193f6ffa11f6f7b778dc74688a3b", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "master", - "repo": "nur", - "type": "github" - } - }, "root": { "inputs": { "arcexprs": "arcexprs", @@ -211,9 +210,7 @@ "flake-utils": "flake-utils", "flakelib": "flakelib", "nixpkgs": "nixpkgs", - "nur": "nur", "sops-nix": "sops-nix", - "std": "std", "std-fl": "std-fl", "systemd2mqtt": "systemd2mqtt", "tree": "tree", @@ -262,26 +259,9 @@ "type": "github" } }, - "std": { - "locked": { - "lastModified": 1710870712, - "narHash": "sha256-e+7MJF2gsgTBuOWv4mCimSP0D9+naeFSw9a7N3yEmv4=", - "owner": "chessai", - "repo": "nix-std", - "rev": "31bbc925750cc9d8f828fe55cee1a2bd985e0c00", - "type": "github" - }, - "original": { - "owner": "chessai", - "repo": "nix-std", - "type": "github" - } - }, "std-fl": { "inputs": { - "nix-std": [ - "std" - ] + "nix-std": "nix-std" }, "locked": { "lastModified": 1706552916, @@ -342,7 +322,8 @@ "nixpkgs" ], "std": [ - "std" + "std-fl", + "nix-std" ] }, "locked": { diff --git a/flake.nix b/flake.nix index f1789597..61624398 100644 --- a/flake.nix +++ b/flake.nix @@ -1,14 +1,11 @@ { - description = "kat's nixfiles"; + description = "gensokyo.zone"; inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; arcexprs = { url = "github:arcnmx/nixexprs/master"; inputs.nixpkgs.follows = "nixpkgs"; }; - std = { - url = "github:chessai/nix-std"; - }; ci = { url = "github:arcnmx/ci/v0.7"; flake = false; @@ -17,7 +14,6 @@ url = "github:edolstra/flake-compat"; flake = false; }; - nur.url = "github:nix-community/nur/master"; flake-utils.url = "github:numtide/flake-utils"; flakelib = { url = "github:flakelib/fl"; @@ -25,7 +21,6 @@ }; std-fl = { url = "github:flakelib/std"; - inputs.nix-std.follows = "std"; }; sops-nix = { url = "github:Mic92/sops-nix"; @@ -33,7 +28,7 @@ }; tree = { url = "github:kittywitch/tree"; - inputs.std.follows = "std"; + inputs.std.follows = "std-fl/nix-std"; inputs.nixpkgs.follows = "nixpkgs"; }; deploy-rs = { diff --git a/nixos/base/nix.nix b/nixos/base/nix.nix index c8d59715..8bb4fcf7 100644 --- a/nixos/base/nix.nix +++ b/nixos/base/nix.nix @@ -17,15 +17,11 @@ in { nix = { nixPath = [ "nixpkgs=${inputs.nixpkgs}" - "nur=${inputs.nur}" "arc=${inputs.arcexprs}" - "ci=${inputs.ci}" ]; registry = { nixpkgs.flake = inputs.nixpkgs; - nur.flake = inputs.nur; arc.flake = inputs.arcexprs; - ci.flake = inputs.ci; }; settings = { experimental-features = lib.optional (lib.versionAtLeast config.nix.package.version "2.4") "nix-command flakes"; diff --git a/packages/default.nix b/packages/default.nix index f0f5568c..c9c1edfd 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -4,7 +4,7 @@ }: let lib = inputs.self.lib.nixlib; inherit (lib.strings) makeBinPath; - inherit (inputs.std.lib) string list set; + inherit (inputs.self.lib.std) string list set; packages = inputs.self.packages.${system}; inherit (inputs.self.legacyPackages.${system}) pkgs; fmt = import ../ci/fmt.nix;