chore: update flake.lock 2026-05-17

2026-05-17 00:03:17 +00:00
18 changed files with 142 additions and 216 deletions
@@ -1,6 +1,5 @@
 {
  pkgs,
-  pkgs',
  top,
  ...
 }:
@@ -34,7 +33,7 @@ in
 {
  environment.systemPackages = with pkgs; [
    agenix
-    pkgs'.hms
+    hms
  ];

  fonts.packages = with pkgs; [
@@ -42,13 +41,12 @@ in
    nerd-fonts.hack
  ];

-  #launchd.daemons.darwin-builder = builder;
+  launchd.daemons.darwin-builder = builder;

  nix = {
-    #buildMachines = [ { systems = ["aarch64-linux"]; sshUser = "builder"; sshKey = "/etc/nix/builder_ed25519"; hostName = "localhost:31022"; protocol = "ssh-ng"; }];
    enable = true;
    gc.interval.Hour = 3;
-    #linux-builder.enable = true;
+    linux-builder.enable = true;
    settings.auto-optimise-store = false; # Darwin bugs?
  };

@@ -19,7 +19,6 @@ let
      specialArgs = {
        inherit metadata top;
        inherit (top) self;
-        pkgs' = top.self.packages.${system};
      };
      modules = [
        {
@@ -31,11 +31,11 @@
        "treefmt-nix": "treefmt-nix"
      },
      "locked": {
-        "lastModified": 1779096866,
-        "narHash": "sha256-8HtF1G7OPMXzo+f+0W+7zwzhuBUSk2EMrOS4ZvFw7+I=",
+        "lastModified": 1778391342,
+        "narHash": "sha256-7FVIfUHdQEB6HM+gUPLJVaL7ABrqlnMxS/pO+vNvjd8=",
        "owner": "nix-community",
        "repo": "buildbot-nix",
-        "rev": "891f2baba218f4365f0c6ef96ea33f9b277f5ed0",
+        "rev": "0bedd1aafd1653858d5f1e0f08eba3d7ec397dff",
        "type": "github"
      },
      "original": {
@@ -95,11 +95,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1779036909,
-        "narHash": "sha256-zXcwYQGCT6pzinK+1dBB2ekTVtfxGZAapb3Evdcu4fY=",
+        "lastModified": 1777780666,
+        "narHash": "sha256-8wURyQMdDkGUarSTKOGdCuFfYiwa3HbzwscUfn3STDE=",
        "owner": "lnl7",
        "repo": "nix-darwin",
-        "rev": "56c666e108467d87d13508936aade6d567f2a501",
+        "rev": "8c62fba0854ba15c8917aed18894dbccb48a3777",
        "type": "github"
      },
      "original": {
@@ -239,11 +239,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1779507042,
-        "narHash": "sha256-7wOwi8B6D0BYsieZCnHZZj2sNUzgJhLoIVSfkwB7lxQ=",
+        "lastModified": 1778954430,
+        "narHash": "sha256-oaNyOr05lblaQdtbkbN1wO0b2KLIL2O1LkmwDgdQp4I=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "509ed3c603349a9d43de9e2ae6613baea6bd5b34",
+        "rev": "26aaab785b0bab4af60a2c42b22760fa906ef22a",
        "type": "github"
      },
      "original": {
@@ -281,11 +281,11 @@
        "systems": "systems_2"
      },
      "locked": {
-        "lastModified": 1779508581,
-        "narHash": "sha256-qZjcS4jRe0pUv4ZAFCyr7ELFrb3LPLr+5u8LHRZjMVQ=",
+        "lastModified": 1778039471,
+        "narHash": "sha256-Arjg44jFcpSqOKK05EIxbKIjhfjou/EGF12COFU+9QA=",
        "owner": "Infinidoge",
        "repo": "nix-minecraft",
-        "rev": "e13397b445bb0dcb390f90126914113ec5dd5afe",
+        "rev": "87611ef4788116de05f851920c5958f0c37d5b05",
        "type": "github"
      },
      "original": {
@@ -300,11 +300,11 @@
        "treefmt-nix": "treefmt-nix_2"
      },
      "locked": {
-        "lastModified": 1779223902,
-        "narHash": "sha256-qQogttCU2zOyK7MN85yPaUxxN2u0BN9zabfO4X7FwNg=",
+        "lastModified": 1778839878,
+        "narHash": "sha256-S2nSP6YWUz8I2uRZuAY93FoAAUa9TiZetLzjBv1n5vk=",
        "owner": "Mic92",
        "repo": "niks3",
-        "rev": "1db826ca990cb3dead5c033bcfba4bf68ce9fc05",
+        "rev": "c29f3641de064545d75f00318cd45bea2b4ea1d0",
        "type": "github"
      },
      "original": {
@@ -336,11 +336,11 @@
    },
    "nix-hardware": {
      "locked": {
-        "lastModified": 1779258371,
-        "narHash": "sha256-j1iZsLy6oFApqR1oiDmHhvkwxXqcNi0aoSJj643LuwU=",
+        "lastModified": 1778945272,
+        "narHash": "sha256-Aipz0UiBhE2a1FYJrNc2y+5vKWo5QVkhmaIJk3/ls+g=",
        "owner": "nixos",
        "repo": "nixos-hardware",
-        "rev": "c97bc4d15bd3473dd095e8e8ba57330ab1943a77",
+        "rev": "379c1f274f0fa354d012f0600806de54e79f29b5",
        "type": "github"
      },
      "original": {
@@ -382,11 +382,11 @@
    },
    "nixpkgs-lib_2": {
      "locked": {
-        "lastModified": 1778984393,
-        "narHash": "sha256-r755Kh5Q0XBTPNuv9rL2rsUJTq8BDhb+lIwRWhl6yYA=",
+        "lastModified": 1778379128,
+        "narHash": "sha256-+yjPmoKsTqe/FQHriXzIfI0ELuEt3+1LXc0BE8nU/Yc=",
        "owner": "nix-community",
        "repo": "nixpkgs.lib",
-        "rev": "0d14a58ab7aa3f513c58ccc9e47e77ffd92be204",
+        "rev": "e361b0ff94723bc94283566dc2a13a46f07eaf5c",
        "type": "github"
      },
      "original": {
@@ -413,11 +413,11 @@
    },
    "nixpkgs_3": {
      "locked": {
-        "lastModified": 1779142197,
-        "narHash": "sha256-Fypu3KtYQ+ZXL91CZIGqS3ZKwrMH6GOSPCtJ07W3ecU=",
+        "lastModified": 1778491576,
+        "narHash": "sha256-9YOHDS9ANGbRmf3DSQ9UCvas3CyYNIBwBkKGQZTLXGY=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "d4d6b67b138722feb847a75760a430943c33f4ef",
+        "rev": "1174f92bf37f1a5914be77e1b44482d6fbc75ecc",
        "type": "github"
      },
      "original": {
@@ -429,11 +429,11 @@
    },
    "nixpkgs_4": {
      "locked": {
-        "lastModified": 1779508470,
-        "narHash": "sha256-Ap9KJX+5xHIn3bPIpfNgT6MEXdAECECwo4/rmlQD74M=",
+        "lastModified": 1778869304,
+        "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "29916453413845e54a65b8a1cf996842300cd299",
+        "rev": "d233902339c02a9c334e7e593de68855ad26c4cb",
        "type": "github"
      },
      "original": {
@@ -461,11 +461,11 @@
    },
    "nixunstable": {
      "locked": {
-        "lastModified": 1779508470,
-        "narHash": "sha256-Ap9KJX+5xHIn3bPIpfNgT6MEXdAECECwo4/rmlQD74M=",
+        "lastModified": 1778869304,
+        "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "29916453413845e54a65b8a1cf996842300cd299",
+        "rev": "d233902339c02a9c334e7e593de68855ad26c4cb",
        "type": "github"
      },
      "original": {
@@ -484,11 +484,11 @@
        "systems": "systems_3"
      },
      "locked": {
-        "lastModified": 1779554657,
-        "narHash": "sha256-qjLcUp7DBpmSUL+nVjLymp2nEvAzeKKoAVDCRgZYxFk=",
+        "lastModified": 1778906310,
+        "narHash": "sha256-LqASEJRtLuKRBJd9051T1KMAEaYvsVrc6m64jhD6xbw=",
        "owner": "nix-community",
        "repo": "nixvim",
-        "rev": "1a380f12453ba97ad8cc9c60f223afb1cb8bace8",
+        "rev": "06cace835d7ee727852ac789e3dcd42fc2fd360e",
        "type": "github"
      },
      "original": {
@@ -504,11 +504,11 @@
        "nixpkgs": "nixpkgs_4"
      },
      "locked": {
-        "lastModified": 1779579389,
-        "narHash": "sha256-YbWzWejE/QRBLQN9VKBL66byuTFPvncQgiv4NC25lN4=",
+        "lastModified": 1778975705,
+        "narHash": "sha256-DweZZ/JO7AxbQ9+caW8Jt8L5MtjMvVWpKDS+MAiWN8E=",
        "owner": "nix-community",
        "repo": "NUR",
-        "rev": "65439f69b3bcf6b26b8a7c92c26bd09066fdf9c5",
+        "rev": "25081c3d50352c88e7502e2a1c76fda8560b2b41",
        "type": "github"
      },
      "original": {
@@ -644,11 +644,11 @@
        "nixpkgs": "nixpkgs_5"
      },
      "locked": {
-        "lastModified": 1779507994,
-        "narHash": "sha256-vw/u69n4vPibpWNUVkbwlfVHQukg3xcuKoHwCXJkOvc=",
+        "lastModified": 1778902753,
+        "narHash": "sha256-4tgJmu6sc6F6y+igJfh+kG0t2U1T2cDwfhz5hC0W2Tg=",
        "owner": "nix-community",
        "repo": "nix-vscode-extensions",
-        "rev": "375f9dc68aa90ccff57891af5dfe1d5fb2a9b20a",
+        "rev": "5df06838c483ad33aa5fb1448b9ba9de665930a1",
        "type": "github"
      },
      "original": {
@@ -86,7 +86,6 @@
                  self
                  top
                  ;
-                pkgs' = top.self.packages.x86_64-linux;
              };
            };
          }
@@ -20,4 +20,3 @@ builds:
      # to build at home
      - homeConfigurations."gregory.hellings-mbp"
      - homeConfigurations.gregs-MacBook-Pro-16-inch-Nov-2024
-      - homeConfigurations.ivr
@@ -13,23 +13,25 @@
    includes = [ "config.local" ];
    enableDefaultConfig = false;

-    settings =
+    matchBlocks =
      let
        nas = {
-          User = "admin";
+          user = "admin";
        };
        owned = {
-          User = "greg";
+          user = "greg";
        };
      in
      {
        inherit nas;

        "*" = {
-          DynamicForward = [ "10240" ];
-          ServerAliveInterval = 60;
-          LogLevel = "error";
-          SetEnv = { TERM = "xterm-256color"; };
+          dynamicForwards = [ { port = 10240; } ];
+          serverAliveInterval = 60;
+          extraOptions = {
+            LogLevel = "error";
+            SetEnv = "TERM=xterm-256color";
+          };
        };

        "10.42.1.4" = lib.hm.dag.entryBefore [ "10.42.*" ] nas;
@@ -39,46 +41,46 @@
        "chronicles.thehellings.lan" = lib.hm.dag.entryBefore [ "*.thehellings.lan" ] nas;

        gh = {
-          User = "git";
-          Hostname = "github.com";
+          user = "git";
+          hostname = "github.com";
        };
        "src" = {
-          User = "git";
-          Hostname = "jeremiah.shire-zebra.ts.net";
-          Port = 32222;
+          user = "git";
+          hostname = "jeremiah.shire-zebra.ts.net";
+          port = 32222;
        };
        srcpub = {
-          User = "git";
-          Hostname = "src.thehellings.com";
-          Port = 2222;
+          user = "git";
+          hostname = "src.thehellings.com";
+          port = 2222;
        };
        ivr = {
-          User = "git";
-          Hostname = "gitlab.com";
+          user = "git";
+          hostname = "gitlab.com";
        };

        "ivr.thehellings.lan" = lib.hm.dag.entryBefore [ "ivr" ] {
-          User = "gregory.hellings";
+          user = "gregory.hellings";
        };

        "*.thehellings.lan" = owned;
        "10.42.*" = owned;

        "host.crosswire.org crosswire" = {
-          Hostname = "host.crosswire.org";
-          User = "ghellings";
+          hostname = "host.crosswire.org";
+          user = "ghellings";
        };

        fedpeople = {
-          Hostname = "fedorapeople.org";
-          User = "greghellings";
+          hostname = "fedorapeople.org";
+          user = "greghellings";
        };

        "src.fedoraproject.org pkgs.fedoraproject.org" = {
-          User = "greghellings";
+          user = "greghellings";
        };

-        "127.*" = {
+        "127.*".extraOptions = {
          PubkeyAcceptedAlgorithms = "+ssh-rsa";
          HostkeyAlgorithms = "+ssh-rsa";
        };
@@ -1,4 +1,4 @@
-{ lib, pkgs, ... }:
+{ pkgs, ... }:

 {
  greg = {
@@ -36,13 +36,4 @@
      settings.SKIP_HOST_UPDATE = true;
    };
  };
-  xdg.desktopEntries = {
-    prismlauncher = {
-      name = "Prism Launcher - Minecraft";
-      actions.minecraft = {
-        name = "Minecraft";
-        exec = lib.getExe pkgs.prismlauncher;
-      };
-    };
-  };
 }
@@ -62,7 +62,6 @@
          serverProperties = {
            allow-flight = true;
            motd = "Maya's Minecraft World";
-            online-mode = true;
          };
          whitelist = { };

@@ -129,8 +128,8 @@
                # Better storage engines
                # https://www.curseforge.com/minecraft/mc-mods/refined-storage
                refined-storage = pkgs.fetchurl {
-                  url = "https://mediafilez.forgecdn.net/files/8086/588/refinedstorage-fabric-3.0.0.jar";
-                  hash = "sha256-LuOF0aYQon78AQeD5fQ8OXHCnekfa+PNKpH7cqimFNs=";
+                  url = "https://mediafilez.forgecdn.net/files/8032/790/refinedstorage-fabric-3.0.0-beta.8.jar";
+                  hash = "sha256-XY5I+sw5JlWnKK/hPUOJsk2gnmqH4Iygq+aooN27NJY=";
                };
                # https://www.curseforge.com/minecraft/mc-mods/storage-drawers
                #storagedrawers = pkgs.fetchurl {
@@ -22,7 +22,6 @@ let
    #"1.0.0.1" # Cloudflare
    #"149.112.112.112" # Quad 9
    metadata.infra.gw # Currently using our UniFi router for DNS as well
-    "100.100.100.100"
  ];
 in
 {
@@ -116,15 +115,10 @@ in
                "@\tIN\tSOA\t${config.networking.hostName}\tgreg@thehellings.com (1 1m 1m 1m 1m)"
                "\tIN\tNS\t${config.networking.hostName}"
              ];
-              makeHost =
-                host:
-                [ "${host.name}\tIN\tA\t${host.address}" ]
-                ++ lib.map (a: "${a}\tIN\tA\t${host.address}") (
-                  if builtins.hasAttr "aliases" host then host.aliases else [ ]
-                );
+              makeHost = host: "${host.name}\tIN\tA\t${host.address}";
            in
            pkgs.writeText "${domain}" (
-              builtins.concatStringsSep "\n" (preamble ++ (lib.flatten (lib.map makeHost hosts)) ++ [ "" ])
+              builtins.concatStringsSep "\n" (preamble ++ (lib.map makeHost hosts) ++ [ "" ])
            );
        in
        lib.mapAttrs
@@ -133,7 +127,7 @@ in
            file = makeZoneFile (lib'.hostsByNet net metadata.hosts) domain;
          })
          {
-            #"shire-zebra.ts.net" = "tailscale";
+            "shire-zebra.ts.net" = "tailscale";
            "nebula.thehellings.com" = "nebula";
            nebula = "nebula";
            "thehellings.lan" = "lan";
@@ -142,12 +142,12 @@ in
            updateOutputs = false;
          };
        };
-        domain = "${config.networking.hostName}.shire-zebra.ts.net:8010";
+        domain = "${config.networking.hostName}.shire-zebra.ts.net";
        evalMaxMemorySize = 8192;
        evalWorkerCount = 4;
        gitea = {
          enable = true;
-          instanceUrl = "https://gitea.shire-zebra.ts.net";
+          instanceUrl = "https://src.thehellings.com";
          oauthId = "7ec9107d-379b-47c8-870f-1191956d0500";
          oauthSecretFile = config.age.secrets.gitea-oauthSecret.path;
          tokenFile = config.age.secrets.gitea-oauthToken.path;
@@ -1,4 +1,4 @@
-{ config, ... }:
+{ ... }:

 let
  srcDomain = "src.thehellings.com";
@@ -6,23 +6,15 @@ let
 in
 {
  greg.proxies."${srcDomain}" = {
-    target = "http://unix:${config.services.anubis.instances.git.settings.BIND}";
+    target = "https://gitea.shire-zebra.ts.net";
    ssl = true;
    genAliases = false;
    extraConfig = ''
-      #proxy_ssl_verify off;
-      #proxy_ssl_server_name on;
-
-      proxy_set_header X-Real-IP $remote_addr;
-      proxy_set_header X-Http-Version $server_protocol;
-      proxy_set_header User-Agent $http_user_agent;
+      proxy_ssl_verify off;
+      proxy_ssl_server_name on;
+      proxy_set_header X-Forwarded-Proto $scheme;
+      proxy_set_header X-Forwarded-Ssl on;
      client_max_body_size 100000m;
-
-      #proxy_set_header Host $host;
-      #proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-      #proxy_set_header X-Forwarded-Proto $scheme;
-      #proxy_set_header X-Forwarded-Ssl on;
-
      # Ultimate AI Block List v1.7 20250924
      # https://perishablepress.com/ultimate-ai-block-list/

@@ -95,44 +87,6 @@ in

  networking.firewall.allowedTCPPorts = [ sshPort ];

-  services = {
-    anubis = {
-      instances = {
-        git = {
-          enable = true;
-          settings = {
-            BIND = "/run/anubis/anubis-git/anubis.sock";
-            COOKIE_DOMAIN = "thehellings.com";
-            SERVE_ROBOTS_TXT = true;
-            TARGET = "https://gitea.shire-zebra.ts.net/";
-          };
-        };
-      };
-    };
-
-    haproxy = {
-      enable = true;
-      config = ''
-        global
-          daemon
-          maxconn 20
-
-        defaults
-          timeout connect 500s
-          timeout client 500s
-          timeout server 1h
-
-        listen gitsshd
-          bind *:${toString sshPort}
-          timeout client 1h
-          mode tcp
-          server git-isaiah isaiah.shire-zebra.ts.net:32222
-          server git-jeremiah jeremiah.shire-zebra.ts.net:32222
-          server git-zeke zeke.shire-zebra.ts.net:32222
-      '';
-    };
-  };
-
  systemd.services = {
    haproxy = {
      after = [
@@ -144,5 +98,25 @@ in
    };
  };

-  users.users.nginx.extraGroups = [ config.users.groups.anubis.name ];
+  services.haproxy = {
+    enable = true;
+    config = ''
+      global
+        daemon
+        maxconn 20
+
+      defaults
+        timeout connect 500s
+        timeout client 500s
+        timeout server 1h
+
+      listen gitsshd
+        bind *:${toString sshPort}
+        timeout client 1h
+        mode tcp
+        server git-isaiah isaiah.shire-zebra.ts.net:32222
+        server git-jeremiah jeremiah.shire-zebra.ts.net:32222
+        server git-zeke zeke.shire-zebra.ts.net:32222
+    '';
+  };
 }
@@ -2,24 +2,12 @@
 # them by the following commands:
 # nix run nixpkgs.matrix-synapse
 # register_new_matrix_user -k "B9EoPr2WV9hzwc7uL2Sx1JmvCeKDEOGCpB0uginQcQtEH4wzRtkSIdo7lltrjSQa" http://localhost:8448
-{ config, ... }:
+{ config, lib, ... }:
 let
  domain = "${config.networking.domain}";
  fqdn = "matrix.${domain}";
 in
 {
-  greg.proxies."${fqdn}" = {
-    extraConfig = ''
-      error_log /var/log/nginx/debug.log debug;
-      proxy_ssl_verify off;
-      proxy_ssl_server_name on;
-      proxy_set_header X-Forwarded-Proto $scheme;
-      proxy_set_header X-Forwarded-Ssl on;
-    '';
-    genAliases = false;
-    ssl = true;
-    target = "https://matrix.shire-zebra.ts.net";
-  };
  services.nginx = {
    virtualHosts = {
      # Server the '.well-known' files to find the Matrix API server
@@ -56,6 +44,36 @@ in
            return 200 '${builtins.toJSON client}';
          '';
      };
+
+      # Reverse proxy in front of the actual Matrix server
+      "${fqdn}" = {
+        enableACME = true;
+        forceSSL = true;
+
+        extraConfig = ''
+          error_log /var/log/nginx/debug.log debug;
+        '';
+
+        # Not the appropriate place for the chat client
+        locations =
+          (builtins.listToAttrs (
+            builtins.map
+              (
+                val:
+                lib.nameValuePair "/_${val}" {
+                  proxyPass = "https://matrix.shire-zebra.ts.net";
+                }
+              )
+              [
+                "matrix"
+                "synapse"
+                "dendrite"
+              ]
+          ))
+          // {
+            "/".extraConfig = "return 404;";
+          };
+      };
    };
  };

@@ -34,5 +34,10 @@ in
      ssl = true;
      genAliases = false;
    };
+    "doubles.thehellings.com" = {
+      target = "http://localhost:8081";
+      ssl = true;
+      genAliases = false;
+    };
  };
 }
@@ -15,7 +15,6 @@
      (name: value: {
        inherit name;
        address = builtins.getAttr netAttr value;
-        aliases = lib.optionals (builtins.hasAttr "aliases" value) (builtins.getAttr "aliases" value);
      })
      (
        lib.filterAttrs (
@@ -66,8 +66,8 @@ spec:
          APP_NAME: "Gitea: Greg's Cup of Git"
          RUN_MODE: dev
        server:
-          DOMAIN: "shire-zebra.ts.net"
-          ROOT_URL: "https://gitea.shire-zebra.ts.net"
+          DOMAIN: "thehellings.com"
+          ROOT_URL: "https://src.thehellings.com"
          SSH_PORT: "2222"
        database:
          DB_TYPE: postgres
@@ -119,53 +119,6 @@ spec:
        cpu: "100m"
        memory: "2Gi"

-    # Anubis anti-crawler sidecar
-    # Anubis listens on :8080 and proxies to Gitea at http://localhost:3000
-    # Ingress is updated to route to the anubis port instead of http
-    extraContainers:
-      - name: anubis
-        image: ghcr.io/techarohq/anubis:latest
-        imagePullPolicy: Always
-        env:
-          - name: BIND
-            value: ":8080"
-          - name: DIFFICULTY
-            value: "4"
-          - name: METRICS_BIND
-            value: ":9090"
-          - name: POLICY_FNAME
-            value: "/etc/anubis/policy.yaml"
-          - name: SERVE_ROBOTS_TXT
-            value: "true"
-          - name: TARGET
-            value: "http://localhost:3000"
-        volumeMounts:
-          - name: anubis-policy
-            mountPath: /etc/anubis
-            readOnly: true
-        resources:
-          limits:
-            cpu: "750m"
-            memory: "256Mi"
-          requests:
-            cpu: "250m"
-            memory: "256Mi"
-        securityContext:
-          runAsUser: 1000
-          runAsGroup: 1000
-          runAsNonRoot: true
-          allowPrivilegeEscalation: false
-          capabilities:
-            drop:
-              - ALL
-          seccompProfile:
-            type: RuntimeDefault
-
-    extraVolumes:
-      - name: anubis-policy
-        configMap:
-          name: anubis-policy
-
    strategy:
      type: RollingUpdate
      rollingUpdate:
@@ -19,7 +19,6 @@ spec:
        kind: HelmRepository
        name: mariadb-operator
      interval: "1h"
-      version: "26.3.0"
 ---
 apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
@@ -34,7 +33,6 @@ spec:
        kind: HelmRepository
        name: mariadb-operator
      interval: "1h"
-      version: "26.3.0"
  dependsOn:
    - name: mariadb-operator-crds
    - name: longhorn
@@ -11,7 +11,6 @@ spec:
        kind: HelmRepository
        name: mariadb-operator
      interval: "1h"
-      version: "26.3.0"
  dependsOn:
    - name: mariadb-operator-crds
    - name: mariadb-operator
@@ -13,8 +13,7 @@
      "ip": "10.42.1.4",
      "pubkey": "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEBecZUva9OnZuXLaBun6/1ITo5f9p0YMLPD+q0egLRS",
      "external": true,
-      "ts": "100.119.228.115",
-      "aliases": ["s3"]
+      "ts": "100.119.228.115"
    },
    "exodus": {
      "ip": null,