From 6bb351f89be0f3b27c01e80f75456aeb96864f37 Mon Sep 17 00:00:00 2001
From: Christoph Hollizeck <christoph.hollizeck@hey.com>
Date: Wed, 27 Mar 2024 14:34:33 +0100
Subject: [PATCH] set pull as rebase

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

diff --git a/modules/home/tools/git/default.nix b/modules/home/tools/git/default.nix
index 7a9f190..b4b72b2 100644
--- a/modules/home/tools/git/default.nix
+++ b/modules/home/tools/git/default.nix
@@ -23,6 +23,7 @@ in {
       lfs = enabled;
       extraConfig = {
         init = {defaultBranch = "main";};
+	pull = {rebase = true;};
         push = {autoSetupRemote = true;};
       };
     };
diff --git a/modules/nixos/tools/git/default.nix b/modules/nixos/tools/git/default.nix
index a8088db..4fc073a 100644
--- a/modules/nixos/tools/git/default.nix
+++ b/modules/nixos/tools/git/default.nix
@@ -24,9 +24,11 @@ in {
 
     programs.git = {
       enable = true;
+      inherit(cfg) userName userEmail;
       lfs.enable = true;
       config = {
         init = {defaultBranch = "main";};
+	pull = {rebase = true;};
         push = {autoSetupRemote = true;};
       };
     };
diff --git a/modules/nixos/user/default.nix b/modules/nixos/user/default.nix
index 60a31f9..5d2686f 100644
--- a/modules/nixos/user/default.nix
+++ b/modules/nixos/user/default.nix
@@ -65,7 +65,7 @@ in {
         "Music/.keep".text = "";
         "Pictures/.keep".text = "";
         "Videos/.keep".text = "";
-        "work/.keep".text = "";
+        "projects/.keep".text = "";
         ".face".source = cfg.icon;
         "Pictures/${
           cfg.icon.fileName or (builtins.baseNameOf cfg.icon)