reverted back to harmonia idk

config/services/harmonia.nix

@@ -1,20 +0,0 @@
-{ config, inputs, pkgs, ... }: {
-  imports = [
-    inputs.harmonia.nixosModules.harmonia
-  ];
-  services.harmonia-dev = {
-    enable = true;
-    package = pkgs.harmonia-dev;
-    signKeyPath = config.sops.secrets."services/hydra/signKey".path;
-    settings = {
-      bind = "[::1]:5555";
-      store = "/var/cache/hydra";
-    };
-  };
-  kyouma.nginx.virtualHosts."cache.kyouma.net" = {
-    locations."/" = {
-      proxyPass = "http://[::1]:5555";
-    };
-  };
-  security.acme.certs."cache.kyouma.net" = {};
-}

config/services/hydra/default.nix

@@ -1,11 +1,12 @@
-{ config, ... }: {
+{ config, inputs, ... }: {
   imports = [
     ./nix-config.nix
   ];
   sops.secrets."services/hydra/signKey" = {
     owner = "hydra-queue-runner";
-    sopsFile = ../../secrets/services/hydra.yaml;
+    sopsFile = ../../../secrets/services/hydra.yaml;
   };
+
   services.hydra = {
     enable = true;
     hydraURL = "https://hydra.kyouma.net";
@@ -14,24 +15,26 @@
     minimumDiskFree = 2;
     useSubstitutes = true;
     extraConfig = ''
-      store_uri = file:///var/cache/hydra?secret-key=${config.sops.secrets."services/hydra/signKey".path}&write-nar-listing=1&ls-compression=xz&log-compression=xz&want-mass-query=1&priority=41
-      upload_logs_to_binary_cache = true
-      server_store_uri = https://cache.kyouma.net
       binary_cache_public_uri = https://cache.kyouma.net
     '';
   };
+  services.harmonia = {
+    enable = true;
+    signKeyPath = config.sops.secrets."services/hydra/signKey".path;
+    settings = {
+      bind = "[::1]:5555";
+    };
+  };
+
   kyouma.nginx.defaultForbidden = "hydra.kyouma.net";
   kyouma.nginx.virtualHosts = {
-    "hydra.kyouma.net" = {
+    "hydra.kyouma.net".locations."/".proxyPass = "http://localhost:3000";
-      locations."/" = {
-        proxyPass = "http://localhost:3000";
-      };
-    };
     "cache.kyouma.net" = {
-      root = "/var/cache/hydra";
+      locations."/" = {
+        proxyPass = "http://[::1]:5555";
+      };
       locations."= /" = {
-        return = ''200 'Public key:\n\ncache.kyouma.net:Frjwu4q1rnwE/MnSTmX9yx86GNA/z3p/oElGvucLiZg='
+        return = ''200 'Public key:\n\ncache.kyouma.net:Frjwu4q1rnwE/MnSTmX9yx86GNA/z3p/oElGvucLiZg=' '';
-        '';
         extraConfig = ''
           types { } default_type "text/plain; charset=utf-8";
         '';

config/services/hydra/nix-config.nix

@@ -2,12 +2,11 @@
   nix.buildMachines = [
     {
       hostName = "localhost";
-      #sshUser = "build";
       maxJobs = 40;
       speedFactor = 40;
       systems = [ "x86_64-linux" "x86_64-darwin" ];
       supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ];
-      #sshKey = "/var/lib/hydra/id_ed25519";
+      sshKey = "/var/lib/hydra/id_ed25519";
     }
     {
       hostName = "integra.kyouma.net";

flake.lock

@@ -327,27 +327,6 @@
       }
     },
     "flake-parts": {
-      "inputs": {
-        "nixpkgs-lib": [
-          "harmonia",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1712014858,
-        "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
-    "flake-parts_2": {
       "inputs": {
         "nixpkgs-lib": [
           "nixvim",
@@ -492,27 +471,6 @@
         "type": "github"
       }
     },
-    "harmonia": {
-      "inputs": {
-        "flake-parts": "flake-parts",
-        "nixpkgs": "nixpkgs_2",
-        "treefmt-nix": "treefmt-nix"
-      },
-      "locked": {
-        "lastModified": 1713864517,
-        "narHash": "sha256-+V0V/l9Q7HR3J0aH1UWc1qHrpGiRWd6B4R+3MECFORg=",
-        "ref": "refs/tags/harmonia-v0.8.0",
-        "rev": "b51af094bad148c4a43057d1575b82c0ac9197b7",
-        "revCount": 593,
-        "type": "git",
-        "url": "https://github.com/nix-community/harmonia"
-      },
-      "original": {
-        "ref": "refs/tags/harmonia-v0.8.0",
-        "type": "git",
-        "url": "https://github.com/nix-community/harmonia"
-      }
-    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -641,22 +599,6 @@
       }
     },
     "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1715348188,
-        "narHash": "sha256-MM2a/oqc4FrbNIcrEJgz5tTqtOvrsWiFMMz1PzC0ZZk=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "5c0c6e14926c39d5c90073f01ca7fa6d24e3671b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable-small",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_3": {
       "locked": {
         "lastModified": 1715266358,
         "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=",
@@ -676,7 +618,7 @@
       "inputs": {
         "devshell": "devshell",
         "flake-compat": "flake-compat_2",
-        "flake-parts": "flake-parts_2",
+        "flake-parts": "flake-parts",
         "flake-root": "flake-root",
         "home-manager": [
           "home-manager"
@@ -686,7 +628,7 @@
           "nixpkgs"
         ],
         "pre-commit-hooks": "pre-commit-hooks",
-        "treefmt-nix": "treefmt-nix_2"
+        "treefmt-nix": "treefmt-nix"
       },
       "locked": {
         "lastModified": 1715115147,
@@ -737,11 +679,10 @@
         "dns": "dns",
         "fernglas": "fernglas",
         "flake-utils": "flake-utils",
-        "harmonia": "harmonia",
         "home-manager": "home-manager",
         "kyouma-www": "kyouma-www",
         "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs_2",
         "nixvim": "nixvim",
         "sops-nix": "sops-nix",
         "stylix": "stylix"
@@ -846,27 +787,6 @@
       }
     },
     "treefmt-nix": {
-      "inputs": {
-        "nixpkgs": [
-          "harmonia",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1711963903,
-        "narHash": "sha256-N3QDhoaX+paWXHbEXZapqd1r95mdshxToGowtjtYkGI=",
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "rev": "49dc4a92b02b8e68798abd99184f228243b6e3ac",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "type": "github"
-      }
-    },
-    "treefmt-nix_2": {
       "inputs": {
         "nixpkgs": [
           "nixvim",

flake.nix

@@ -23,9 +23,6 @@
       #inputs.nixpkgs.follows = "nixpkgs";
       inputs.flake-utils.follows = "flake-utils";
     };
-    harmonia = {
-      url = "git+https://github.com/nix-community/harmonia?ref=refs/tags/harmonia-v0.8.0";
-    };
     home-manager = {
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -102,7 +99,7 @@
     images.lain = self.nixosConfigurations.lain-minimal.config.system.build.sdImage;
 
     overlays = {
-      kyouma = import ./pkgs/overlay.nix inputs;
+      kyouma = import ./pkgs/overlay.nix;
       default = self.overlays.kyouma;
     };
     hydraJobs = {

pkgs/overlay.nix

@@ -1,4 +1,3 @@
-inputs: final: prev: {
+final: prev: {
   nyastodon = final.callPackage ./nyastodon/default.nix {  };
-  harmonia-dev = inputs.harmonia.packages.x86_64-linux.harmonia.override { nixForHarmonia = final.nixVersions.nix_2_21; };
 }