diff --git a/flake.lock b/flake.lock index 67a5046d..77c6027c 100644 --- a/flake.lock +++ b/flake.lock @@ -50,11 +50,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1685309025, - "narHash": "sha256-pZxMM3AMP/ojwhrFD0A2ML4NOgehlBLGHseInnO5evc=", + "lastModified": 1686620679, + "narHash": "sha256-Ck/r3f+W9mOn3cHn5ii/fogBiJtosFnDaOQveaJ0zVU=", "owner": "zhaofengli", "repo": "attic", - "rev": "b1fb790b5f2afaaa1b2f7f18979b8318abe604bb", + "rev": "4fedffe6a1020edfcfa7bef18d21321d4983b3a7", "type": "github" }, "original": { @@ -175,39 +175,6 @@ } }, "crane_2": { - "inputs": { - "flake-compat": [ - "lanzaboote", - "flake-compat" - ], - "flake-utils": [ - "lanzaboote", - "flake-utils" - ], - "nixpkgs": [ - "lanzaboote", - "nixpkgs" - ], - "rust-overlay": [ - "lanzaboote", - "rust-overlay" - ] - }, - "locked": { - "lastModified": 1683505101, - "narHash": "sha256-VBU64Jfu2V4sUR5+tuQS9erBRAe/QEYUxdVMcJGMZZs=", - "owner": "ipetkov", - "repo": "crane", - "rev": "7b5bd9e5acb2bb0cfba2d65f34d8568a894cdb6c", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, - "crane_3": { "flake": false, "locked": { "lastModified": 1670284777, @@ -243,7 +210,7 @@ "inputs": { "alejandra": "alejandra", "all-cabal-json": "all-cabal-json", - "crane": "crane_3", + "crane": "crane_2", "devshell": "devshell", "flake-parts": "flake-parts_2", "flake-utils-pre-commit": "flake-utils-pre-commit", @@ -698,11 +665,11 @@ ] }, "locked": { - "lastModified": 1686391840, - "narHash": "sha256-5S0APl6Mfm6a37taHwvuf11UHnAX0+PnoWQbsYbMUnc=", + "lastModified": 1686639065, + "narHash": "sha256-ZBDPI1GCsZaQBzPd6zjowqfNj58sRE+PTpZiThQCj68=", "owner": "nix-community", "repo": "home-manager", - "rev": "0144ac418ef633bfc9dbd89b8c199ad3a617c59f", + "rev": "d437f0d4e0f72fe76688142e954a4a9b61ac9833", "type": "github" }, "original": { @@ -713,22 +680,20 @@ }, "lanzaboote": { "inputs": { - "crane": "crane_2", "flake-compat": "flake-compat_4", "flake-parts": "flake-parts", "flake-utils": "flake-utils_3", "nixpkgs": [ "nixpkgs" ], - "pre-commit-hooks-nix": "pre-commit-hooks-nix", - "rust-overlay": "rust-overlay_2" + "pre-commit-hooks-nix": "pre-commit-hooks-nix" }, "locked": { - "lastModified": 1686415556, - "narHash": "sha256-88nOOiLYzYGIMEiQ91DxuyUa786mqunRw6k6GipXmxg=", + "lastModified": 1686559216, + "narHash": "sha256-8yFA8F8dqUziMgd94DUSM4ljCgudcMYyWeaqdHFUvWE=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "9f97a908e4059221d39c7b7d0906c88b9fcc9c9b", + "rev": "59e3ebb19fdd3fd235d8275b008538a72872bad7", "type": "github" }, "original": { @@ -924,11 +889,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1685012353, - "narHash": "sha256-U3oOge4cHnav8OLGdRVhL45xoRj4Ppd+It6nPC9nNIU=", + "lastModified": 1686519857, + "narHash": "sha256-VkBhuq67aXXiCoEmicziuDLUPPjeOTLQoj6OeVai5zM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "aeb75dba965e790de427b73315d5addf91a54955", + "rev": "6b1b72c0f887a478a5aac355674ff6df0fc44f44", "type": "github" }, "original": { @@ -1067,22 +1032,6 @@ "type": "github" } }, - "nixpkgs_22-11": { - "locked": { - "lastModified": 1686476475, - "narHash": "sha256-W9yUePvCSDghn+YUXewuodyPxt+kJl/a7zdY4Q6r4MU=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "eef86b8a942913a828b9ef13722835f359deef29", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-22.11", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_3": { "locked": { "lastModified": 1680668850, @@ -1101,18 +1050,17 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1686496983, - "narHash": "sha256-DX7PZwzBVHQpwG4vK5zUa61/RFk2BQb3uTxJQg2wiM0=", - "owner": "nixos", + "lastModified": 1686587353, + "narHash": "sha256-LW8lIsKj+Y9jM25p15kdokqBHK+R7YpA/FmV2x379D8=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "3d318cb303f285d2964d4137619cb21ddd56cfd5", + "rev": "3463e24e1d1df4d9f47c6e74e62864f915010db2", "type": "github" }, "original": { - "owner": "nixos", + "id": "nixpkgs", "ref": "nixos-unstable-small", - "repo": "nixpkgs", - "type": "github" + "type": "indirect" } }, "nixpkgs_5": { @@ -1193,6 +1141,21 @@ "type": "github" } }, + "nixpkgs_stable": { + "locked": { + "lastModified": 1686431482, + "narHash": "sha256-oPVQ/0YP7yC2ztNsxvWLrV+f0NQ2QAwxbrZ+bgGydEM=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d3bb401dcfc5a46ce51cdfb5762e70cc75d082d2", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-23.05", + "type": "indirect" + } + }, "nixvim": { "inputs": { "beautysh": "beautysh", @@ -1201,11 +1164,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1686407073, - "narHash": "sha256-FFDLQgHsuGQJlqYs8CwDIHhRszDyX0Xb1wjbCwGQVdI=", + "lastModified": 1686566878, + "narHash": "sha256-GzGegnA1zl3GAp0m1fXPu1RRRpQ4wCi2WcNCsnTr81s=", "owner": "pta2002", "repo": "nixvim", - "rev": "a2ef858ea5599dc547011c19c40a962bc72a80e7", + "rev": "895998b5a74c6123c26ea6e2c6af766057428551", "type": "github" }, "original": { @@ -1216,11 +1179,11 @@ }, "nur": { "locked": { - "lastModified": 1686551572, - "narHash": "sha256-F6LQMUbXBohE9gxB4jpfyJ6aQsWMKH8DQGYnYzlTW8M=", + "lastModified": 1686639909, + "narHash": "sha256-cc7sdnDgyf87uy+vzhOqRPTKEE91a3mKd5mByakuI2I=", "owner": "nix-community", "repo": "NUR", - "rev": "d5d81b26c82b80b05d5d64c442b79fb45428cb00", + "rev": "588cf2f61a156266463a2291e3c63d838f992fca", "type": "github" }, "original": { @@ -1316,11 +1279,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1682596858, - "narHash": "sha256-Hf9XVpqaGqe/4oDGr30W8HlsWvJXtMsEPHDqHZA6dDg=", + "lastModified": 1684842236, + "narHash": "sha256-rYWsIXHvNhVQ15RQlBUv67W3YnM+Pd+DuXGMvCBq2IE=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "fb58866e20af98779017134319b5663b8215d912", + "rev": "61e567d6497bc9556f391faebe5e410e6623217f", "type": "github" }, "original": { @@ -1387,7 +1350,7 @@ "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_4", - "nixpkgs_22-11": "nixpkgs_22-11", + "nixpkgs_stable": "nixpkgs_stable", "nixvim": "nixvim", "nur": "nur", "riff": "riff", @@ -1457,31 +1420,6 @@ "type": "github" } }, - "rust-overlay_2": { - "inputs": { - "flake-utils": [ - "lanzaboote", - "flake-utils" - ], - "nixpkgs": [ - "lanzaboote", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1684030847, - "narHash": "sha256-z4tOxaN9Cl8C80u6wyZBpPt9A9MbL21fZ3zdB/vG+AU=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "aa1480f16bec7dda3c62b8cdb184c7e823331ba2", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, "stable": { "locked": { "lastModified": 1669735802, diff --git a/flake.nix b/flake.nix index 0b658d39..885e1e63 100644 --- a/flake.nix +++ b/flake.nix @@ -5,9 +5,9 @@ # * https://github.com/Infinidoge/nix-minecraft inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable-small"; + nixpkgs.url = "nixpkgs/nixos-unstable-small"; - nixpkgs_22-11.url = "github:nixos/nixpkgs/nixos-22.11"; + nixpkgs_stable.url = "nixpkgs/nixos-23.05"; nur.url = "github:nix-community/NUR"; @@ -46,7 +46,7 @@ attic.url = "github:zhaofengli/attic"; }; - outputs = { self, nixpkgs, nixpkgs_22-11, vault-secrets, colmena + outputs = { self, nixpkgs, nixpkgs_stable, vault-secrets, colmena , nixos-generators, nur, attic, ... }@inputs: let inherit (nixpkgs) lib; @@ -62,13 +62,13 @@ overlays = [ (import ./nixos/pkgs) vault-secrets.overlay nur.overlay ]; }; - pkgs_22-11 = import nixpkgs_22-11 { + pkgs_stable = import nixpkgs_stable { inherit system; config.allowUnfree = true; }; # Define args each module gets access to (access to hosts is useful for DNS/DHCP) - specialArgs = { inherit hosts flat_hosts inputs pkgs_22-11; }; + specialArgs = { inherit hosts flat_hosts inputs pkgs_stable; }; # Script to apply local colmena deployments apply-local = pkgs.writeShellScriptBin "apply-local" ''