Merge pull request #104 from privatevoid-net/pr-flake-update

`flake.lock`: Update

cluster/services/hercules-ci-multi-agent/modules/multi-agent-refactored/options.nix

@@ -18,7 +18,7 @@ in
       Support is available at [help@hercules-ci.com](mailto:help@hercules-ci.com).
     '');
 
-    package = lib.mkPackageOptionMD pkgs "hercules-ci-agent" { };
+    package = lib.mkPackageOption pkgs "hercules-ci-agent" { };
 
     user = lib.mkOption {
       type = types.str;

cluster/services/warehouse/host.nix

@@ -20,7 +20,7 @@ with depot.lib.nginx;
     }
   ];
 
-  hardware.opengl = {
+  hardware.graphics = {
     enable = true;
     package = pkgs.intel-media-driver;
   };

flake.lock

@@ -10,11 +10,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1716561646,
+        "lastModified": 1718371084,
-        "narHash": "sha256-UIGtLO89RxKt7RF2iEgPikSdU53r6v/6WYB0RW3k89I=",
+        "narHash": "sha256-abpBi61mg0g+lFFU0zY4C6oP6fBwPzbHPKBGw676xsA=",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "c2fc0762bbe8feb06a2e59a364fa81b3a57671c9",
+        "rev": "3a56735779db467538fb2e577eda28a9daacaca6",
         "type": "github"
       },
       "original": {
@@ -271,11 +271,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1716205561,
+        "lastModified": 1719398431,
-        "narHash": "sha256-PUJkw3Qa0hHkxQf8u9/ybzo3QJVTEvEPhSfp1hBblBM=",
+        "narHash": "sha256-p6cC+0/c6GCBPtBkSnaOrhwLWl+uyoWYl/dReg+jcsk=",
         "owner": "hercules-ci",
         "repo": "hercules-ci-agent",
-        "rev": "563357eae6bbbdf9073e933e9b18d63809207ce4",
+        "rev": "c37b2ada2dd001bc4be6771bcdea680b0b93fb94",
         "type": "github"
       },
       "original": {
@@ -294,11 +294,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1713898448,
+        "lastModified": 1719226092,
-        "narHash": "sha256-6q6ojsp/Z9P2goqnxyfCSzFOD92T3Uobmj8oVAicUOs=",
+        "narHash": "sha256-YNkUMcCUCpnULp40g+svYsaH1RbSEj6s4WdZY/SHe38=",
         "owner": "hercules-ci",
         "repo": "hercules-ci-effects",
-        "rev": "c0302ec12d569532a6b6bd218f698bc402e93adc",
+        "rev": "11e4b8dc112e2f485d7c97e1cee77f9958f498f5",
         "type": "github"
       },
       "original": {
@@ -336,11 +336,11 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1717616111,
+        "lastModified": 1719665650,
-        "narHash": "sha256-t+fOnCYA2TzyP1AKfDuzxYOJlgkUvHdT1Ug5mgHrenQ=",
+        "narHash": "sha256-tGhKCelgMzuoYZkENWT6xcrCi6XMgnoc+dg/awGuny4=",
         "owner": "hyprspace",
         "repo": "hyprspace",
-        "rev": "df73583638e3d59896fcd302ef40f070232b970d",
+        "rev": "e2e2cd7723cca661fb4c50396a6fde5f82c9331c",
         "type": "github"
       },
       "original": {
@@ -461,11 +461,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1715534503,
+        "lastModified": 1719254875,
-        "narHash": "sha256-5ZSVkFadZbFP1THataCaSf0JH2cAH3S29hU9rrxTEqk=",
+        "narHash": "sha256-ECni+IkwXjusHsm9Sexdtq8weAq/yUyt1TWIemXt3Ko=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "2057814051972fa1453ddfb0d98badbea9b83c06",
+        "rev": "2893f56de08021cffd9b6b6dfc70fd9ccd51eb60",
         "type": "github"
       },
       "original": {
@@ -509,11 +509,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1717653235,
+        "lastModified": 1719674260,
-        "narHash": "sha256-wODpVx0FtLHnyKIOnm4V7fE9P8Pg12u/8ytY++VYMK0=",
+        "narHash": "sha256-mlxmTqtlBR2CwbucuDpZ49ROKRJGeojCHkkY1Nd6Kw8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "844ccd07fb2aa17250952aee34a6fefd914b4638",
+        "rev": "eb1ba314aff505efb42bce45f47542a517fc3c03",
         "type": "github"
       },
       "original": {

hosts/VEGAS/services/gitlab/default.nix

@@ -22,7 +22,6 @@ in
     "gitlab-db-credentials"
     "gitlab-initial-root-password"
     "gitlab-openid-secret"
-    "gitlab-runner-registration"
     "gitlab-secret-db"
     "gitlab-secret-jws"
     "gitlab-secret-otp"
@@ -91,20 +90,5 @@ in
     };
   };
 
