On branch main Your branch is up to date with 'origin/main'. Changes to be committed: modified: CHANGELOG.md modified: flake.nix modified: hosts/default/default.nix modified: hosts/default/hardware.nix modified: hosts/default/host-packages.nix modified: hosts/nixstation/default.nix modified: hosts/nixstation/hardware.nix modified: hosts/nixstation/host-packages.nix modified: hosts/zaneyos-oem/default.nix modified: hosts/zaneyos-oem/hardware.nix modified: hosts/zaneyos-oem/host-packages.nix modified: modules/core/default.nix modified: modules/core/flatpak.nix modified: modules/core/greetd.nix modified: modules/core/network.nix modified: modules/core/nfs.nix modified: modules/core/nh.nix modified: modules/core/packages.nix modified: modules/core/printing.nix modified: modules/core/quickshell.nix modified: modules/core/sddm.nix modified: modules/core/services.nix modified: modules/core/starfish.nix modified: modules/core/steam.nix modified: modules/core/stylix.nix modified: modules/core/syncthing.nix modified: modules/core/system.nix modified: modules/core/thunar.nix modified: modules/core/user.nix modified: modules/core/virtualisation.nix modified: modules/core/xserver.nix modified: modules/drivers/amd-drivers.nix modified: modules/drivers/default.nix modified: modules/drivers/intel-drivers.nix modified: modules/drivers/local-hardware-clock.nix modified: modules/drivers/nvidia-drivers.nix modified: modules/drivers/nvidia-prime-drivers.nix modified: modules/drivers/vm-guest-services.nix modified: modules/home/alacritty.nix modified: modules/home/bash.nix modified: modules/home/bashrc-personal.nix modified: modules/home/bat.nix modified: modules/home/bottom.nix modified: modules/home/btop.nix modified: modules/home/cava.nix modified: modules/home/default.nix modified: modules/home/emoji.nix modified: modules/home/evil-helix.nix modified: modules/home/fzf.nix modified: modules/home/ghostty.nix modified: modules/home/git.nix modified: modules/home/htop.nix modified: modules/home/hyprland/animations-def.nix modified: modules/home/hyprland/animations-dynamic.nix modified: modules/home/hyprland/animations-end4.nix modified: modules/home/hyprland/animations-moving.nix modified: modules/home/hyprland/binds.nix modified: modules/home/hyprland/default.nix modified: modules/home/hyprland/env.nix modified: modules/home/hyprland/exec-once.nix modified: modules/home/hyprland/hypridle.nix modified: modules/home/hyprland/hyprland.nix modified: modules/home/hyprland/hyprlock.nix modified: modules/home/hyprland/pyprland.nix modified: modules/home/hyprland/windowrules.nix modified: modules/home/kitty.nix modified: modules/home/lazygit.nix modified: modules/home/nvf.nix modified: modules/home/obs-studio.nix modified: modules/home/qt.nix modified: modules/home/rofi/config-long.nix modified: modules/home/rofi/default.nix modified: modules/home/rofi/rofi.nix modified: modules/home/scripts/default.nix modified: modules/home/scripts/emopicker9000.nix modified: modules/home/scripts/gemini-cli.nix modified: modules/home/scripts/hm-find.nix modified: modules/home/scripts/keybinds.nix modified: modules/home/scripts/rofi-launcher.nix modified: modules/home/scripts/web-search.nix modified: modules/home/scripts/zcli.nix modified: modules/home/starship-ddubs-1.nix modified: modules/home/starship.nix modified: modules/home/swappy.nix modified: modules/home/swaync.nix modified: modules/home/tealdeer.nix modified: modules/home/tmux.nix modified: modules/home/vscode.nix modified: modules/home/waybar/Jerry-waybar.nix modified: modules/home/waybar/waybar-curved.nix modified: modules/home/waybar/waybar-ddubs-2.nix modified: modules/home/waybar/waybar-ddubs.nix modified: modules/home/waybar/waybar-nekodyke.nix modified: modules/home/waybar/waybar-simple.nix modified: modules/home/wezterm.nix modified: modules/home/xdg.nix modified: modules/home/yazi/default.nix modified: modules/home/yazi/keymap.nix modified: modules/home/yazi/theme.nix modified: modules/home/zsh/default.nix modified: modules/home/zsh/zshrc-personal.nix modified: profiles/amd/default.nix modified: profiles/intel/default.nix modified: profiles/nvidia-laptop/default.nix modified: profiles/nvidia/default.nix modified: profiles/vm/default.nix
33 lines
1 KiB
Nix
33 lines
1 KiB
Nix
{ host, ... }:
|
|
let
|
|
inherit (import ../../hosts/${host}/variables.nix) gitUsername gitEmail;
|
|
in
|
|
{
|
|
programs.git = {
|
|
enable = true;
|
|
userName = "${gitUsername}";
|
|
userEmail = "${gitEmail}";
|
|
|
|
extraConfig = {
|
|
# FOSS-friendly settings
|
|
push.default = "simple"; # Match modern push behavior
|
|
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
|
|
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";
|
|
};
|
|
};
|
|
}
|