diff --git a/machines/thaylen-city/default.nix b/machines/thaylen-city/default.nix
index c423be09..adcfb0b1 100644
--- a/machines/thaylen-city/default.nix
+++ b/machines/thaylen-city/default.nix
@@ -107,7 +107,14 @@
           ];
           theme = "robbyrussell";
         };
-        sessionVariables = { DEFAULT_USER = "charlotte.vanpetegem"; };
+        sessionVariables = { 
+          DEFAULT_USER = "charlotte.vanpetegem"; 
+          # Until I get emacs set up on this machine
+	  EDITOR = "vim";
+        };
+        shellAliases = {
+          gupd = "gfa && gprom";
+        };
         syntaxHighlighting.enable = true;
       };
       git = {