kptltd00m
fe508d9cd8
Hyprland - Switch wayland.windowManager.hyprland to configType = "lua" (Hyprland 0.56) - Convert settings, env, monitors, window rules, gesture, animations (hl.curve/hl.animation) and all keybinds to hl.* calls - Add home/system/hyprland/lib.nix with exec/bind/execOnce helpers; every exec-once now runs from a hyprland.start hook - Drop hard-coded default_monitor = "eDP-2" Flake - Remove blog, awesome-wallpapers and default-creds inputs (their repos no longer ship a flake.nix and broke `nix flake update`), along with the server modules and Glance links that used them - Update flake.lock - Replace removed `gcr` with `gcr_4` Fixes - Point configDirectory at /etc/nixos/nixy on home-pc and thinkpad - Fix home-pc git email typo - Remove conflicting openpgp signing format, make pull.rebase a boolean, replace hx/peco in git aliases with nvim/sk - Fix zsh NUL alias (2>&1) and stop forcing bat colors in the cat alias - Require a password for sudo again (nixos-rebuild stays NOPASSWD) - Remove duplicate hardware.graphics block from home-pc flake - Delete unused zen .old files, run alejandra on host files
54 lines
1.6 KiB
Nix
54 lines
1.6 KiB
Nix
# Git configuration
|
|
{config, ...}: let
|
|
username = config.var.git.username;
|
|
email = config.var.git.email;
|
|
in {
|
|
programs.git = {
|
|
enable = true;
|
|
ignores = [
|
|
".cache/"
|
|
".DS_Store"
|
|
".idea/"
|
|
"*.swp"
|
|
"*.elc"
|
|
"auto-save-list"
|
|
".direnv/"
|
|
"node_modules"
|
|
"result"
|
|
"result-*"
|
|
];
|
|
settings = {
|
|
user.name = username;
|
|
user.email = email;
|
|
init.defaultBranch = "main";
|
|
pull.rebase = false;
|
|
push.autoSetupRemote = true;
|
|
color.ui = "1";
|
|
alias = {
|
|
essa = "push --force";
|
|
co = "checkout";
|
|
fuck = "commit --amend -m";
|
|
c = "commit -m";
|
|
ca = "commit -am";
|
|
forgor = "commit --amend --no-edit";
|
|
graph = "log --all --decorate --graph --oneline";
|
|
oops = "checkout --";
|
|
l = "log";
|
|
r = "rebase";
|
|
s = "status --short";
|
|
ss = "status";
|
|
d = "diff";
|
|
ps = "!git push origin $(git rev-parse --abbrev-ref HEAD)";
|
|
pl = "!git pull origin $(git rev-parse --abbrev-ref HEAD)";
|
|
af = "!git add $(git ls-files -m -o --exclude-standard | sk -m)";
|
|
st = "status";
|
|
br = "branch";
|
|
df = "!git hist | sk | awk '{print $2}' | xargs -I {} git diff {}^ {}";
|
|
hist = ''log --pretty=format:"%Cgreen%h %Creset%cd %Cblue[%cn] %Creset%s%C(yellow)%d%C(reset)" --graph --date=relative --decorate --all'';
|
|
llog = ''log --graph --name-status --pretty=format:"%C(red)%h %C(reset)(%cd) %C(green)%an %Creset%s %C(yellow)%d%Creset" --date=relative'';
|
|
edit-unmerged = "!f() { git ls-files --unmerged | cut -f2 | sort -u ; }; nvim `f`";
|
|
};
|
|
};
|
|
};
|
|
}
|