nix/os/devices/srv0.home-ch.stefanjunker.de: bump nixos 21.11 -> 22.05

nix/os/containers/backup-target.nix

@@ -4,6 +4,8 @@
 , sshPort ? containerBackupCfg.portInt
 }: {
   config = { config, pkgs, lib, ... }: {
+    system.stateVersion = "21.11"; # Did you read the comment?
+
     imports = [
       ../profiles/containers/configuration.nix
     ];
@@ -26,10 +28,7 @@
         "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDNI3H0BRSYOZ/MbTs9J80doJwSd1HymFOP5quNt0J48vxZ5FPVrT2FHpQiNrCcYbCKRsU4X8AiGUHiXC0PapQQ3JDkqp6WZoqBNDx6BI7RadyH1TqVQPlou3pQmCAogzfBInruR53YTDmQqXiPwfM0okPOXgiBNjDfZXOX4+CyUfkmZZwASoicTInqWGkn1sFnh4tyXIkgWflg0njlVmfkVvH71+evvKLYHtoNpVXazkQ0SXbyuW5f3mSta7TNkpC3HbBm+4n+WxYGySrlRLWQhTo+aoWUKk9h5zvECDNpwRtbqzt+bA9nKrdg180ceu8hruwvWNiC6PPA2GW9Z1+VKROviGu1C3dliE/pPCBtK+ZoRVv2CGE+pmAuQsB9Nif9tk5tY6HJhuLNxKYiMfQkiLsDYv6KdZXUIVK/4BIDkZuQNnjhdOQBLnea0ANOhutA9gnjxnsd3UT6ovfazg5gud7n3u4yBtzjTkRrqWZ63eM1NmUVOgMWHQ715pV+hJfOFGqzRBEe3g/p3bWNgpROBYJbG1H8l9DN7emG4FGWsb1HeNFwQ5lS0Zsezb7qzahr4vSmHNugVw7w8ONt5dPbPI9wQnWvkkuHH76P/NYy6OC6lHrN1rXyA1okqdPr06YAZnCot+Pqdgn/ijxgp06J3dtkhin+Q7PoQbGff3ERIw== bkp"
       ];
 
-      packages = with pkgs; [
+      packages = with pkgs; [ btrfs-progs ];
-        btrfsProgs
-        # btrbk
-      ];
 
       isSystemUser = true;
     };

nix/os/containers/backup.nix

