diff --git a/flake.lock b/flake.lock index d854dd6..52cbccb 100644 --- a/flake.lock +++ b/flake.lock @@ -21,37 +21,6 @@ "type": "github" } }, - "cachix": { - "inputs": { - "devenv": [ - "teslamate-flake", - "devenv" - ], - "flake-compat": [ - "teslamate-flake", - "devenv" - ], - "git-hooks": [ - "teslamate-flake", - "devenv" - ], - "nixpkgs": "nixpkgs_4" - }, - "locked": { - "lastModified": 1728672398, - "narHash": "sha256-KxuGSoVUFnQLB2ZcYODW7AVPAh9JqRlD5BrfsC/Q4qs=", - "owner": "cachix", - "repo": "cachix", - "rev": "aac51f698309fd0f381149214b7eee213c66ef0a", - "type": "github" - }, - "original": { - "owner": "cachix", - "ref": "latest", - "repo": "cachix", - "type": "github" - } - }, "darwin": { "inputs": { "nixpkgs": [ @@ -74,154 +43,6 @@ "type": "github" } }, - "devenv": { - "inputs": { - "cachix": "cachix", - "flake-compat": "flake-compat", - "git-hooks": "git-hooks", - "nix": "nix", - "nixpkgs": "nixpkgs_6" - }, - "locked": { - "lastModified": 1732298876, - "narHash": "sha256-WXlcDNMaMJeI4JO4VfQM2ZZCBJBds7j7N04tS9UjiYU=", - "owner": "cachix", - "repo": "devenv", - "rev": "741e23a22f3dc9e53075be3eaa795ea9ed6f5129", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "devenv", - "type": "github" - } - }, - "devenv-root": { - "flake": false, - "locked": { - "narHash": "sha256-d6xi4mKdjkX2JFicDIv5niSzpyI0m/Hnm8GGAIU04kY=", - "type": "file", - "url": "file:///dev/null" - }, - "original": { - "type": "file", - "url": "file:///dev/null" - } - }, - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-parts": { - "inputs": { - "nixpkgs-lib": [ - "teslamate-flake", - "devenv", - "nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1712014858, - "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_2": { - "inputs": { - "nixpkgs-lib": [ - "teslamate-flake", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1730504689, - "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "506278e768c2a08bec68eb62932193e341f55c90", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "git-hooks": { - "inputs": { - "flake-compat": [ - "teslamate-flake", - "devenv" - ], - "gitignore": "gitignore", - "nixpkgs": [ - "teslamate-flake", - "devenv", - "nixpkgs" - ], - "nixpkgs-stable": [ - "teslamate-flake", - "devenv" - ] - }, - "locked": { - "lastModified": 1730302582, - "narHash": "sha256-W1MIJpADXQCgosJZT8qBYLRuZls2KSiKdpnTVdKBuvU=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "af8a16fe5c264f5e9e18bcee2859b40a656876cf", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, - "gitignore": { - "inputs": { - "nixpkgs": [ - "teslamate-flake", - "devenv", - "git-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -264,22 +85,6 @@ "type": "github" } }, - "libgit2": { - "flake": false, - "locked": { - "lastModified": 1697646580, - "narHash": "sha256-oX4Z3S9WtJlwvj0uH9HlYcWv+x1hqp8mhXl7HsLu2f0=", - "owner": "libgit2", - "repo": "libgit2", - "rev": "45fd9ed7ae1a9b74b957ef4f337bc3c8b3df01b5", - "type": "github" - }, - "original": { - "owner": "libgit2", - "repo": "libgit2", - "type": "github" - } - }, "local-unstable": { "locked": { "lastModified": 0, @@ -292,40 +97,19 @@ "type": "path" } }, - "nix": { - "inputs": { - "flake-compat": [ - "teslamate-flake", - "devenv" - ], - "flake-parts": "flake-parts", - "libgit2": "libgit2", - "nixpkgs": "nixpkgs_5", - "nixpkgs-23-11": [ - "teslamate-flake", - "devenv" - ], - "nixpkgs-regression": [ - "teslamate-flake", - "devenv" - ], - "pre-commit-hooks": [ - "teslamate-flake", - "devenv" - ] - }, + "nixos-unstable": { "locked": { - "lastModified": 1727438425, - "narHash": "sha256-X8ES7I1cfNhR9oKp06F6ir4Np70WGZU5sfCOuNBEwMg=", - "owner": "domenkozar", - "repo": "nix", - "rev": "f6c5ae4c1b2e411e6b1e6a8181cc84363d6a7546", + "lastModified": 1744932701, + "narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef", "type": "github" }, "original": { - "owner": "domenkozar", - "ref": "devenv-2.24", - "repo": "nix", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef", "type": "github" } }, @@ -347,11 +131,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1745319468, - "narHash": "sha256-0PSi0Zm9YkWbAsvXXDAEHR06w1W+Kvf2/ax7O7UWL8w=", + "lastModified": 1745320116, + "narHash": "sha256-buF0dp2U5gQeBnyIf1pHWVHeAvNZnR8mZ9Ca15R0J94=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "aca270648ecaa9450a6feb34ff2d995e0b0a3444", + "rev": "63351ff5b76b8dd96b16fa7a46afd10376ab7976", "type": "github" }, "original": { @@ -361,22 +145,6 @@ "type": "github" } }, - "nixpkgs-unstable": { - "locked": { - "lastModified": 1744868846, - "narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c", - "type": "github" - } - }, "nixpkgs_2": { "locked": { "lastModified": 1744440957, @@ -409,70 +177,6 @@ "type": "github" } }, - "nixpkgs_4": { - "locked": { - "lastModified": 1730531603, - "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { - "locked": { - "lastModified": 1717432640, - "narHash": "sha256-+f9c4/ZX5MWDOuB1rKoWj+lBNm0z0rs4CK47HBLxy1o=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "88269ab3044128b7c2f4c7d68448b2fb50456870", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "release-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { - "locked": { - "lastModified": 1716977621, - "narHash": "sha256-Q1UQzYcMJH4RscmpTkjlgqQDX5yi1tZL0O345Ri6vXQ=", - "owner": "cachix", - "repo": "devenv-nixpkgs", - "rev": "4267e705586473d3e5c8d50299e71503f16a6fb6", - "type": "github" - }, - "original": { - "owner": "cachix", - "ref": "rolling", - "repo": "devenv-nixpkgs", - "type": "github" - } - }, - "nixpkgs_7": { - "locked": { - "lastModified": 1732014248, - "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nvidia-patch": { "inputs": { "nixpkgs": [ @@ -517,12 +221,11 @@ "agenix-flake": "agenix-flake", "home-manager": "home-manager_2", "local-unstable": "local-unstable", + "nixos-unstable": "nixos-unstable", "nixpkgs": "nixpkgs_2", "nixpkgs-master": "nixpkgs-master", - "nixpkgs-unstable": "nixpkgs-unstable", "nvidia-patch": "nvidia-patch", - "pepeflake": "pepeflake", - "teslamate-flake": "teslamate-flake" + "pepeflake": "pepeflake" } }, "systems": { @@ -555,50 +258,6 @@ "type": "github" } }, - "teslamate-flake": { - "inputs": { - "devenv": "devenv", - "devenv-root": "devenv-root", - "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_7", - "treefmt-nix": "treefmt-nix" - }, - "locked": { - "lastModified": 1732358620, - "narHash": "sha256-diQRtJYfzGIVLxrdBad3XKWCtR97rj9Q1ZJ9MmvJGRk=", - "owner": "teslamate-org", - "repo": "teslamate", - "rev": "0ec408c8e182fe64e9568b6f137cbfb528717e8e", - "type": "github" - }, - "original": { - "owner": "teslamate-org", - "ref": "v1.32.0", - "repo": "teslamate", - "type": "github" - } - }, - "treefmt-nix": { - "inputs": { - "nixpkgs": [ - "teslamate-flake", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1732292307, - "narHash": "sha256-5WSng844vXt8uytT5djmqBCkopyle6ciFgteuA9bJpw=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "705df92694af7093dfbb27109ce16d828a79155f", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, "utils": { "inputs": { "systems": "systems_2" diff --git a/flake.nix b/flake.nix index c8b5354..b70aaf5 100644 --- a/flake.nix +++ b/flake.nix @@ -1,11 +1,10 @@ { inputs = { - nixos-release.url = "github:NixOS/nixpkgs/26d499fc9f1d567283d5d56fcf367edd815dba1d"; + nixpkgs.url = "github:NixOS/nixpkgs/26d499fc9f1d567283d5d56fcf367edd815dba1d"; nixos-unstable.url = "github:NixOS/nixpkgs/b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef"; nixpkgs-master.url = "github:NixOS/nixpkgs/master"; local-unstable.url = "path:///home/giulio/dev/nixpkgs"; pepeflake.url = "git+https://git.giugl.io/peperunas/pepeflake"; - teslamate-flake.url = "github:teslamate-org/teslamate/v1.32.0"; agenix-flake.url = "github:ryantm/agenix"; home-manager = { url = "github:nix-community/home-manager/release-24.11"; @@ -19,12 +18,11 @@ outputs = { self - , nixos-release + , nixpkgs , nixos-unstable , nixpkgs-master , local-unstable , home-manager - , teslamate-flake , nvidia-patch , agenix-flake , pepeflake @@ -64,20 +62,18 @@ unstablePkgs = importNixpkgs { flake = nixos-unstable; }; masterPkgs = importNixpkgs { flake = nixpkgs-master; }; localPkgs = importNixpkgs { flake = local-unstable; }; - teslamatePkgs = importNixpkgs { flake = teslamate-flake; }; agenixPkgs = importNixpkgs { flake = agenix-flake; }; pepePkgs = pepeflake.packages.${system} // pepeflake.legacyPackages.${system} or { }; additionalOverlays = [ (final: prev: { inherit unstablePkgs; }) (final: prev: { inherit localPkgs; }) - (final: prev: { inherit teslamatePkgs; }) (final: prev: { inherit agenixPkgs; }) (final: prev: { inherit masterPkgs; }) (final: prev: { inherit pepePkgs; }) ]; in - import nixos-release { + import nixpkgs { inherit system config; overlays = additionalOverlays ++ extOverlays ++ [ (final: prev: { @@ -95,7 +91,7 @@ inherit (pkgs) newScope; in makeScope newScope (self: rec { - inherit nixos-release home-manager nixos-unstable; + inherit nixpkgs home-manager nixos-unstable; inherit (self.callPackage ./lib/utils.nix { }) mkSysRole mkHomeRole; inherit (user) mkUser; @@ -122,7 +118,6 @@ roles = [ ]; }]; imports = [ - teslamate-flake.nixosModules.default agenix-flake.nixosModules.default ]; }; diff --git a/update_cached_hashes.sh b/update_cached_hashes.sh index 8f0d54b..7081abf 100755 --- a/update_cached_hashes.sh +++ b/update_cached_hashes.sh @@ -49,7 +49,7 @@ update_stable() { update_unstable() { echo "Checking unstable..." - new_hash=$(update_channel "nixpkgs-unstable" "nixpkgs-unstable") + new_hash=$(update_channel "nixos-unstable" "nixos-unstable") if [ -z "$new_hash" ]; then return