diff --git a/home-manager/hblobner_at_devvie.nix b/home-manager/hblobner_at_devvie.nix
index 07a26bb..c17a41c 100644
--- a/home-manager/hblobner_at_devvie.nix
+++ b/home-manager/hblobner_at_devvie.nix
@@ -1,15 +1,22 @@
 { config, pkgs, ... }:
 
 {
-  imports = [ ./modules/starship.nix ];
+  imports = [
+    ./modules/fish.nix 
+    ./modules/starship.nix 
+  ];
   # Home Manager needs a bit of information about you and the
   # paths it should manage.
   home.username = "hblobner";
   home.homeDirectory = "/home/hblobner";
 
+  fonts.fontconfig.enable = true;
+
   # Packages that should be installed to the user profile.
   home.packages = with pkgs; [
-    alacritty
+    (pkgs.nerdfonts.override { fonts = [ "FiraCode" "DroidSansMono" ]; })
+
+    exa
     fasd
     fd
     htop
diff --git a/home-manager/modules/fish.nix b/home-manager/modules/fish.nix
new file mode 100644
index 0000000..b1d19b6
--- /dev/null
+++ b/home-manager/modules/fish.nix
@@ -0,0 +1,23 @@
+{ config, pkgs, ... }:
+
+{
+  programs.fish = {
+    enable = true;
+    autocd = true;
+    dotDir = ".config/zsh";
+    enableAutosuggestions = true;
+    enableCompletion = true;
+
+    defaultKeymap = "viins";
+
+    shellAliases = {
+      "..." = "cd";
+      sl = "exa";
+      ls = "exa";
+      l = "exa -l";
+      la = "exa -la";
+
+      rs = "rsync -a --info=progress2 ";
+    };
+  };
+}
diff --git a/home-manager/modules/starship.nix b/home-manager/modules/starship.nix
index 13ceb4f..76780b8 100644
--- a/home-manager/modules/starship.nix
+++ b/home-manager/modules/starship.nix
@@ -3,15 +3,17 @@
 {
   programs.starship = {
     enable = true;
-    enableZshIntegration = true;
+    enableFishIntegration = true;
 
     settings = {
       add_newline = true;
 
+      command_timeout = 10000;
+
       scan_timeout = 10;
 
       character = {
-        success_symbol = "[->](bold green)";
+        success_symbol = "[➜](bold green)";
       };
 
       directory = {