j brauerei: add new aliases

1 files changed, 5 insertions, 0 deletions

diff --git a/jeschli/1systems/brauerei/config.nix b/jeschli/1systems/brauerei/config.nix
index 047da8714..8e96cb8ad 100644
--- a/jeschli/1systems/brauerei/config.nix
+++ b/jeschli/1systems/brauerei/config.nix
@@ -31,10 +31,15 @@
   nixpkgs.config.allowUnfree = true;
 
   environment.shellAliases = {
+    # emacs aliases
+    ed = "emacsclient";
+    edc = "emacsclient --create-frame";
     # git aliases
     ga = "git add";
     gch = "git checkout";
     gco = "git commit";
+    gf = "git fetch";
+    gm = "git merge";
     gp = "git push";
     gr = "git rebase";
     gs = "git status";