diff --git a/modules/applications/shells/aliases.nix b/modules/applications/shells/aliases.nix
new file mode 100644
index 0000000..58746f6
--- /dev/null
+++ b/modules/applications/shells/aliases.nix
@@ -0,0 +1 @@
+{ ls = "exa -l"; }
diff --git a/modules/applications/shells/default.nix b/modules/applications/shells/default.nix
index 0e5ee73..6adb9c4 100644
--- a/modules/applications/shells/default.nix
+++ b/modules/applications/shells/default.nix
@@ -1,7 +1 @@
-{ ... }: {
-  imports = [ ./sessionVariables.nix ];
-  home-manager.users.adrielus.programs = {
-    zsh.enable = true;
-    fish.enable = true;
-  };
-}
+{ pkgs, ... }: { imports = [ ./sessionVariables.nix ./fish.nix ]; }
diff --git a/modules/applications/shells/fish.nix b/modules/applications/shells/fish.nix
new file mode 100644
index 0000000..f712e7e
--- /dev/null
+++ b/modules/applications/shells/fish.nix
@@ -0,0 +1,13 @@
+{ pkgs, ... }:
+let shellAliases = import ./aliases.nix;
+in {
+  home-manager.users.adrielus.programs.fish = {
+    inherit shellAliases;
+
+    enable = true;
+    # plugins = [{
+    #   name = "agnoster";
+    #   src = pkgs.agnoster;
+    # }];
+  };
+}
diff --git a/modules/users.nix b/modules/users.nix
index 881b7e5..e64d5d0 100644
--- a/modules/users.nix
+++ b/modules/users.nix
@@ -1,4 +1,4 @@
-{ ... }:
+{ pkgs, ... }:
 with import ../secrets.nix; {
   users = {
     mutableUsers = false;
@@ -7,6 +7,7 @@ with import ../secrets.nix; {
 
       extraGroups = [ "wheel" "networkmanager" ];
       isNormalUser = true;
+      shell = pkgs.fish;
     };
   };
 }
diff --git a/nix/sources.json b/nix/sources.json
index 5ada23f..5fd05a1 100644
--- a/nix/sources.json
+++ b/nix/sources.json
@@ -11,6 +11,18 @@
         "url": "https://github.com/nix-community/NUR/archive/d28e8f7d40e2683d57589f8ffa7568bdf89d316f.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
+    "agnoster": {
+        "branch": "master",
+        "description": null,
+        "homepage": null,
+        "owner": "oh-my-fish",
+        "repo": "theme-agnoster",
+        "rev": "99d4e9f1b6bb1c828155495bddf3e0f0516e35f1",
+        "sha256": "0vyg30zi3xhl7m2y40ihb7ikwifz5ifq5wq0y58rz9hpb19wf8ws",
+        "type": "tarball",
+        "url": "https://github.com/oh-my-fish/theme-agnoster/archive/99d4e9f1b6bb1c828155495bddf3e0f0516e35f1.tar.gz",
+        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
+    },
     "all-hies": {
         "branch": "master",
         "description": "Cached Haskell IDE Engine Nix builds for all GHC versions",