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"; }; diff --git a/flake.lock b/flake.lock index b5c0dda..0e4ac63 100644 --- a/flake.lock +++ b/flake.lock @@ -569,11 +569,11 @@ ] }, "locked": { - "lastModified": 1725893417, - "narHash": "sha256-fj2LxTZAncL/s5NrtXe1nLfO0XDvRixtCu3kmV9jDPw=", + "lastModified": 1725948275, + "narHash": "sha256-4QOPemDQ9VRLQaAdWuvdDBhh+lEUOAnSMHhdr4nS1mk=", "owner": "nix-community", "repo": "home-manager", - "rev": "10541f19c584fe9633c921903d8c095d5411e041", + "rev": "e5fa72bad0c6f533e8d558182529ee2acc9454fe", "type": "github" }, "original": { @@ -953,11 +953,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1725921389, - "narHash": "sha256-RBpN0ToD8O3qniBjqUiB1d2/LQJt5kH5P3Gt6dF91L0=", + "lastModified": 1725956241, + "narHash": "sha256-UL8WJvT+67ZNNc0GmfhygDzggq/lidyRRSN1jPXzr+0=", "owner": "nix-community", "repo": "nixvim", - "rev": "facf6b2d0c9e22d858956d1d458eac6baf155a08", + "rev": "faa2e6306c0a1ae8e67dfdb0d75cd5ecd427ca5d", "type": "github" }, "original": {