From 07ebbac91299db36cd41e9d808be6a5721db154d Mon Sep 17 00:00:00 2001
From: Christoph Hollizeck <christoph.hollizeck@hey.com>
Date: Wed, 21 Aug 2024 22:44:58 +0200
Subject: [PATCH] add .gitignore and switch to rebase strategy

---
 .gitignore                          | 4 ++++
 modules/home/tools/git/default.nix  | 2 +-
 modules/nixos/tools/git/default.nix | 2 +-
 result                              | 1 -
 4 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100644 .gitignore
 delete mode 120000 result

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..1973dce
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+# output of nixos-rebuild build or deploy-rs
+result
+
+.direnv
diff --git a/modules/home/tools/git/default.nix b/modules/home/tools/git/default.nix
index 6f8107d..4393641 100644
--- a/modules/home/tools/git/default.nix
+++ b/modules/home/tools/git/default.nix
@@ -34,7 +34,7 @@ in
           defaultBranch = "main";
         };
         pull = {
-          rebase = false;
+          rebase = true;
         };
         push = {
           autoSetupRemote = true;
diff --git a/modules/nixos/tools/git/default.nix b/modules/nixos/tools/git/default.nix
index 218f544..3201bef 100644
--- a/modules/nixos/tools/git/default.nix
+++ b/modules/nixos/tools/git/default.nix
@@ -39,7 +39,7 @@ in
             defaultBranch = "main";
           };
           pull = {
-            rebase = false;
+            rebase = true;
           };
           push = {
             autoSetupRemote = true;
diff --git a/result b/result
deleted file mode 120000
index a7c115f..0000000
--- a/result
+++ /dev/null
@@ -1 +0,0 @@
-/nix/store/5bn24v1m3gsjr96fj9h2kavaj67lxh5q-nixos-24.05.20240410.1042fd8-x86_64-linux.iso
\ No newline at end of file