diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..38156aa
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+keys
\ No newline at end of file
diff --git a/common/default.nix b/common/default.nix
index 2185e1e..65d78ff 100644
--- a/common/default.nix
+++ b/common/default.nix
@@ -1,4 +1,4 @@
-{ ... }:
+{ pkgs, ... }:
 
 {
   imports = [ ./users ];
@@ -16,6 +16,8 @@
   # Set your time zone.
   time.timeZone = "Europe/Amsterdam";
 
+  programs.fish.enable = true;
+
   # Optimize nix store by hardlinking identitical files.
   nix = {
     package = pkgs.nixUnstable;
diff --git a/common/users/default.nix b/common/users/default.nix
index 2579ef6..d9eebfa 100644
--- a/common/users/default.nix
+++ b/common/users/default.nix
@@ -5,6 +5,8 @@
   programs.neovim.enable = true;
   programs.neovim.viAlias = true;
 
+  users.defaultUserShell = pkgs.fish;
+
   users.extraUsers.jdejeu = {
     isNormalUser = true;
     home = "/home/jdejeu";
@@ -22,6 +24,6 @@
     openssh.authorizedKeys.keys =
       config.users.users.jdejeu.openssh.authorizedKeys.keys;
     # Also use zsh for root
-    shell = pkgs.zsh;
+    shell = pkgs.fish;
   };
 }