diff --git a/home/default.nix b/home/default.nix
index 64acc10..b7917ef 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -3,8 +3,10 @@
   imports = [
     ./alacritty.nix
     ./emacs.nix
+    ./fish.nix
     ./flameshot.nix
     ./secrets
+    ./starship.nix
     ./themes
     ./tmux.nix
     ./x
diff --git a/home/fish.nix b/home/fish.nix
new file mode 100644
index 0000000..f16c1fa
--- /dev/null
+++ b/home/fish.nix
@@ -0,0 +1,11 @@
+{ config, lib, ... }:
+let
+  cfg = config.my.home.fish;
+in
+{
+  options.my.home.fish.enable = lib.mkEnableOption "Fish shell";
+
+  config = lib.mkIf cfg.enable {
+    programs.fish.enable = true;
+  };
+}
diff --git a/home/starship.nix b/home/starship.nix
new file mode 100644
index 0000000..8476c85
--- /dev/null
+++ b/home/starship.nix
@@ -0,0 +1,17 @@
+{ config, lib, ... }:
+let
+  cfg = config.my.home.starship;
+in
+{
+  options.my.home.starship.enable = lib.mkEnableOption "Starship.rs prompt";
+
+  config = lib.mkIf cfg.enable {
+    programs.starship = {
+      enable = true;
+      enableFishIntegration = true;
+      settings = {
+        add_newline = false;
+      };
+    };
+  };
+}
diff --git a/hosts/boreal/home.nix b/hosts/boreal/home.nix
index b178f61..cd94d72 100644
--- a/hosts/boreal/home.nix
+++ b/hosts/boreal/home.nix
@@ -7,6 +7,9 @@
     my.home.alacritty.enable = true;
     my.home.emacs.enable = true;
     my.home.tmux.enable = true;
+    my.home.starship.enable = false;
+    my.home.fish.enable = true;
+
     my.theme = config.home-manager.users.alarsyo.my.themes.solarizedLight;
   };
 }