-  systemd.services.gitlab-runner.after = [ "gitlab.target" ];
-  services.gitlab-runner = {
-    enable = true;
-    services = {
-      shell = {
-        # File should contain at least these two variables:
-        # `CI_SERVER_URL`
-        # `REGISTRATION_TOKEN`
-        registrationConfigFile = secrets.gitlab-runner-registration;
-        executor = "shell";
-        tagList = [ "shell" ];
-      };
-    };
-  };
-
   services.nginx.virtualHosts."${cfg.host}" = depot.lib.nginx.vhosts.proxy "http://unix:/run/gitlab/gitlab-workhorse.socket";
 }

packages/patched-derivations.nix

@@ -13,7 +13,7 @@ super: rec {
   garage = patch super.garage_0_8 "patches/base/garage";
 
   jellyfin = super.jellyfin.override {
-    ffmpeg = super.ffmpeg.override {
+    jellyfin-ffmpeg = super.ffmpeg.override {
       withMfx = true;
     };
   };

secrets.nix

@@ -61,7 +61,6 @@ in with hosts;
   "secrets/gitlab-db-credentials.age".publicKeys = max ++ map systemKeys [ VEGAS ];
   "secrets/gitlab-initial-root-password.age".publicKeys = max ++ map systemKeys [ VEGAS ];
   "secrets/gitlab-openid-secret.age".publicKeys = max ++ map systemKeys [ VEGAS ];
-  "secrets/gitlab-runner-registration.age".publicKeys = max ++ map systemKeys [ VEGAS ];
   "secrets/gitlab-secret-db.age".publicKeys = max ++ map systemKeys [ VEGAS ];
   "secrets/gitlab-secret-jws.age".publicKeys = max ++ map systemKeys [ VEGAS ];
   "secrets/gitlab-secret-otp.age".publicKeys = max ++ map systemKeys [ VEGAS ];

secrets/gitlab-runner-registration.age

@@ -1,12 +0,0 @@
-age-encryption.org/v1
--> ssh-ed25519 NO562A YU2/APfP6kPGX5e7bHBWdaom4ZwmytI/IoP+g3th5h0
-2IfalzEAkV0xCr35dOiCpxUHw24a3AbkOGVJ4L/uaWU
--> ssh-ed25519 5/zT0w DbMexjii0bSvqgGC9rNgCBOaQXfgzthcOPBT6dnKeGc
-C4dMDu8WgATu0sdPKACw07Fn5jq6Pe7uN8/Iv2tVcAs
--> ssh-ed25519 d3WGuA uIwhL4l3t07R5TYO1zo3dV9ktgWtoKR4JdvaHblEB3M
-265C3gEza2uh6oVca/gUNxqKjU2S8bhN/q4Dlw2EEy4
--> /"-grease +Wqw(R
-4HG/GLt5Drs7C0j1+DBwRIHQDVEl2JNuZ+BLNuaNG5pFIdO0EIG26XJFfdGOPQHo
-wkc
---- 2U7WL4OUr1Tcg3u3FejyVH8/RasT6Fc8a2M9acsycHQ
-×úC# Ö½l%Ê\#̱‹×Âÿ²`S%AÇ¢Åæ<C385>[lh²Rq®X®U	²ªVo‚°G	@a‡¿<E280A1>âÅ„»o/‘…3&€ØèyôI(Õ¢ŽýV®-Kê掛•ù<E280A2>sî\çz:h§GœAsµ²n<C2B2>ÉêGáHà«tH„ˆq1Ùÿ<C399>.Þ¬»aù¢g؃ÿÞ¥†âA³e_TLiÄãEæé‘ï³56±