From d5bca06a567ff2fe3fcc69a0d375dfbb467aef12 Mon Sep 17 00:00:00 2001
From: oddlama <oddlama@oddlama.org>
Date: Sun, 30 Mar 2025 19:55:19 +0200
Subject: [PATCH] feat: enable git autostash

---
 pkgs/default.nix     | 9 ++++-----
 users/myuser/git.nix | 1 +
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/default.nix b/pkgs/default.nix
index 763ae4b..a295635 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -7,11 +7,10 @@ _inputs: [
     zsh-histdb-skim = prev.callPackage ./zsh-skim-histdb.nix { };
     neovim-clean = prev.neovim-unwrapped.overrideAttrs (old: {
       nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ prev.makeWrapper ];
-      postInstall =
-        (old.postInstall or "")
-        + ''
-          wrapProgram $out/bin/nvim --add-flags "--clean"
-        '';
+      postInstall = ''
+        ${old.postInstall or ""}
+        wrapProgram $out/bin/nvim --add-flags "--clean"
+      '';
     });
     #pythonPackagesExtensions =
     #  prev.pythonPackagesExtensions
diff --git a/users/myuser/git.nix b/users/myuser/git.nix
index 5faffc8..f279cda 100644
--- a/users/myuser/git.nix
+++ b/users/myuser/git.nix
@@ -46,6 +46,7 @@
       mergetool.prompt = true;
       commit.gpgsign = true;
       pull.rebase = true;
+      rebase.autostash = true;
       push.autoSetupRemote = true;
     };
     aliases = {