diff --git a/profiles/base/default.nix b/profiles/base/default.nix index 879586e..a4e3c17 100644 --- a/profiles/base/default.nix +++ b/profiles/base/default.nix @@ -121,8 +121,14 @@ in { enable = true; userEmail = "daniel.olsen99@gmail.com"; userName = "Daniel Olsen"; + aliases = { + absorb = "!${pkgs.git-absorb}/bin/git-absorb"; + rc = "rebase --continue"; + n = "!git commit --all --amend --no-edit && git rc"; + }; extraConfig = { pull.rebase = true; + sequence.editor = "${pkgs.git-interactive-rebase-tool}/bin/interactive-rebase-tool"; }; delta.enable = true; }; @@ -171,6 +177,7 @@ in { enable = true; defaultApplications = { "image/png" = [ "sxiv.desktop" "gimp.desktop" ]; + "image/jpeg" = [ "sxiv.desktop" ]; "text/plain" = [ "gedit.desktop" "kakoune.desktop" "code.desktop" ]; "video/x-matroska" = [ "mpv.desktop" ]; }; diff --git a/profiles/zsh/default.nix b/profiles/zsh/default.nix index df33d3a..6a13bf0 100644 --- a/profiles/zsh/default.nix +++ b/profiles/zsh/default.nix @@ -33,6 +33,8 @@ in gst = "git status -sb"; gcm = "git commit -m"; gca = "git commit --amend --no-edit"; + grc = "git rc"; + gne = "git n"; gds = "git diff --staged"; glg = "git log --oneline"; };