about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--home/modules/development.nix46
-rw-r--r--home/modules/shell.nix46
2 files changed, 46 insertions, 46 deletions
diff --git a/home/modules/development.nix b/home/modules/development.nix
index 326193f61444..54a0e6e68469 100644
--- a/home/modules/development.nix
+++ b/home/modules/development.nix
@@ -89,6 +89,52 @@ with lib;
   };
 
   programs.zsh.shellAliases = {
+    # Git
+    "gwip" = "git add . && git commit -am wip";
+    "gpr" = "g pull-request";
+    "gcl" = "git clone";
+    "grs" = "gr --soft";
+    "grhh" = "grh HEAD";
+    "grh" = "gr --hard";
+    "gr" = "git reset";
+    "gcb" = "gc -b";
+    "gco" = "gc";
+    "gcd" = "gc development";
+    "gcm" = "gc master";
+    "gc" = "git checkout";
+    "gbg" = "git branch | grep";
+    "gba" = "git branch -a";
+    "gb" = "git branch";
+    "gcv" = "git commit --verbose";
+    "gci" = "git commit";
+    "gm" = "git merge";
+    "gdc" = "gd --cached";
+    "gd" = "git diff";
+    "gsl" = "git stash list";
+    "gss" = "git show stash";
+    "gsad" = "git stash drop";
+    "gsa" = "git stash";
+    "gst" = "gs";
+    "gs" = "git status";
+    "gg" = "gl --decorate --oneline --graph --date-order --all";
+    "gl" = "git log";
+    "gf" = "git fetch";
+    "gur" = "gu --rebase";
+    "gu" = "git pull";
+    "gpf" = "gp -f";
+    "gpa" = "gp --all";
+    "gpu" = "git push -u origin \"$(git symbolic-ref --short HEAD)\"";
+    "gp" = "git push";
+    "ganw" = "git diff -w --no-color | git apply --cached --ignore-whitespace";
+    "ga" = "git add";
+    "gnp" = "git --no-pager";
+    "g" = "git";
+    "git" = "hub";
+    "grim" = "git fetch && git rebase -i origin/master";
+    "grc" = "git rebase --continue";
+    "gcan" = "git commit --amend --no-edit";
+    "grl" = "git reflog";
+
     # Haskell
     "cnb" = "cabal new-build";
     "cob" = "cabal old-build";
diff --git a/home/modules/shell.nix b/home/modules/shell.nix
index 411851bc5ea5..71e607063fe2 100644
--- a/home/modules/shell.nix
+++ b/home/modules/shell.nix
@@ -28,52 +28,6 @@ let
     "dockercleanimages" = "docker images -a --no-trunc | grep none | awk '{print \$$3}' | xargs -L 1 -r docker rmi";
     "dockercleancontainers" = "docker ps -a --no-trunc| grep 'Exit' | awk '{print \$$1}' | xargs -L 1 -r docker rm";
 
-    # Git
-    "gwip" = "git add . && git commit -am wip";
-    "gpr" = "g pull-request";
-    "gcl" = "git clone";
-    "grs" = "gr --soft";
-    "grhh" = "grh HEAD";
-    "grh" = "gr --hard";
-    "gr" = "git reset";
-    "gcb" = "gc -b";
-    "gco" = "gc";
-    "gcd" = "gc development";
-    "gcm" = "gc master";
-    "gc" = "git checkout";
-    "gbg" = "git branch | grep";
-    "gba" = "git branch -a";
-    "gb" = "git branch";
-    "gcv" = "git commit --verbose";
-    "gci" = "git commit";
-    "gm" = "git merge";
-    "gdc" = "gd --cached";
-    "gd" = "git diff";
-    "gsl" = "git stash list";
-    "gss" = "git show stash";
-    "gsad" = "git stash drop";
-    "gsa" = "git stash";
-    "gst" = "gs";
-    "gs" = "git status";
-    "gg" = "gl --decorate --oneline --graph --date-order --all";
-    "gl" = "git log";
-    "gf" = "git fetch";
-    "gur" = "gu --rebase";
-    "gu" = "git pull";
-    "gpf" = "gp -f";
-    "gpa" = "gp --all";
-    "gpu" = "git push -u origin \"$(git symbolic-ref --short HEAD)\"";
-    "gp" = "git push";
-    "ganw" = "git diff -w --no-color | git apply --cached --ignore-whitespace";
-    "ga" = "git add";
-    "gnp" = "git --no-pager";
-    "g" = "git";
-    "git" = "hub";
-    "grim" = "git fetch && git rebase -i origin/master";
-    "grc" = "git rebase --continue";
-    "gcan" = "git commit --amend --no-edit";
-    "grl" = "git reflog";
-
     # Directories
     stck = "dirs -v";
     b= "cd ~1";