GarandPLG/garandos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update git config

Browse Source
This commit is contained in:
GarandPLG
2025-10-23 00:33:04 +02:00
parent add12d2958
commit 789879c6eb
4 changed files with 20 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hosts/Garand-Desktop/variables.nix
View File

@@ -62,8 +62,8 @@
#stylixImage = ../../wallpapers/Grounded_Wallpaper_4K.jpg; #stylixImage = ../../wallpapers/Grounded_Wallpaper_4K.jpg;
#stylixImage = ../../wallpapers/jablon.jpg; #stylixImage = ../../wallpapers/jablon.jpg;
#stylixImage = ../../wallpapers/rammstein-log-two.jpg; #stylixImage = ../../wallpapers/rammstein-log-two.jpg;
#stylixImage = ../../wallpapers/rammstein-log-one.jpg; #stylixImage = ../../wallpapers/rammstein-logo-one.jpg;
#stylixImage = ../../wallpapers/rammstein-log-three.jpg; #stylixImage = ../../wallpapers/rammstein-logo-three.jpg;
#stylixImage = ../../wallpapers/rammstein-one.jpg; #stylixImage = ../../wallpapers/rammstein-one.jpg;
# Set Waybar # Set Waybar

8
hosts/Garand-Laptop/variables.nix
View File

@@ -57,17 +57,17 @@
# This will set your color palette # This will set your color palette
# Default background # Default background
# Add new images to ~/garandos/wallpapers # 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/DW_Pacts.jpg;
#stylixImage = ../../wallpapers/edward-elric-fullmetal-alchemist.jpg; #stylixImage = ../../wallpapers/edward-elric-fullmetal-alchemist.jpg;
#stylixImage = ../../wallpapers/fire-nation.jpg; #stylixImage = ../../wallpapers/fire-nation.jpg;
#stylixImage = ../../wallpapers/four-elements.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/Grounded_Wallpaper_4K.jpg;
#stylixImage = ../../wallpapers/jablon.jpg; #stylixImage = ../../wallpapers/jablon.jpg;
#stylixImage = ../../wallpapers/rammstein-log-two.jpg; #stylixImage = ../../wallpapers/rammstein-log-two.jpg;
#stylixImage = ../../wallpapers/rammstein-log-one.jpg; #stylixImage = ../../wallpapers/rammstein-logo-one.jpg;
#stylixImage = ../../wallpapers/rammstein-log-three.jpg; #stylixImage = ../../wallpapers/rammstein-logo-three.jpg;
#stylixImage = ../../wallpapers/rammstein-one.jpg; #stylixImage = ../../wallpapers/rammstein-one.jpg;
# Set Waybar # Set Waybar

4
hosts/default/variables.nix
View File

@@ -68,8 +68,8 @@
#stylixImage = ../../wallpapers/Grounded_Wallpaper_4K.jpg; #stylixImage = ../../wallpapers/Grounded_Wallpaper_4K.jpg;
#stylixImage = ../../wallpapers/jablon.jpg; #stylixImage = ../../wallpapers/jablon.jpg;
#stylixImage = ../../wallpapers/rammstein-log-two.jpg; #stylixImage = ../../wallpapers/rammstein-log-two.jpg;
#stylixImage = ../../wallpapers/rammstein-log-one.jpg; #stylixImage = ../../wallpapers/rammstein-logo-one.jpg;
#stylixImage = ../../wallpapers/rammstein-log-three.jpg; #stylixImage = ../../wallpapers/rammstein-logo-three.jpg;
#stylixImage = ../../wallpapers/rammstein-one.jpg; #stylixImage = ../../wallpapers/rammstein-one.jpg;
# Set Waybar # Set Waybar

32
modules/home/git.nix
View File

@@ -5,29 +5,19 @@ in
{ {
programs.git = { programs.git = {
enable = true; enable = true;
userName = "${gitUsername}";
userEmail = "${gitEmail}";
settings = { settings = {
# FOSS-friendly settings user = {
push.default = "simple"; # Match modern push behavior name = "${gitUsername}";
credential.helper = "cache --timeout=7200"; email = "${gitEmail}";
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
merge.conflictStyle = "diff3";
}; };
# Optional: FOSS-friendly Git aliases push.default = "simple";
aliases = { credential.helper = "cache --timeout=7200";
br = "branch --sort=-committerdate"; init.defaultBranch = "main";
co = "checkout"; log = {
df = "diff"; decorate = "full";
com = "commit -a"; date = "iso";
gs = "stash"; };
gp = "pull"; merge.conflictStyle = "diff3";
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";
}; };
}; };
} }