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

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 = false;
     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 = false;
     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,25 +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
-    ];
-  };
-}

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