From fa0903a2b4b0a36b86bca7f18973a15800f4afac Mon Sep 17 00:00:00 2001 From: emily Date: Tue, 10 Dec 2024 11:46:27 +0100 Subject: [PATCH 1/5] fix: eval --- config/services/arrs/default.nix | 7 +++++++ config/services/hydra/nix-config.nix | 2 +- config/users/emily/default.nix | 2 +- pkgs/build-worker-oci/update.sh | 3 ++- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/config/services/arrs/default.nix b/config/services/arrs/default.nix index 18e241c..f960d2d 100644 --- a/config/services/arrs/default.nix +++ b/config/services/arrs/default.nix @@ -12,6 +12,13 @@ wants = [ "mnt-mezzomix.mount" ]; }); + nixpkgs.config.permittedInsecurePackages = [ + "aspnetcore-runtime-wrapped-6.0.36" + "aspnetcore-runtime-6.0.36" + "dotnet-sdk-wrapped-6.0.428" + "dotnet-sdk-6.0.428" + ]; + systemd.mounts = lib.singleton { description = "rclone mount"; after = [ "network.target" ]; diff --git a/config/services/hydra/nix-config.nix b/config/services/hydra/nix-config.nix index bac6845..0046f13 100644 --- a/config/services/hydra/nix-config.nix +++ b/config/services/hydra/nix-config.nix @@ -17,7 +17,7 @@ hostName = "integra.kyouma.net"; sshUser = "nix-ssh"; maxJobs = 2; - speedFactor = 4; + speedFactor = 24; systems = [ "aarch64-linux" ]; supportedFeatures = base ++ aarch64; sshKey = config.sops.secrets."services/hydra/id_ed25519_hydra".path; diff --git a/config/users/emily/default.nix b/config/users/emily/default.nix index aace445..0dc1d75 100644 --- a/config/users/emily/default.nix +++ b/config/users/emily/default.nix @@ -52,7 +52,7 @@ #ubuntu_font_family libsForQt5.breeze-icons - (nerdfonts.override { fonts = [ "NerdFontsSymbolsOnly" ]; }) + nerd-fonts.symbols-only jetbrains-mono font-awesome ]; diff --git a/pkgs/build-worker-oci/update.sh b/pkgs/build-worker-oci/update.sh index 8661b14..e97ec44 100755 --- a/pkgs/build-worker-oci/update.sh +++ b/pkgs/build-worker-oci/update.sh @@ -29,4 +29,5 @@ skopeo --insecure-policy copy docker-archive:"result" \ rm "result" -fly deploy +fly deploy --app build-worker-kyoumanet +fly deploy --app build-worker-kyoumanet-cdg From a93501e34a26147311dcccdd668d268bd0829103 Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Wed, 11 Dec 2024 14:16:31 +0100 Subject: [PATCH 2/5] =?UTF-8?q?hydra:=20Re=E2=80=90enable=20building=20on?= =?UTF-8?q?=20schrodinger?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/services/hydra/nix-config.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/services/hydra/nix-config.nix b/config/services/hydra/nix-config.nix index 0046f13..03bb8f6 100644 --- a/config/services/hydra/nix-config.nix +++ b/config/services/hydra/nix-config.nix @@ -25,7 +25,7 @@ { hostName = "schrodinger.kyouma.net"; sshUser = "root"; - maxJobs = 0; + maxJobs = 2; speedFactor = 20; systems = [ "riscv64-linux" ]; supportedFeatures = base ++ riscv64; From 71ca6508a1e3f2f6fb378392d94249e860b941ef Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Wed, 11 Dec 2024 14:35:06 +0100 Subject: [PATCH 3/5] Encode native/qemu emulation support in system features --- config/services/hydra/nix-config.nix | 7 ++++--- pkgs/build-worker-oci/default.nix | 6 ++++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/config/services/hydra/nix-config.nix b/config/services/hydra/nix-config.nix index 03bb8f6..410b29f 100644 --- a/config/services/hydra/nix-config.nix +++ b/config/services/hydra/nix-config.nix @@ -19,7 +19,7 @@ maxJobs = 2; speedFactor = 24; systems = [ "aarch64-linux" ]; - supportedFeatures = base ++ aarch64; + supportedFeatures = base ++ aarch64 ++ [ "aarch64-linux-native" ]; sshKey = config.sops.secrets."services/hydra/id_ed25519_hydra".path; } { @@ -28,7 +28,7 @@ maxJobs = 2; speedFactor = 20; systems = [ "riscv64-linux" ]; - supportedFeatures = base ++ riscv64; + supportedFeatures = base ++ riscv64 ++ [ "riscv64-linux-native" ]; sshKey = config.sops.secrets."services/hydra/id_ed25519_hydra".path; } ] ++ lib.forEach (lib.range 0 11) (num: { @@ -39,7 +39,8 @@ systems = [ "i686-linux" "x86_64-linux" ] ++ lib.optionals (lib.mod num 5 == 0) [ "aarch64-linux" "riscv64-linux" ]; supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" ] ++ x86-64 - ++ lib.optionals (lib.mod num 5 == 0) (aarch64 ++ riscv64); + ++ lib.optionals (lib.mod num 5 == 0) (aarch64 ++ riscv64 + ++ [ "aarch64-linux-qemu" "riscv64-linux-qemu" "x86_64-linux-native" "i686-linux-native" ]); sshKey = config.sops.secrets."services/hydra/id_ed25519_hydra".path; }); nixpkgs.config.allowUnsupportedSystem = true; diff --git a/pkgs/build-worker-oci/default.nix b/pkgs/build-worker-oci/default.nix index edba41f..63ade14 100644 --- a/pkgs/build-worker-oci/default.nix +++ b/pkgs/build-worker-oci/default.nix @@ -32,6 +32,7 @@ dockerTools.buildLayeredImage { "big-parallel" "nixos-test" "uid-range" + "gccarch-x86-64" "gccarch-x86-64-v2" "gccarch-x86-64-v3" @@ -42,6 +43,11 @@ dockerTools.buildLayeredImage { "gccarch-rv64imac" "gccarch-rv64imacfd" "gccarch-rv64gc" + + "riscv64-linux-qemu" + "aarch64-linux-qemu" + "x86_64-linux-native" + "i686-linux-native" ]; in '' mkdir -p /root From 4c52bee6a4cedaf3b867fd75e01ffb52e779ed44 Mon Sep 17 00:00:00 2001 From: emily Date: Wed, 11 Dec 2024 16:41:02 +0100 Subject: [PATCH 4/5] lucy: add ssh key --- config/users/lucy/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/config/users/lucy/default.nix b/config/users/lucy/default.nix index 5035c4d..25d54c7 100644 --- a/config/users/lucy/default.nix +++ b/config/users/lucy/default.nix @@ -11,6 +11,7 @@ openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIId7XvwEHtC9KdGg4Bn+XE+yyBp7/dRToJX9T56mM7ln kosaki@kosaki" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAZH8HwE1OxVAArRpc3+c7foYJ/WYjp4BqUyuab9yQyl emilia@emilia" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOdONA7yQMPvEgdeCi3uYh4J6K0U5sk/DcwHNa9jv+Jb minorin@kotori" ]; }; From 973de61779ee3e30808562ccf6197d51df152a8a Mon Sep 17 00:00:00 2001 From: Update Bot Date: Thu, 12 Dec 2024 04:20:23 +0100 Subject: [PATCH 5/5] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'dns': 'github:kirelagin/dns.nix/a3196708a56dee76186a9415c187473b94e6cbae' (2024-09-20) → 'github:kirelagin/dns.nix/a23f43f9762aa96d3e35c8eeefa7610bd0cdf456' (2024-12-11) • Updated input 'firefox': 'git+https://woof.rip/mikael/firefox.git?ref=refs/heads/main&rev=176c87bbd0de2ffb6b1409c0aa107eed488166ce' (2024-11-30) → 'git+https://woof.rip/mikael/firefox.git?ref=refs/heads/main&rev=06ca44342aceb731f8a7362070172ce138b196ae' (2024-12-11) • Removed input 'firefox/eosyn' • Removed input 'firefox/eosyn/lix' • Removed input 'firefox/eosyn/lix-module' • Removed input 'firefox/eosyn/lix-module/flake-utils' • Removed input 'firefox/eosyn/lix-module/flake-utils/systems' • Removed input 'firefox/eosyn/lix-module/flakey-profile' • Removed input 'firefox/eosyn/lix-module/lix' • Removed input 'firefox/eosyn/lix-module/nixpkgs' • Removed input 'firefox/eosyn/nixpkgs' • Added input 'firefox/nixpkgs': follows 'nixpkgs' • Updated input 'home-manager': 'github:nix-community/home-manager/bf23fe41082aa0289c209169302afd3397092f22' (2024-12-02) → 'github:nix-community/home-manager/6e5b2d9e8014b5572e3367937a329e7053458d34' (2024-12-11) • Updated input 'nixos-hardware': 'github:nixos/nixos-hardware/c6c90887f84c02ce9ebf33b95ca79ef45007bf88' (2024-12-02) → 'github:nixos/nixos-hardware/cf737e2eba82b603f54f71b10cb8fd09d22ce3f5' (2024-12-10) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/ac35b104800bff9028425fec3b6e8a41de2bbfff' (2024-12-01) → 'github:nixos/nixpkgs/a73246e2eef4c6ed172979932bc80e1404ba2d56' (2024-12-09) • Updated input 'nixvim': 'github:nix-community/nixvim/e680b367c726e2ae37d541328fe81f8daaf49a6c' (2024-12-02) → 'github:nix-community/nixvim/c7b109f5af93f8e59148a1a4838f3472f8ae403d' (2024-12-11) • Updated input 'nixvim/flake-parts': 'github:hercules-ci/flake-parts/506278e768c2a08bec68eb62932193e341f55c90' (2024-11-01) → 'github:hercules-ci/flake-parts/205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9' (2024-12-04) • Updated input 'nixvim/git-hooks': 'github:cachix/git-hooks.nix/3308484d1a443fc5bc92012435d79e80458fe43c' (2024-11-19) → 'github:cachix/git-hooks.nix/6f4e2a2112050951a314d2733a994fbab94864c6' (2024-12-04) • Updated input 'nixvim/nix-darwin': 'github:lnl7/nix-darwin/c6b65d946097baf3915dd51373251de98199280d' (2024-12-02) → 'github:lnl7/nix-darwin/a35b08d09efda83625bef267eb24347b446c80b8' (2024-12-07) • Updated input 'nixvim/nuschtosSearch': 'github:NuschtOS/search/16307548b7a1247291c84ae6a12c0aacb07dfba2' (2024-11-30) → 'github:NuschtOS/search/68e9fad70d95d08156cf10a030bd39487bed8ffe' (2024-12-05) • Updated input 'nixvim/treefmt-nix': 'github:numtide/treefmt-nix/6209c381904cab55796c5d7350e89681d3b2a8ef' (2024-11-29) → 'github:numtide/treefmt-nix/50862ba6a8a0255b87377b9d2d4565e96f29b410' (2024-12-05) • Updated input 'sops-nix': 'github:Mic92/sops-nix/c6134b6fff6bda95a1ac872a2a9d5f32e3c37856' (2024-12-02) → 'github:Mic92/sops-nix/2d73fc6ac4eba4b9a83d3cb8275096fbb7ab4004' (2024-12-12) • Updated input 'stylix': 'github:danth/stylix/74ee1ed5057e44edbcc36aa189a91d31eda60485' (2024-12-02) → 'github:danth/stylix/bc25f3d69d3bb54548b772d7c2771e65cc37dc10' (2024-12-10) • Updated input 'stylix/gnome-shell': 'github:GNOME/gnome-shell/0d0aadf013f78a7f7f1dc984d0d812971864b934' (2024-04-21) → 'github:GNOME/gnome-shell/dadd58f630eeea41d645ee225a63f719390829dc' (2024-11-23) --- flake.lock | 271 +++++++++++++++-------------------------------------- 1 file changed, 74 insertions(+), 197 deletions(-) diff --git a/flake.lock b/flake.lock index fac8c0e..5cdda6b 100644 --- a/flake.lock +++ b/flake.lock @@ -179,11 +179,11 @@ ] }, "locked": { - "lastModified": 1726867691, - "narHash": "sha256-IK3r16N9pizf53AipOmrcrcyjVsPJwC4PI5hIqEyKwQ=", + "lastModified": 1733919067, + "narHash": "sha256-ZsL5pKwEDhcZhVJh+3IwgHus7kSW/N8qOlBscwB6BCI=", "owner": "kirelagin", "repo": "dns.nix", - "rev": "a3196708a56dee76186a9415c187473b94e6cbae", + "rev": "a23f43f9762aa96d3e35c8eeefa7610bd0cdf456", "type": "github" }, "original": { @@ -192,26 +192,6 @@ "type": "github" } }, - "eosyn": { - "inputs": { - "lix": "lix", - "lix-module": "lix-module", - "nixpkgs": "nixpkgs_2" - }, - "locked": { - "lastModified": 1732923952, - "narHash": "sha256-oS6F3lWehOixM7Zb6m8wOWVoJ+4WhO6DeyXvigCvFA0=", - "ref": "refs/heads/main", - "rev": "811b0cd5ec81d3c56ede883dd0ba9ef95ffffc12", - "revCount": 1, - "type": "git", - "url": "https://woof.rip/mikael/eosyn.git" - }, - "original": { - "type": "git", - "url": "https://woof.rip/mikael/eosyn.git" - } - }, "fernglas": { "inputs": { "communities": "communities", @@ -236,14 +216,16 @@ }, "firefox": { "inputs": { - "eosyn": "eosyn" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { - "lastModified": 1732960715, - "narHash": "sha256-Q/2f3Vx3O2/0vFlx/KbkdijHOCV9vCDr4wEFjzi7spI=", + "lastModified": 1733922313, + "narHash": "sha256-1+80hQhpCHwpCWhUHk8IPDmhDoBn8xkFEQa7cha3WIc=", "ref": "refs/heads/main", - "rev": "176c87bbd0de2ffb6b1409c0aa107eed488166ce", - "revCount": 4, + "rev": "06ca44342aceb731f8a7362070172ce138b196ae", + "revCount": 1, "type": "git", "url": "https://woof.rip/mikael/firefox.git" }, @@ -365,11 +347,11 @@ ] }, "locked": { - "lastModified": 1730504689, - "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "506278e768c2a08bec68eb62932193e341f55c90", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "type": "github" }, "original": { @@ -400,24 +382,6 @@ "inputs": { "systems": "systems_2" }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { - "inputs": { - "systems": "systems_3" - }, "locked": { "lastModified": 1726560853, "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", @@ -432,9 +396,9 @@ "type": "github" } }, - "flake-utils_4": { + "flake-utils_3": { "inputs": { - "systems": "systems_4" + "systems": "systems_3" }, "locked": { "lastModified": 1731533236, @@ -450,7 +414,7 @@ "type": "github" } }, - "flake-utils_5": { + "flake-utils_4": { "inputs": { "systems": [ "stylix", @@ -486,21 +450,6 @@ "type": "github" } }, - "flakey-profile_2": { - "locked": { - "lastModified": 1712898590, - "narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=", - "owner": "lf-", - "repo": "flakey-profile", - "rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d", - "type": "github" - }, - "original": { - "owner": "lf-", - "repo": "flakey-profile", - "type": "github" - } - }, "florp-about": { "inputs": { "nixpkgs": [ @@ -594,11 +543,11 @@ ] }, "locked": { - "lastModified": 1732021966, - "narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=", + "lastModified": 1733318908, + "narHash": "sha256-SVQVsbafSM1dJ4fpgyBqLZ+Lft+jcQuMtEL3lQWx2Sk=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "3308484d1a443fc5bc92012435d79e80458fe43c", + "rev": "6f4e2a2112050951a314d2733a994fbab94864c6", "type": "github" }, "original": { @@ -632,16 +581,16 @@ "gnome-shell": { "flake": false, "locked": { - "lastModified": 1713702291, - "narHash": "sha256-zYP1ehjtcV8fo+c+JFfkAqktZ384Y+y779fzmR9lQAU=", + "lastModified": 1732369855, + "narHash": "sha256-JhUWbcYPjHO3Xs3x9/Z9RuqXbcp5yhPluGjwsdE2GMg=", "owner": "GNOME", "repo": "gnome-shell", - "rev": "0d0aadf013f78a7f7f1dc984d0d812971864b934", + "rev": "dadd58f630eeea41d645ee225a63f719390829dc", "type": "github" }, "original": { "owner": "GNOME", - "ref": "46.1", + "ref": "47.2", "repo": "gnome-shell", "type": "github" } @@ -653,11 +602,11 @@ ] }, "locked": { - "lastModified": 1733175814, - "narHash": "sha256-zFOtOaqjzZfPMsm1mwu98syv3y+jziAq5DfWygaMtLg=", + "lastModified": 1733951607, + "narHash": "sha256-CN6q6iCzxI1gkNyk4xLdwaMKi10r7n+aJkRzWj8PXwQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "bf23fe41082aa0289c209169302afd3397092f22", + "rev": "6e5b2d9e8014b5572e3367937a329e7053458d34", "type": "github" }, "original": { @@ -672,7 +621,7 @@ "lix" ], "nix-eval-jobs": "nix-eval-jobs", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1728215710, @@ -742,51 +691,30 @@ } }, "lix": { - "flake": false, + "inputs": { + "flake-compat": "flake-compat_2", + "nix2container": "nix2container", + "nixpkgs": "nixpkgs_3", + "nixpkgs-regression": "nixpkgs-regression", + "pre-commit-hooks": "pre-commit-hooks" + }, "locked": { - "lastModified": 1732806742, - "narHash": "sha256-2RNOVB3UIIxxjiFKrEqSgnSoHK+olbw2o5g/63dDjJ8=", - "rev": "f5754dc90ae9b1207656d0e29ad2704d3ef1e554", + "lastModified": 1729298361, + "narHash": "sha256-hiGtfzxFkDc9TSYsb96Whg0vnqBVV7CUxyscZNhed0U=", + "rev": "ad9d06f7838a25beec425ff406fe68721fef73be", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/f5754dc90ae9b1207656d0e29ad2704d3ef1e554.tar.gz?rev=f5754dc90ae9b1207656d0e29ad2704d3ef1e554" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/ad9d06f7838a25beec425ff406fe68721fef73be.tar.gz?rev=ad9d06f7838a25beec425ff406fe68721fef73be" }, "original": { "type": "tarball", - "url": "https://git.lix.systems/lix-project/lix/archive/main.tar.gz" + "url": "https://git.lix.systems/lix-project/lix/archive/2.91.1.tar.gz" } }, "lix-module": { "inputs": { - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_2", "flakey-profile": "flakey-profile", - "lix": [ - "firefox", - "eosyn", - "lix" - ], - "nixpkgs": [ - "firefox", - "eosyn", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1732603698, - "narHash": "sha256-Jw2MhzgCCrKV2MJytehG0cCLIAosBX71p8qmQ6XQlR4=", - "rev": "15b999f9c958c475f71fb8c543b9fc2f36ae8730", - "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/15b999f9c958c475f71fb8c543b9fc2f36ae8730.tar.gz?rev=15b999f9c958c475f71fb8c543b9fc2f36ae8730" - }, - "original": { - "type": "tarball", - "url": "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz" - } - }, - "lix-module_2": { - "inputs": { - "flake-utils": "flake-utils_3", - "flakey-profile": "flakey-profile_2", - "lix": "lix_3", + "lix": "lix_2", "nixpkgs": [ "nixpkgs" ] @@ -804,26 +732,6 @@ } }, "lix_2": { - "inputs": { - "flake-compat": "flake-compat_2", - "nix2container": "nix2container", - "nixpkgs": "nixpkgs_4", - "nixpkgs-regression": "nixpkgs-regression", - "pre-commit-hooks": "pre-commit-hooks" - }, - "locked": { - "lastModified": 1729298361, - "narHash": "sha256-hiGtfzxFkDc9TSYsb96Whg0vnqBVV7CUxyscZNhed0U=", - "rev": "ad9d06f7838a25beec425ff406fe68721fef73be", - "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/ad9d06f7838a25beec425ff406fe68721fef73be.tar.gz?rev=ad9d06f7838a25beec425ff406fe68721fef73be" - }, - "original": { - "type": "tarball", - "url": "https://git.lix.systems/lix-project/lix/archive/2.91.1.tar.gz" - } - }, - "lix_3": { "flake": false, "locked": { "lastModified": 1729298361, @@ -845,11 +753,11 @@ ] }, "locked": { - "lastModified": 1733105089, - "narHash": "sha256-Qs3YmoLYUJ8g4RkFj2rMrzrP91e4ShAioC9s+vG6ENM=", + "lastModified": 1733570843, + "narHash": "sha256-sQJAxY1TYWD1UyibN/FnN97paTFuwBw3Vp3DNCyKsMk=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "c6b65d946097baf3915dd51373251de98199280d", + "rev": "a35b08d09efda83625bef267eb24347b446c80b8", "type": "github" }, "original": { @@ -947,11 +855,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1733139194, - "narHash": "sha256-PVQW9ovo0CJbhuhCsrhFJGGdD1euwUornspKpBIgdok=", + "lastModified": 1733861262, + "narHash": "sha256-+jjPup/ByS0LEVIrBbt7FnGugJgLeG9oc+ivFASYn2U=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "c6c90887f84c02ce9ebf33b95ca79ef45007bf88", + "rev": "cf737e2eba82b603f54f71b10cb8fd09d22ce3f5", "type": "github" }, "original": { @@ -1029,22 +937,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1732617236, - "narHash": "sha256-PYkz6U0bSEaEB1al7O1XsqVNeSNS+s3NVclJw7YC43w=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "af51545ec9a44eadf3fe3547610a5cdd882bc34e", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1725001927, "narHash": "sha256-eV+63gK0Mp7ygCR0Oy4yIYSNcum2VQwnZamHxYTNi+M=", @@ -1060,7 +952,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1721931987, "narHash": "sha256-1Zg8LY0T5EfXtv0Kf4M6SFnjH7Eto4VV+EKJ/YSnhiI=", @@ -1076,13 +968,13 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { - "lastModified": 1733015953, - "narHash": "sha256-t4BBVpwG9B4hLgc6GUBuj3cjU7lP/PJfpTHuSqE+crk=", + "lastModified": 1733759999, + "narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ac35b104800bff9028425fec3b6e8a41de2bbfff", + "rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56", "type": "github" }, "original": { @@ -1109,11 +1001,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1733132296, - "narHash": "sha256-fYEf0IgsNJp/hcb+C3FKtJvVabPDQs64hdL0izNBwXc=", + "lastModified": 1733953545, + "narHash": "sha256-1UsUuIfq0ywIxmYBJdIi6tFFmpR/RtOBQVijARaaX68=", "owner": "nix-community", "repo": "nixvim", - "rev": "e680b367c726e2ae37d541328fe81f8daaf49a6c", + "rev": "c7b109f5af93f8e59148a1a4838f3472f8ae403d", "type": "github" }, "original": { @@ -1124,7 +1016,7 @@ }, "nuschtosSearch": { "inputs": { - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_3", "ixx": "ixx", "nixpkgs": [ "nixvim", @@ -1132,11 +1024,11 @@ ] }, "locked": { - "lastModified": 1733006402, - "narHash": "sha256-BC1CecAQISV5Q4LZK72Gx0+faemOwaChiD9rMVfDPoA=", + "lastModified": 1733411491, + "narHash": "sha256-315rJ7O9cOllPDaFscnJhcMleORHbxon0Kq9LAKJ5p4=", "owner": "NuschtOS", "repo": "search", - "rev": "16307548b7a1247291c84ae6a12c0aacb07dfba2", + "rev": "68e9fad70d95d08156cf10a030bd39487bed8ffe", "type": "github" }, "original": { @@ -1191,18 +1083,18 @@ "dns": "dns", "fernglas": "fernglas", "firefox": "firefox", - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "florp-about": "florp-about", "florp-branding": "florp-branding", "florp-moderation": "florp-moderation", "home-manager": "home-manager", "hydra": "hydra", "kyouma-www": "kyouma-www", - "lix": "lix_2", - "lix-module": "lix-module_2", + "lix": "lix", + "lix-module": "lix-module", "nixos-hardware": "nixos-hardware", "nixos-needsreboot": "nixos-needsreboot", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "nixvim": "nixvim", "oth": "oth", "sops-nix": "sops-nix", @@ -1216,11 +1108,11 @@ ] }, "locked": { - "lastModified": 1733128155, - "narHash": "sha256-m6/qwJAJYcidGMEdLqjKzRIjapK4nUfMq7rDCTmZajc=", + "lastModified": 1733965552, + "narHash": "sha256-GZ4YtqkfyTjJFVCub5yAFWsHknG1nS/zfk7MuHht4Fs=", "owner": "Mic92", "repo": "sops-nix", - "rev": "c6134b6fff6bda95a1ac872a2a9d5f32e3c37856", + "rev": "2d73fc6ac4eba4b9a83d3cb8275096fbb7ab4004", "type": "github" }, "original": { @@ -1236,7 +1128,7 @@ "base16-helix": "base16-helix", "base16-vim": "base16-vim", "flake-compat": "flake-compat_4", - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_4", "gnome-shell": "gnome-shell", "home-manager": [ "home-manager" @@ -1244,17 +1136,17 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_5", + "systems": "systems_4", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-tmux": "tinted-tmux" }, "locked": { - "lastModified": 1733153724, - "narHash": "sha256-28nueT0pl+YpwUey44InOqct4+7p+DkiKOfkBBDCOeU=", + "lastModified": 1733858997, + "narHash": "sha256-PMZdRUZQlouWgHFCFW8ANDFL6fUjZ67KAEaqRXwRwvc=", "owner": "danth", "repo": "stylix", - "rev": "74ee1ed5057e44edbcc36aa189a91d31eda60485", + "rev": "bc25f3d69d3bb54548b772d7c2771e65cc37dc10", "type": "github" }, "original": { @@ -1323,21 +1215,6 @@ "type": "github" } }, - "systems_5": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "tinted-foot": { "flake": false, "locked": { @@ -1418,11 +1295,11 @@ ] }, "locked": { - "lastModified": 1732894027, - "narHash": "sha256-2qbdorpq0TXHBWbVXaTqKoikN4bqAtAplTwGuII+oAc=", + "lastModified": 1733440889, + "narHash": "sha256-qKL3vjO+IXFQ0nTinFDqNq/sbbnnS5bMI1y0xX215fU=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "6209c381904cab55796c5d7350e89681d3b2a8ef", + "rev": "50862ba6a8a0255b87377b9d2d4565e96f29b410", "type": "github" }, "original": {