From c75f05d130bbcfb59b851f25ac53a33bb25483f3 Mon Sep 17 00:00:00 2001
From: Christoph Hollizeck <christoph.hollizeck@hey.com>
Date: Fri, 4 Jul 2025 13:11:51 +0200
Subject: [PATCH 1/2] git: enable autostash on pull

---
 modules/home/tools/git/default.nix  | 3 +++
 modules/nixos/tools/git/default.nix | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/modules/home/tools/git/default.nix b/modules/home/tools/git/default.nix
index b1f8011..12cd822 100644
--- a/modules/home/tools/git/default.nix
+++ b/modules/home/tools/git/default.nix
@@ -42,6 +42,9 @@ in
         push = {
           autoSetupRemote = true;
         };
+        rebase = {
+          autoStash = true;
+        };
         safe = {
           directory = "${user.home}/projects/config";
         };
diff --git a/modules/nixos/tools/git/default.nix b/modules/nixos/tools/git/default.nix
index f57b32d..dce536d 100644
--- a/modules/nixos/tools/git/default.nix
+++ b/modules/nixos/tools/git/default.nix
@@ -46,6 +46,9 @@ in
           push = {
             autoSetupRemote = true;
           };
+          rebase = {
+            autoStash = true;
+          };
           safe = {
             directory = "${config.users.users.${user.name}.home}/projects/config";
           };

From 46d080c24d5ff6d3cb1980ed73d2218166af2e18 Mon Sep 17 00:00:00 2001
From: Christoph Hollizeck <christoph.hollizeck@hey.com>
Date: Mon, 14 Jul 2025 07:14:25 +0200
Subject: [PATCH 2/2] mailserver: upgrade version

---
 systems/x86_64-linux/loptland/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/systems/x86_64-linux/loptland/default.nix b/systems/x86_64-linux/loptland/default.nix
index c86e868..805687d 100644
--- a/systems/x86_64-linux/loptland/default.nix
+++ b/systems/x86_64-linux/loptland/default.nix
@@ -142,7 +142,7 @@ in
     };
 
     certificateScheme = "acme-nginx";
-    stateVersion = 2;
+    stateVersion = 3;
   };
 
   nix = {