From ed3c9c2c7ed682753c1291939c83ecff73cb0270 Mon Sep 17 00:00:00 2001 From: emily Date: Tue, 10 Sep 2024 10:45:08 +0200 Subject: [PATCH 1/2] Use lix everywhere --- config/common/default.nix | 6 +++--- config/services/hydra/default.nix | 6 +----- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/config/common/default.nix b/config/common/default.nix index ac0d79e..2c1c731 100644 --- a/config/common/default.nix +++ b/config/common/default.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, inputs, lib, pkgs, ... }: with lib; { imports = [ @@ -7,6 +7,7 @@ with lib; { ./openssh.nix ./users ../../modules + inputs.lix-module.nixosModules.default ]; environment.systemPackages = with pkgs; [ kitty.terminfo @@ -53,7 +54,6 @@ with lib; { ''; users.motdFile = "/var/lib/deployment/motd"; - nix.package = pkgs.nixVersions.latest; nix.gc.automatic = true; nix.gc.options = "--delete-older-than 7d"; nix.optimise.automatic = true; @@ -62,7 +62,7 @@ with lib; { path = pkgs.path; }; nix.settings = { - experimental-features = [ "nix-command" "flakes" "pipe-operators" ]; + experimental-features = [ "nix-command" "flakes" "pipe-operator" ]; trusted-users = [ "root" "@wheel" ]; substituters = [ "https://cache.kyouma.net" ]; trusted-public-keys = [ "cache.kyouma.net:Frjwu4q1rnwE/MnSTmX9yx86GNA/z3p/oElGvucLiZg=" ]; diff --git a/config/services/hydra/default.nix b/config/services/hydra/default.nix index 6279c58..103c0ad 100644 --- a/config/services/hydra/default.nix +++ b/config/services/hydra/default.nix @@ -1,7 +1,6 @@ { config, inputs, lib, ... }: { imports = [ ./nix-config.nix - inputs.lix-module.nixosModules.default ]; sops.secrets."services/hydra/signKey" = { owner = "hydra-queue-runner"; @@ -19,9 +18,6 @@ }; kyouma.deployment.auto-upgrade.cache = "daemon"; - nix.package = lib.mkForce inputs.lix-module.packages.${config.nixpkgs.hostPlatform.system}.default; - nix.settings.experimental-features = lib.mkForce [ "nix-command" "flakes" "pipe-operator" ]; - services.hydra = { enable = true; package = inputs.hydra.packages.${config.nixpkgs.hostPlatform.system}.hydra; @@ -40,7 +36,7 @@ }; services.harmonia = { enable = true; - signKeyPath = config.sops.secrets."services/hydra/signKey".path; + signKeyPaths = lib.singleton config.sops.secrets."services/hydra/signKey".path; settings = { bind = "[::1]:5555"; }; From bd246c40223de70e8fb09224d8c00c08a6396d89 Mon Sep 17 00:00:00 2001 From: Update Bot Date: Tue, 10 Sep 2024 11:19:41 +0200 Subject: [PATCH 2/2] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'attic': 'github:zhaofengli/attic/f74cee00364a36e4db8d05dc9c98391e18d9b4f8' (2024-08-30) → 'github:zhaofengli/attic/aec90814a4ecbc40171d57eeef97c5cab4aaa7b4' (2024-09-08) • Removed input 'attic/flake-utils' • Updated input 'disko': 'github:nix-community/disko/96073e6423623d4a8027e9739d2af86d6422ea7a' (2024-09-02) → 'github:nix-community/disko/e55f9a8678adc02024a4877c2a403e3f6daf24fe' (2024-09-03) • Updated input 'fernglas': 'github:wobcom/fernglas/25020466957dbe0e193f7857d827020f5c1aa996' (2024-02-07) → 'github:wobcom/fernglas/25e55f0275c369d66ccd847e7fc0f4cbd4ca4d26' (2024-09-03) • Updated input 'fernglas/communities': 'github:NLNOG/lg.ring.nlnog.net/20f9a9f3da8b1bc9d7046e88c62df4b41b4efb99' (2024-01-31) → 'github:NLNOG/lg.ring.nlnog.net/41cf616bae6fba597d074a484aabf1bee9002fb5' (2024-06-26) • Updated input 'fernglas/nixpkgs': 'github:NixOS/nixpkgs/faf912b086576fd1a15fca610166c98d47bc667e' (2024-02-05) → 'github:NixOS/nixpkgs/655a58a72a6601292512670343087c2d75d859c1' (2024-07-08) • Updated input 'home-manager': 'github:nix-community/home-manager/471e3eb0a114265bcd62d11d58ba8d3421ee68eb' (2024-09-01) → 'github:nix-community/home-manager/e5fa72bad0c6f533e8d558182529ee2acc9454fe' (2024-09-10) • Updated input 'nixos-hardware': 'github:nixos/nixos-hardware/95c3dfe6ef2e96ddc1ccdd7194e3cda02ca9a8ef' (2024-08-28) → 'github:nixos/nixos-hardware/166dee4f88a7e3ba1b7a243edb1aca822f00680e' (2024-09-09) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/12228ff1752d7b7624a54e9c1af4b222b3c1073b' (2024-08-31) → 'github:nixos/nixpkgs/574d1eac1c200690e27b8eb4e24887f8df7ac27c' (2024-09-06) • Updated input 'nixvim': 'github:nix-community/nixvim/2b30ee87031fb40f0f894de00c23ea41714d940e' (2024-09-01) → 'github:nix-community/nixvim/faa2e6306c0a1ae8e67dfdb0d75cd5ecd427ca5d' (2024-09-10) • Updated input 'sops-nix': 'github:Mic92/sops-nix/5db5921e40ae382d6716dce591ea23b0a39d96f7' (2024-09-01) → 'github:Mic92/sops-nix/cede1a08039178ac12957733e97ab1006c6b6892' (2024-09-09) • Updated input 'sops-nix/nixpkgs-stable': 'github:NixOS/nixpkgs/556533a23879fc7e5f98dd2e0b31a6911a213171' (2024-07-21) → 'github:NixOS/nixpkgs/dc454045f5b5d814e5862a6d057e7bb5c29edc05' (2024-09-08) • Updated input 'stylix': 'github:danth/stylix/3a4101c4f4abee41859c0cb98f6250f04c80d0f6' (2024-08-31) → 'github:danth/stylix/ef81ad9e85e60420cc83d4642619c14b57139d33' (2024-09-02) --- flake.lock | 75 ++++++++++++++++++++++++++---------------------------- 1 file changed, 36 insertions(+), 39 deletions(-) diff --git a/flake.lock b/flake.lock index dad0d75..0e4ac63 100644 --- a/flake.lock +++ b/flake.lock @@ -5,20 +5,17 @@ "crane": "crane", "flake-compat": "flake-compat", "flake-parts": "flake-parts", - "flake-utils": [ - "flake-utils" - ], "nixpkgs": [ "nixpkgs" ], "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1725048495, - "narHash": "sha256-vzmyW8Q6fG+QqlsYus+Xbo5s61ciXM4UpStZ2j5Pn54=", + "lastModified": 1725815284, + "narHash": "sha256-nVWCR86XDjx9Tq6RHsNvhD03nNzIeKKc7UTPnXLyrDY=", "owner": "zhaofengli", "repo": "attic", - "rev": "f74cee00364a36e4db8d05dc9c98391e18d9b4f8", + "rev": "aec90814a4ecbc40171d57eeef97c5cab4aaa7b4", "type": "github" }, "original": { @@ -144,11 +141,11 @@ "communities": { "flake": false, "locked": { - "lastModified": 1706695952, - "narHash": "sha256-FlbOBX/+/LLmoqMJLvu59XuHYmiohIhDc1VjkZu4Wzo=", + "lastModified": 1719412992, + "narHash": "sha256-WYcu4m9qytW5chFC8ZocDhvMflLIwsLkjz/z5ybjYlI=", "owner": "NLNOG", "repo": "lg.ring.nlnog.net", - "rev": "20f9a9f3da8b1bc9d7046e88c62df4b41b4efb99", + "rev": "41cf616bae6fba597d074a484aabf1bee9002fb5", "type": "github" }, "original": { @@ -206,11 +203,11 @@ ] }, "locked": { - "lastModified": 1725242307, - "narHash": "sha256-a2iTMBngegEZvaNAzzxq5Gc5Vp3UWoGUqWtK11Txbic=", + "lastModified": 1725377834, + "narHash": "sha256-tqoAO8oT6zEUDXte98cvA1saU9+1dLJQe3pMKLXv8ps=", "owner": "nix-community", "repo": "disko", - "rev": "96073e6423623d4a8027e9739d2af86d6422ea7a", + "rev": "e55f9a8678adc02024a4877c2a403e3f6daf24fe", "type": "github" }, "original": { @@ -251,11 +248,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1707317562, - "narHash": "sha256-0wj5AS8RLVr+S/QWWxCsMvmVjmXUWGfR9kPaZimJEss=", + "lastModified": 1725373953, + "narHash": "sha256-hkWPZTAQSDOaoTsdC3t4L8Rm65M3VYw6t4+8aghBPzA=", "owner": "wobcom", "repo": "fernglas", - "rev": "25020466957dbe0e193f7857d827020f5c1aa996", + "rev": "25e55f0275c369d66ccd847e7fc0f4cbd4ca4d26", "type": "github" }, "original": { @@ -572,11 +569,11 @@ ] }, "locked": { - "lastModified": 1725180166, - "narHash": "sha256-fzssXuGR/mCeGbzM1ExaTqDz7QDGta3WA4jJsZyRruo=", + "lastModified": 1725948275, + "narHash": "sha256-4QOPemDQ9VRLQaAdWuvdDBhh+lEUOAnSMHhdr4nS1mk=", "owner": "nix-community", "repo": "home-manager", - "rev": "471e3eb0a114265bcd62d11d58ba8d3421ee68eb", + "rev": "e5fa72bad0c6f533e8d558182529ee2acc9454fe", "type": "github" }, "original": { @@ -794,11 +791,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1724878143, - "narHash": "sha256-UjpKo92iZ25M05kgSOw/Ti6VZwpgdlOa73zHj8OcaDk=", + "lastModified": 1725885300, + "narHash": "sha256-5RLEnou1/GJQl+Wd+Bxaj7QY7FFQ9wjnFq1VNEaxTmc=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "95c3dfe6ef2e96ddc1ccdd7194e3cda02ca9a8ef", + "rev": "166dee4f88a7e3ba1b7a243edb1aca822f00680e", "type": "github" }, "original": { @@ -829,11 +826,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1707092692, - "narHash": "sha256-ZbHsm+mGk/izkWtT4xwwqz38fdlwu7nUUKXTOmm4SyE=", + "lastModified": 1720418205, + "narHash": "sha256-cPJoFPXU44GlhWg4pUk9oUPqurPlCFZ11ZQPk21GTPU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "faf912b086576fd1a15fca610166c98d47bc667e", + "rev": "655a58a72a6601292512670343087c2d75d859c1", "type": "github" }, "original": { @@ -877,11 +874,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1721524707, - "narHash": "sha256-5NctRsoE54N86nWd0psae70YSLfrOek3Kv1e8KoXe/0=", + "lastModified": 1725762081, + "narHash": "sha256-vNv+aJUW5/YurRy1ocfvs4q/48yVESwlC/yHzjkZSP8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "556533a23879fc7e5f98dd2e0b31a6911a213171", + "rev": "dc454045f5b5d814e5862a6d057e7bb5c29edc05", "type": "github" }, "original": { @@ -925,11 +922,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1725103162, - "narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=", + "lastModified": 1725634671, + "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b", + "rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c", "type": "github" }, "original": { @@ -956,11 +953,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1725223906, - "narHash": "sha256-f6wliEr+oLzKxgJxgkf1bCebmDosq2l8RujIueQK3Qk=", + "lastModified": 1725956241, + "narHash": "sha256-UL8WJvT+67ZNNc0GmfhygDzggq/lidyRRSN1jPXzr+0=", "owner": "nix-community", "repo": "nixvim", - "rev": "2b30ee87031fb40f0f894de00c23ea41714d940e", + "rev": "faa2e6306c0a1ae8e67dfdb0d75cd5ecd427ca5d", "type": "github" }, "original": { @@ -1036,11 +1033,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1725201042, - "narHash": "sha256-lj5pxOwidP0W//E7IvyhbhXrnEUW99I07+QpERnzTS4=", + "lastModified": 1725922448, + "narHash": "sha256-ruvh8tlEflRPifs5tlpa0gkttzq4UtgXkJQS7FusgFE=", "owner": "Mic92", "repo": "sops-nix", - "rev": "5db5921e40ae382d6716dce591ea23b0a39d96f7", + "rev": "cede1a08039178ac12957733e97ab1006c6b6892", "type": "github" }, "original": { @@ -1070,11 +1067,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1725126812, - "narHash": "sha256-E0CrYq8A/gdBjb9qC3PGKfH9lwSESyFX6sRZXJxq4JE=", + "lastModified": 1725290973, + "narHash": "sha256-+jwXF9KI0HfvDgpsoJGvOdfOGGSKOrID1wQB79zjUbo=", "owner": "danth", "repo": "stylix", - "rev": "3a4101c4f4abee41859c0cb98f6250f04c80d0f6", + "rev": "ef81ad9e85e60420cc83d4642619c14b57139d33", "type": "github" }, "original": {