Switch to the main branch for the k8s manifests.

The old cluster has been fully deleted, so we no longer need a separate nix branch.

nix/configuration/configuration.nix

@@ -51,7 +51,6 @@ in
     ./roles/graphviz
     ./roles/hydra
     ./roles/image_based_appliance
-    ./roles/instawow
     ./roles/iso
     ./roles/iso_mount
     ./roles/jujutsu
@@ -282,53 +281,6 @@ in
         (disableOptimizationsPython3 "zopfli") # /nix/store/idjhlmljrapzm3i1svl5x9mdwfxxj51v-pytest-check-hook/nix-support/setup-hook: line 23:   280 Segmentation fault         (core dumped) /nix/store/87l6i0czch42nzv39ydwld5hnhcq0b65-python3-3.14.7/bin/python3.14 "${flagsArray[@]}"
         (disableOptimizations "zopfli")
         (disableOptimizations "nototools") # Needs to use the same version of python as the zopfli package
-        (final: prev: {
-          instawow = prev.instawow.overrideAttrs (
-            finalAttrs: prevAttrs:
-            let
-              version = "7.2.1";
-            in
-            {
-              inherit version;
-
-              src = final.fetchFromGitHub {
-                owner = "layday";
-                repo = "instawow";
-                tag = "v${finalAttrs.version}";
-                hash = "sha256-5y+oJfzWwaUc3p4fzsQ4j8a6YJEsI+3Qy3gK6VPkjA4=";
-              };
-
-              propagatedBuildInputs = prevAttrs.propagatedBuildInputs ++ [ final.python3.pkgs.versioningit ];
-
-              postPatch = ''
-                # Upstream uses versioningit to set the version
-                sed -i '/^name =.*/a version = "${version}"' pyproject.toml
-                sed -i "/dynamic =/,+2d" pyproject.toml
-              '';
-            }
-          );
-        })
-        (final: prev: {
-          pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [
-            (python-final: python-prev: {
-              aiohttp-client-cache = python-prev.aiohttp-client-cache.overridePythonAttrs (
-                oldAttrs:
-                let
-                  version = "0.15.0";
-                in
-                {
-                  inherit version;
-
-                  src = final.fetchPypi {
-                    pname = "aiohttp_client_cache";
-                    inherit version;
-                    hash = "sha256-Jk+n1pvNsuT+mZTn9Bq17sfLuipfXiYNRE0AL5Ym43Q=";
-                  };
-                }
-              );
-            })
-          ];
-        })
       ];
 
     # This option defines the first version of NixOS you have installed on this particular machine,

nix/configuration/hosts/odo/default.nix

@@ -107,7 +107,6 @@
     me.graphical = true;
     me.graphics_card_type = "amd";
     me.graphviz.enable = true;
-    me.instawow.enable = true;
     me.iso_mount.enable = true;
     me.jujutsu.config = ../../roles/jujutsu/files/jujutsu_config_home.toml;
     me.jujutsu.enable = true;

nix/configuration/hosts/quark/default.nix

@@ -100,7 +100,6 @@
     me.graphical = true;
     me.graphics_card_type = "amd";
     me.graphviz.enable = true;
-    me.instawow.enable = true;
     me.iso_mount.enable = true;
     me.jujutsu.config = ../../roles/jujutsu/files/jujutsu_config_home.toml;
     me.jujutsu.enable = true;

nix/configuration/roles/hydra/default.nix

@@ -65,33 +65,33 @@
     systemd.services."build-cache" =
       let
         enabled_targets = [
-          # "wip"
+          "wip"
           "odo"
-          # "odo_update"
+          "odo_update"
-          # "odowork"
+          "odowork"
-          # "odowork_update"
+          "odowork_update"
-          # "quark"
+          "quark"
-          # "quark_update"
+          "quark_update"
-          # "hydra"
+          "hydra"
-          # "hydra_update"
+          "hydra_update"
-          # "controller0"
+          "controller0"
-          # "controller0_update"
+          "controller0_update"
-          # "controller1"
+          "controller1"
-          # "controller1_update"
+          "controller1_update"
-          # "controller2"
+          "controller2"
-          # "controller2_update"
+          "controller2_update"
-          # "worker0"
+          "worker0"
-          # "worker0_update"
+          "worker0_update"
-          # "worker1"
+          "worker1"
-          # "worker1_update"
+          "worker1_update"
-          # "worker2"
+          "worker2"
-          # "worker2_update"
+          "worker2_update"
-          # "family_disks"
+          "family_disks"
-          # "family_disks_update"
+          "family_disks_update"
-          # "nixbsd"
+          "nixbsd"
-          # "nix_builder_develop"
+          "nix_builder_develop"
-          # "organic_develop"
+          "organic_develop"
-          # "natter_develop"
+          "natter_develop"
         ];
         build_flags = lib.concatMap (target: [
           "--target"

nix/configuration/roles/instawow/default.nix

@@ -1,53 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-{
-  imports = [ ];
-
-  options.me = {
-    instawow.enable = lib.mkOption {
-      type = lib.types.bool;
-      default = false;
-      example = true;
-      description = "Whether we want to install instawow.";
-    };
-  };
-
-  config = lib.mkIf config.me.instawow.enable {
-    environment.systemPackages = with pkgs; [
-      instawow
-    ];
-
-    environment.persistence."/persist" = lib.mkIf (config.me.mountPersistence) {
-      hideMounts = true;
-      users.talexander = {
-        directories = [
-          {
-            directory = ".config/instawow";
-            user = "talexander";
-            group = "talexander";
-            mode = "0755";
-          }
-        ];
-      };
-    };
-
-    environment.persistence."/state" = lib.mkIf (config.me.mountPersistence) {
-      hideMounts = true;
-      users.talexander = {
-        directories = [
-          {
-            directory = ".cache/instawow";
-            user = "talexander";
-            group = "talexander";
-            mode = "0755";
-          }
-        ];
-      };
-    };
-  };
-}

nix/kubernetes/keys/package/bootstrap-script/files/manifests/flux_apply_git.yaml

@@ -6,7 +6,7 @@ metadata:
 spec:
   interval: 5m0s
   ref:
-    branch: nix
+    branch: main
   secretRef:
     name: kubernetes-deploy-key
   # url: ssh://git@74.80.180.138:65099/repos/mrmanager