From 111f4cfabd94e4f663db9c5cd2fe376549a219c1 Mon Sep 17 00:00:00 2001 From: Sijmen Date: Sat, 17 Dec 2022 17:42:16 +0100 Subject: [PATCH] Use pkgs.XYZ for aliases --- common/home-manager/home.nix | 49 ++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/common/home-manager/home.nix b/common/home-manager/home.nix index 1d903ae..6655e0a 100644 --- a/common/home-manager/home.nix +++ b/common/home-manager/home.nix @@ -93,31 +93,32 @@ cdnix = "cd /etc/nixos"; - ga = "git add"; - gb = "git branch"; - gba = "git branch -a"; - gbd = "git branch -d"; - gc = "git commit"; - gca = "git commit --amend"; - gcan = "git commit --amend --no-edit"; - gcl = "git clone"; - gcm = "git commit -m"; - gco = "git checkout"; - gcob = "git checkout -b"; - gcom = "git remote show origin | sed -n '/HEAD branch/s/.*: //p' | xargs git checkout"; - gf = "git fetch"; - gfp = "git fetch --prune"; - gl = "git pull"; - gla = "git pull --autostash"; - gp = "git push"; - gpf = "git push --force-with-lease"; - gr = "git reset"; - grs = "git reset --soft"; - gs = "git stash"; - gsa = "git stash apply"; - gsp = "git stash pop"; + ga = "${pkgs.git}/bin/git add"; + gb = "${pkgs.git}/bin/git branch"; + gba = "${pkgs.git}/bin/git branch -a"; + gbd = "${pkgs.git}/bin/git branch -d"; + gc = "${pkgs.git}/bin/git commit"; + gca = "${pkgs.git}/bin/git commit --amend"; + gcan = "${pkgs.git}/bin/git commit --amend --no-edit"; + gcl = "${pkgs.git}/bin/git clone"; + gcm = "${pkgs.git}/bin/git commit -m"; + gco = "${pkgs.git}/bin/git checkout"; + gcob = "${pkgs.git}/bin/git checkout -b"; + gcom = "${pkgs.git}/bin/git remote show origin | sed -n '/HEAD branch/s/.*: //p' | xargs git checkout"; + gf = "${pkgs.git}/bin/git fetch"; + gfp = "${pkgs.git}/bin/git fetch --prune"; + gl = "${pkgs.git}/bin/git pull"; + gla = "${pkgs.git}/bin/git pull --autostash"; + gp = "${pkgs.git}/bin/git push"; + gpf = "${pkgs.git}/bin/git push --force-with-lease"; + gr = "${pkgs.git}/bin/git reset"; + grs = "${pkgs.git}/bin/git reset --soft"; + gs = "${pkgs.git}/bin/git stash"; + gsa = "${pkgs.git}/bin/git stash apply"; + gsp = "${pkgs.git}/bin/git stash pop"; + gst = "${pkgs.git}/bin/git status"; - tigs = "tig status"; + tigs = "${pkgs.tig}/bin/tig status"; }; }; }