update to 25.11 with config changes

modules/services/server/mealie.nix

@@ -4,7 +4,7 @@
 
     services.mealie = {
         enable = true;
-	package = pkgs-unstable.mealie;
+	#package = pkgs-unstable.mealie;
         listenAddress = "127.0.0.1";
 	credentialsFile = config.age.secrets."services/mealie/credentialsFile".path;
         settings = {

modules/shell/git.nix

@@ -7,18 +7,20 @@
   programs = {
     git = {
       enable = true;
-      userName = "Kabbone";
-      userEmail = "tobias@opel-online.de";
-      lfs.enable = true;
+      settings = {
+      	user.name = "Kabbone";
+      	user.email = "tobias@opel-online.de";
+      };
+      lfs = {
+      	enable = true;
+	skipSmudge = true;
+      };
       signing = {
+        format = "ssh";
         key = "/home/${user}/.ssh/id_ed25519_sk_rk_red";
         signByDefault = true;
       };
-      extraConfig = {
-        gpg = { format = "ssh"; };
-        credential = { helper = "cache --timeout=3600"; };
-      };
-      difftastic.enable = true;
     };
+    difftastic.enable = true;
   };
 }

modules/shell/zsh.nix

@@ -8,7 +8,6 @@
   programs = {
     zsh = {
       enable = true;
-      dotDir = "~/.config/zsh_nix";
       autosuggestion.enable = true;             # Auto suggest options and highlights syntact, searches in history for options
       syntaxHighlighting.enable = true;
       history.size = 10000;

modules/wm/sway/home.nix

@@ -301,7 +301,7 @@
         { event = "lock"; command = "${pkgs.swaylock}/bin/swaylock -fF"; }
         { event = "after-resume"; command = "${pkgs.sway}/bin/swaymsg 'output * dpms on'"; }
         { event = "unlock"; command = "${pkgs.sway}/bin/swaymsg 'output * dpms on'"; }
-        ];
+      ];
       timeouts = [
         { timeout = 300; command = "${pkgs.swaylock}/bin/swaylock -fF"; }
         { timeout = 600; command = "${pkgs.sway}/bin/swaymsg 'output * dpms off'"; resumeCommand = "${pkgs.sway}/bin/swaymsg 'output * dpms on'"; }