From fa84ae1d229da9206feec2ea2ceffa9d3d788a58 Mon Sep 17 00:00:00 2001
From: jeschli <jeschli@gmail.com>
Date: Fri, 2 Nov 2018 09:37:31 +0100
Subject: j brauerei: add new aliases

---
 jeschli/1systems/brauerei/config.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/jeschli/1systems/brauerei/config.nix b/jeschli/1systems/brauerei/config.nix
index 047da871..8e96cb8a 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";
-- 
cgit v1.2.3