From ed3c9c2c7ed682753c1291939c83ecff73cb0270 Mon Sep 17 00:00:00 2001
From: emily <ek@kyouma.net>
Date: Tue, 10 Sep 2024 10:45:08 +0200
Subject: [PATCH] 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";
     };