Update to nixos 22.05

nix/configuration.nix

@@ -64,15 +64,15 @@ SystemMaxUse=1G
     wget
     htop
     smartmontools
-    links
+    links2
     git
     rclone
     docker
     docker-compose
-    wireguard
+    wireguard-tools
     wesher
-    qemu
+    #qemu
-    qemu_kvm
+    #qemu_kvm
   ];
 
   programs.vim.defaultEditor = true;

nix/deuxfleurs.nix

@@ -143,7 +143,9 @@ in
       node_meta = {
         "site" = cfg.site_name;
       };
-      ui = true;
+      ui_config = {
+        enabled = true;
+      };
       bind_addr = "${cfg.cluster_ip}";
 
       addresses = {
@@ -170,12 +172,12 @@ in
     };
 
     services.nomad.enable = true;
-    services.nomad.package = pkgs.nomad_1_1;
+    services.nomad.package = pkgs.nomad_1_3;
     services.nomad.extraPackages = [
       pkgs.glibc
       pkgs.zstd
-      pkgs.qemu
+      #pkgs.qemu
-      pkgs.qemu_kvm
+      #pkgs.qemu_kvm
     ];
     services.nomad.settings =
       (if cfg.is_raft_server
@@ -227,11 +229,11 @@ in
               ];
             }
           ];
-          qemu = [
+          #qemu = [
-            {
+          #  {
-              enabled = true;
+          #    enabled = true;
-            }
+          #  }
-          ];
+          #];
         }
       ];
     };

sshtool

@@ -14,7 +14,7 @@ fi
 shift 1
 
 if [ -z "$1" ]; then
-	NIXHOSTLIST=$(ls cluster/$CLUSTER/node | grep -v '\.site\.')
+	NIXHOSTLIST=$(ls cluster/$CLUSTER/node | grep '\.nix$' | grep -v '\.site\.')
 else
 	NIXHOSTLIST="$@"
 fi

upgrade_nixos

@@ -1,6 +1,6 @@
 #!/usr/bin/env ./sshtool
 
-cmd nix-channel --add https://nixos.org/channels/nixos-21.11 nixos
+cmd nix-channel --add https://nixos.org/channels/nixos-22.05 nixos
 cmd nix-channel --update
 cmd nixos-rebuild boot