diff --git a/home-manager/.gitconfig b/home-manager/.gitconfig index d671eb3..da39c3b 100644 --- a/home-manager/.gitconfig +++ b/home-manager/.gitconfig @@ -1,9 +1,12 @@ [user] - name = Lukas - email = lukas.kopatz11@gmail.com + name = Lukas + email = lukas.kopatz11@gmail.com + signingkey = ~/.ssh/id_rsa.pub +[gpg] + format = ssh [alias] - pushfwl = push --force-with-lease - last = log -1 --stat + pushfwl = push --force-with-lease + last = log -1 --stat now = commit --amend --date="now" --no-edit cp = cherry-pick co = checkout @@ -11,6 +14,7 @@ ci = commit st = status -sb br = branch + pr = pull --rebase unstage = reset HEAD -- 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 @@ -18,6 +22,8 @@ lg = !"git lg1" [color] ui = true +[rerere] + enabled = true [mergetool] keeptemporaries = false keepbackups = false diff --git a/systems/pc/configuration.nix b/systems/pc/configuration.nix index f0bd0c2..ebf3df9 100644 --- a/systems/pc/configuration.nix +++ b/systems/pc/configuration.nix @@ -60,14 +60,14 @@ mainUser.variant = "us"; age.identityPaths = [ /home/kopatz/.ssh/id_rsa ]; services.xserver.displayManager.session = [ - { - manage = "desktop"; - name = "hyprland"; - start = '' - ${lib.getExe pkgs.hyprland} & - waitPID=$! - ''; - } + #{ + # manage = "desktop"; + # name = "hyprland"; + # start = '' + # ${lib.getExe pkgs.hyprland} & + # waitPID=$! + # ''; + #} { manage = "desktop"; name = "plasma5";