upgrade to 25.05

modules/services/printer/klipper.nix

@@ -14,7 +14,7 @@
 	group = "moonraker";
 	configFile = ./printer.cfg;
 	mutableConfig = true;
-	mutableConfigFolder = "/var/lib/moonraker/config";
+	ConfigDir = "/var/lib/moonraker/config";
 	firmwares."sovol06" = {
 	  serial = "/dev/serial/by-id/usb-1a86_USB_Serial-if00-port0";
 	  enableKlipperFlash = true;

modules/services/server/matrix.nix

@@ -19,7 +19,6 @@ let
 in {
   environment.systemPackages = [
     pkgs.mautrix-whatsapp
-    pkgs.signald
     pkgs.mautrix-signal
   ];
 
@@ -127,15 +126,14 @@ in {
       mautrix-signal = {
         description = "Matrix <-> Signal bridge";
         wantedBy = [ "multi-user.target" ];
-        after = [ "network.target" "postgresql.service" "matrix-synapse.service" "signald.service" ];
-        requires = [ "postgresql.service" "matrix-synapse.service" "signald.service"];
+        after = [ "network.target" "postgresql.service" "matrix-synapse.service" ];
+        requires = [ "postgresql.service" "matrix-synapse.service" ];
         script = "${pkgs.mautrix-signal}/bin/mautrix-signal -n --config ${config.age.secrets."services/matrix/mautrix-signal.yml".path}";
         serviceConfig = {
           User = "mautrix-signal";
           Group = "mautrix-signal";
           Environment = "HOME=/var/lib/mautrix-signal";
           ReadWritePaths= [
-            "/var/run/signald/signald.sock"
             "/var/log/mautrix-signal"
           ];
           NoNewPrivileges=true;
@@ -254,11 +252,6 @@ in {
               };
           };
       };
-      signald = {
-        enable = true;
-        user = "mautrix-signal";
-        group = "mautrix-signal";
-      };
   };
 
   age.secrets."services/matrix/synapse.yml" = {

modules/shell/zsh.nix

@@ -19,14 +19,12 @@
         custom = "$HOME/.config/zsh_nix/custom";
       };
 
-      initExtraFirst = ''                            # very first inits in zshrc
+      initContent = ''
         if [[ $DISPLAY ]]; then
             [[ $- != *i* ]] && return
             [[ -z "$TMUX" ]] && (tmux attach || tmux new-session)
         fi
-      '';
 
-      initExtra = ''                            # Zsh theme
         # Spaceship
         source ${pkgs.spaceship-prompt}/share/zsh/site-functions/prompt_spaceship_setup
         autoload -U promptinit; promptinit