diff --git a/flake.lock b/flake.lock
index f8de950..580e4d8 100644
--- a/flake.lock
+++ b/flake.lock
@@ -106,22 +106,6 @@
         "type": "github"
       }
     },
-    "fish-async-prompt": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1707036484,
-        "narHash": "sha256-J7y3BjqwuEH4zDQe4cWylLn+Vn2Q5pv0XwOSPwhw/Z0=",
-        "owner": "acomagu",
-        "repo": "fish-async-prompt",
-        "rev": "316aa03c875b58e7c7f7d3bc9a78175aa47dbaa8",
-        "type": "github"
-      },
-      "original": {
-        "owner": "acomagu",
-        "repo": "fish-async-prompt",
-        "type": "github"
-      }
-    },
     "flake-compat": {
       "flake": false,
       "locked": {
@@ -1367,7 +1351,6 @@
         "comma": "comma",
         "diagram.nvim": "diagram.nvim",
         "fioul": "fioul",
-        "fish-async-prompt": "fish-async-prompt",
         "flake-parts": "flake-parts",
         "flake-root": "flake-root",
         "glaurung": "glaurung",
diff --git a/flake.nix b/flake.nix
index ce1bc3c..c9d6be3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -78,11 +78,6 @@
     };
     fioul.url = "github:traxys/fioul";
 
-    fish-async-prompt = {
-      url = "github:acomagu/fish-async-prompt";
-      flake = false;
-    };
-
     nixvim = {
       url = "github:nix-community/nixvim";
       #url = "/home/traxys/Documents/nixvim";
diff --git a/minimal/hm.nix b/minimal/hm.nix
index bfc29be..c9b91c2 100644
--- a/minimal/hm.nix
+++ b/minimal/hm.nix
@@ -165,13 +165,12 @@
 
     programs.starship = {
       enable = true;
-      enableFishIntegration = false;
+      enableFishIntegration = true;
       settings =
         let
           background = "#3e3e3e";
         in
         {
-          command_timeout = 3000;
           add_newline = true;
 
           format = lib.concatStrings [
@@ -299,13 +298,6 @@
     programs.fish = {
       enable = true;
 
-      plugins = [
-        {
-          name = "fish-async-prompt";
-          src = inputs.fish-async-prompt;
-        }
-      ];
-
       functions = {
         fish_greeting = ''
           ${pkgs.fortune}/bin/fortune \
@@ -392,8 +384,6 @@
         if status is-login
           keychain --eval $SSH_KEYS_TO_AUTOLOAD | source
         end
-
-        starship init fish | source
       '';
 
       shellAliases = {