diff --git a/configuration.nix b/master.nix
similarity index 100%
rename from configuration.nix
rename to master.nix
diff --git a/user/stormwind/fish.nix b/user/stormwind/fish.nix
index b443192..2bf904c 100644
--- a/user/stormwind/fish.nix
+++ b/user/stormwind/fish.nix
@@ -9,6 +9,22 @@
       fish_vi_key_bindings # Vi bindings
     '';
 
+    shellAliases = {
+      ll = "ls -l";
+      nix-update = "sudo nixos-rebuild switch -I nixos-config=/etc/nixos/master.nix";
+      gda = "git add --all";
+      gst = "git status";
+      gcm = "git commit -m";
+      gush = "git push";
+      gull = "git pull";
+      glone = "git clone";
+      giff = "git diff";
+      gog = "git log";
+      open = "xdg-open";
+      vim = "nvim";
+      vi = "nvim";
+    };
+
     plugins = [
       # Enable a plugin (here grc for colorized command output) from nixpkgs
       { name = "grc"; src = pkgs.fishPlugins.grc.src; }