update gitconfig

This commit is contained in:
Kopatz
2024-05-10 11:13:49 +02:00
parent d2ad5c34f2
commit 58ac9e897c
2 changed files with 18 additions and 12 deletions

View File

@@ -1,9 +1,12 @@
[user] [user]
name = Lukas name = Lukas
email = lukas.kopatz11@gmail.com email = lukas.kopatz11@gmail.com
signingkey = ~/.ssh/id_rsa.pub
[gpg]
format = ssh
[alias] [alias]
pushfwl = push --force-with-lease pushfwl = push --force-with-lease
last = log -1 --stat last = log -1 --stat
now = commit --amend --date="now" --no-edit now = commit --amend --date="now" --no-edit
cp = cherry-pick cp = cherry-pick
co = checkout co = checkout
@@ -11,6 +14,7 @@
ci = commit ci = commit
st = status -sb st = status -sb
br = branch br = branch
pr = pull --rebase
unstage = reset HEAD -- unstage = reset HEAD --
dc = diff --cached dc = diff --cached
lg1 = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' --all lg1 = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' --all
@@ -18,6 +22,8 @@
lg = !"git lg1" lg = !"git lg1"
[color] [color]
ui = true ui = true
[rerere]
enabled = true
[mergetool] [mergetool]
keeptemporaries = false keeptemporaries = false
keepbackups = false keepbackups = false

View File

@@ -60,14 +60,14 @@
mainUser.variant = "us"; mainUser.variant = "us";
age.identityPaths = [ /home/kopatz/.ssh/id_rsa ]; age.identityPaths = [ /home/kopatz/.ssh/id_rsa ];
services.xserver.displayManager.session = [ services.xserver.displayManager.session = [
{ #{
manage = "desktop"; # manage = "desktop";
name = "hyprland"; # name = "hyprland";
start = '' # start = ''
${lib.getExe pkgs.hyprland} & # ${lib.getExe pkgs.hyprland} &
waitPID=$! # waitPID=$!
''; # '';
} #}
{ {
manage = "desktop"; manage = "desktop";
name = "plasma5"; name = "plasma5";