From 789879c6ebda8b42f3c4dd7d244fb45211df7e69 Mon Sep 17 00:00:00 2001
From: GarandPLG <garandplg@garandplg.com>
Date: Thu, 23 Oct 2025 00:33:04 +0200
Subject: [PATCH] update git config

---
 hosts/Garand-Desktop/variables.nix |  6 +++---
 hosts/Garand-Laptop/variables.nix  |  8 ++++----
 hosts/default/variables.nix        |  6 +++---
 modules/home/git.nix               | 30 ++++++++++--------------------
 4 files changed, 20 insertions(+), 30 deletions(-)

diff --git a/hosts/Garand-Desktop/variables.nix b/hosts/Garand-Desktop/variables.nix
index 8891f16..2196e31 100644
--- a/hosts/Garand-Desktop/variables.nix
+++ b/hosts/Garand-Desktop/variables.nix
@@ -58,12 +58,12 @@
   #stylixImage = ../../wallpapers/edward-elric-fullmetal-alchemist.jpg;
   #stylixImage = ../../wallpapers/fire-nation.jpg;
   #stylixImage = ../../wallpapers/four-elements.jpg;
-  # stylixImage = ../../wallpapers/fullmetal-alchemist-5120x2880-10399.png;
+  #stylixImage = ../../wallpapers/fullmetal-alchemist-5120x2880-10399.png;
   #stylixImage = ../../wallpapers/Grounded_Wallpaper_4K.jpg;
   #stylixImage = ../../wallpapers/jablon.jpg;
   #stylixImage = ../../wallpapers/rammstein-log-two.jpg;
-  #stylixImage = ../../wallpapers/rammstein-log-one.jpg;
-  #stylixImage = ../../wallpapers/rammstein-log-three.jpg;
+  #stylixImage = ../../wallpapers/rammstein-logo-one.jpg;
+  #stylixImage = ../../wallpapers/rammstein-logo-three.jpg;
   #stylixImage = ../../wallpapers/rammstein-one.jpg;
 
   # Set Waybar
diff --git a/hosts/Garand-Laptop/variables.nix b/hosts/Garand-Laptop/variables.nix
index cc88fd3..dd143de 100644
--- a/hosts/Garand-Laptop/variables.nix
+++ b/hosts/Garand-Laptop/variables.nix
@@ -57,17 +57,17 @@
   # This will set your color palette
   # Default background
   # Add new images to ~/garandos/wallpapers
-  # stylixImage = ../../wallpapers/attack-on-titan-mikasa-ackerman.jpg;
+  stylixImage = ../../wallpapers/attack-on-titan-mikasa-ackerman.jpg;
   #stylixImage = ../../wallpapers/DW_Pacts.jpg;
   #stylixImage = ../../wallpapers/edward-elric-fullmetal-alchemist.jpg;
   #stylixImage = ../../wallpapers/fire-nation.jpg;
   #stylixImage = ../../wallpapers/four-elements.jpg;
-  stylixImage = ../../wallpapers/fullmetal-alchemist-5120x2880-10399.png;
+  #stylixImage = ../../wallpapers/fullmetal-alchemist-5120x2880-10399.png;
   #stylixImage = ../../wallpapers/Grounded_Wallpaper_4K.jpg;
   #stylixImage = ../../wallpapers/jablon.jpg;
   #stylixImage = ../../wallpapers/rammstein-log-two.jpg;
-  #stylixImage = ../../wallpapers/rammstein-log-one.jpg;
-  #stylixImage = ../../wallpapers/rammstein-log-three.jpg;
+  #stylixImage = ../../wallpapers/rammstein-logo-one.jpg;
+  #stylixImage = ../../wallpapers/rammstein-logo-three.jpg;
   #stylixImage = ../../wallpapers/rammstein-one.jpg;
 
   # Set Waybar
diff --git a/hosts/default/variables.nix b/hosts/default/variables.nix
index e3c4219..74f0533 100644
--- a/hosts/default/variables.nix
+++ b/hosts/default/variables.nix
@@ -64,12 +64,12 @@
   #stylixImage = ../../wallpapers/edward-elric-fullmetal-alchemist.jpg;
   #stylixImage = ../../wallpapers/fire-nation.jpg;
   #stylixImage = ../../wallpapers/four-elements.jpg;
-  # stylixImage = ../../wallpapers/fullmetal-alchemist-5120x2880-10399.png;
+  #stylixImage = ../../wallpapers/fullmetal-alchemist-5120x2880-10399.png;
   #stylixImage = ../../wallpapers/Grounded_Wallpaper_4K.jpg;
   #stylixImage = ../../wallpapers/jablon.jpg;
   #stylixImage = ../../wallpapers/rammstein-log-two.jpg;
-  #stylixImage = ../../wallpapers/rammstein-log-one.jpg;
-  #stylixImage = ../../wallpapers/rammstein-log-three.jpg;
+  #stylixImage = ../../wallpapers/rammstein-logo-one.jpg;
+  #stylixImage = ../../wallpapers/rammstein-logo-three.jpg;
   #stylixImage = ../../wallpapers/rammstein-one.jpg;
 
   # Set Waybar
diff --git a/modules/home/git.nix b/modules/home/git.nix
index f5feff0..a0b6e2b 100644
--- a/modules/home/git.nix
+++ b/modules/home/git.nix
@@ -5,29 +5,19 @@ in
 {
   programs.git = {
     enable = true;
-    userName = "${gitUsername}";
-    userEmail = "${gitEmail}";
-
     settings = {
-      # FOSS-friendly settings
-      push.default = "simple"; # Match modern push behavior
+      user = {
+        name = "${gitUsername}";
+        email = "${gitEmail}";
+      };
+      push.default = "simple";
       credential.helper = "cache --timeout=7200";
-      init.defaultBranch = "main"; # Set default new branches to 'main'
-      log.decorate = "full"; # Show branch/tag info in git log
-      log.date = "iso"; # ISO 8601 date format
-      # Conflict resolution style for readable diffs
+      init.defaultBranch = "main";
+      log = {
+        decorate = "full";
+        date = "iso";
+      };
       merge.conflictStyle = "diff3";
     };
-    # Optional: FOSS-friendly Git aliases
-    aliases = {
-      br = "branch --sort=-committerdate";
-      co = "checkout";
-      df = "diff";
-      com = "commit -a";
-      gs = "stash";
-      gp = "pull";
-      lg = "log --graph --pretty=format:'%Cred%h%Creset - %C(yellow)%d%Creset %s %C(green)(%cr)%C(bold blue) <%an>%Creset' --abbrev-commit";
-      st = "status";
-    };
   };
 }