@@ -11,6 +11,8 @@ let
 
 in {
   config = { pkgs, ... }: {
+    system.stateVersion = "20.03"; # Did you read the comment?
+
     imports = [
       ../profiles/containers/configuration.nix
     ];

nix/os/containers/mailserver.nix

@@ -7,9 +7,12 @@
 let
   passwords = import ../../variables/passwords.crypt.nix;
 
-in {
+in
+{
 
   config = { pkgs, ... }: {
+    system.stateVersion = "21.11"; # Did you read the comment?
+
     imports = [
       ../profiles/containers/configuration.nix
       ../profiles/common/user.nix
@@ -70,7 +73,7 @@ in {
       serviceConfig.RestartSec = 600;
       serviceConfig.Restart = "always";
       description = "Getmail service";
-      path = [ ];
+      path = [ pkgs.getmail6 ];
       script = let
           rc = pkgs.writeText "mailATstefanjunker.de.getmail.rc" ''
             [options]
@@ -91,7 +94,7 @@ in {
             path = ${pkgs.dovecot}/libexec/dovecot/dovecot-lda
           '';
         in ''
-          ${pkgs.getmail}/bin/getmail --rcfile=${rc} --idle=INBOX
+          getmail --rcfile=${rc} --idle=INBOX
       '';
     };
 
@@ -101,7 +104,7 @@ in {
       serviceConfig.User = "steveej";
       serviceConfig.Group = "dovecot2";
       description = "Getmail service";
-      path = [ pkgs.getmail ];
+      path = [ pkgs.getmail6 ];
       serviceConfig.RestartSec = 1000;
       serviceConfig.Restart = "always";
       script = let

nix/os/containers/syncthing.nix

@@ -7,6 +7,8 @@
 {
 
   config = { config, pkgs, ... }: {
+    system.stateVersion = "20.05"; # Did you read the comment?
+
     imports = [
       ../profiles/containers/configuration.nix
     ];

nix/os/containers/webserver.nix

@@ -6,8 +6,11 @@
 
 let
   passwords = import ../../variables/passwords.crypt.nix;
-in {
+in
+{
   config = { config, pkgs, lib, ... }: {
+    system.stateVersion = "22.05"; # Did you read the comment?
+
     imports = [
       ../profiles/containers/configuration.nix
     ];
@@ -102,7 +105,7 @@ in {
 
     services.mysql = {
       enable = true;
-      package = pkgs.mariadb;
+      package = pkgs.mariadb_104;
     };
 
     services.hedgedoc = {
@@ -113,7 +116,7 @@ in {
         protocolUseSSL = true;
         db = {
           dialect = "sqlite";
-          storage = "/var/lib/codimd/db.codimd.sqlite";
+          storage = "/var/lib/hedgedoc/db.hedgedoc.sqlite";
         };
 
         allowAnonymous = false;
@@ -149,8 +152,8 @@ in {
       isReadOnly = false;
     };
 
-    "/var/lib/codimd" = {
+    "/var/lib/hedgedoc" = {
-      hostPath = "/var/lib/container-volumes/webserver/var-lib-codimd";
+      hostPath = "/var/lib/container-volumes/webserver/var-lib-hedgedoc";
       isReadOnly = false;
     };
   };

nix/os/devices/srv0.home-ch.stefanjunker.de/versions.nix

@@ -1,8 +1,8 @@
 let
   nixpkgs = {
     url = "https://github.com/NixOS/nixpkgs/";
-    ref = "nixos-21.11";
+    ref = "nixos-22.05";
-    rev = "feea25c58657fa81d16e0e51f80e1a02ef4cbd49";
+    rev = "040c6d8374d090f46ab0e99f1f7c27a4529ecffd";
   };
 in
 
@@ -12,11 +12,11 @@ in
   "nixpkgs-master" = {
     url = "https://github.com/NixOS/nixpkgs/";
     ref = "master";
-    rev = "78f6f779627c89823d8402aac658418ef188be1c";
+    rev = "5527a41eb304aa7c77efeefbda0e17ca105a4c8c";
   };
   "home-manager-module" = {
     url = "https://github.com/nix-community/home-manager";
-    ref = "release-21.11";
+    ref = "release-22.05";
-    rev = "d14adb99f3fb562ec74ad18c032efc154b438034";
+    rev = "b81e128fc053ab3159d7b464d9b7dedc9d6a6891";
   };
 }

nix/os/devices/srv0.home-ch.stefanjunker.de/versions.tmpl.nix

@@ -1,8 +1,8 @@
 let
   nixpkgs = {
     url = "https://github.com/NixOS/nixpkgs/";
-    ref = "nixos-21.11";
+    ref = "nixos-22.05";
-    rev = "<% git ls-remote https://github.com/nixos/nixpkgs nixos-21.11 | awk '{ print $1 }' | tr -d '\n' -%>";
+    rev = "<% git ls-remote https://github.com/nixos/nixpkgs nixos-22.05 | awk '{ print $1 }' | tr -d '\n' -%>";
   };
 in
 
@@ -16,7 +16,7 @@ in
   };
   "home-manager-module" = {
     url = "https://github.com/nix-community/home-manager";
-    ref = "release-21.11";
+    ref = "release-22.05";
-    rev = "<% git ls-remote https://github.com/nix-community/home-manager.git release-21.11 | awk '{ print $1 }' | tr -d '\n' -%>";
+    rev = "<% git ls-remote https://github.com/nix-community/home-manager.git release-22.05 | awk '{ print $1 }' | tr -d '\n' -%>";
   };
 }

nix/os/devices/steveej-rmvbl-sdep0/system.nix

@@ -2,4 +2,5 @@
 
 {
   networking.hostName = "steveej-rmvbl-sdep0"; # Define your hostname.
+  system.stateVersion = "21.05";
 }