From 4b966a47362ec63aad6ee031af835de21417cbfe Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Mon, 28 Aug 2023 12:18:36 +0100 Subject: [PATCH] chore(zsh): move aliases --- system/shared/home-manager.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/system/shared/home-manager.nix b/system/shared/home-manager.nix index 6ca2fbd..dad3ee1 100644 --- a/system/shared/home-manager.nix +++ b/system/shared/home-manager.nix @@ -182,11 +182,9 @@ in slp = "log --oneline --decorate"; staged = "diff --staged"; unassume = "update-index --no-assume-unchanged"; - uncommit = "reset --soft HEAD^"; unstage = "reset"; upstream = "rev-parse --abbrev-ref --symbolic-full-name @{u}"; ureset = "!git reset --hard $(git upstream)"; - wip = "!git add . && git commit -m 'wip'"; worktrees = "worktree list"; }; @@ -307,14 +305,15 @@ in ialias dev="develop" ialias fetch="git fetch --all --jobs=4 --progress --prune" ialias nah="git reset --hard; git clean -fd" - ialias run="./run" ialias pull="git pull --autostash --jobs=4 --summary origin" ialias rebase="git rebase --autostash --stat" ialias run="./run" ialias s="secrets" ialias secrets="doppler --project \"$(whoami)\" run" ialias tag="tag-release" + ialias uncommit = "git reset --soft HEAD^"; ialias update="fetch && rebase" + ialias wip = "git add . && git commit -m 'wip'"; ialias ls="exa -la"