From 6931ca6aedc8d51f386169ca3c7a5c6fc6139690 Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Tue, 20 Jun 2023 23:36:07 +0200
Subject: [PATCH] starship needs to start later than ble.sh somehow

use fzf completion with ble.sh again
---
 modules/terminal-life/bash/default.nix | 5 +++++
 modules/terminal-life/fzf/default.nix  | 5 +----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/modules/terminal-life/bash/default.nix b/modules/terminal-life/bash/default.nix
index 51949c5d..48e9e01e 100644
--- a/modules/terminal-life/bash/default.nix
+++ b/modules/terminal-life/bash/default.nix
@@ -85,6 +85,11 @@ in {
     fi
 
     # end of .bashrc
+
+    # Somehow we need to ensure starship starts later than ble.sh
+    # (possible packaging issue?)
+    eval "$(${pkgs.starship}/bin/starship init bash)"
+
     [[ ''${BLE_VERSION-} ]] && ble-attach
   '';
 
diff --git a/modules/terminal-life/fzf/default.nix b/modules/terminal-life/fzf/default.nix
index 88e60592..372e768d 100644
--- a/modules/terminal-life/fzf/default.nix
+++ b/modules/terminal-life/fzf/default.nix
@@ -10,8 +10,5 @@
     "--color=fg:#d3d1d4,header:#7accd7,info:#e5c463,pointer:#ef9062"
     "--color=marker:#ef9062,fg+:#303030,prompt:#e5c463,hl+:#7accd7"
   ];
-  # Use ble.sh for completions, see
-  # modules/terminal-life/bash/default.nix -> bleopt complete_menu_style=desc
-  # and https://github.com/akinomyoga/ble.sh/wiki/Manual-%C2%A77-Completion
-  enableBashIntegration = false;
+  enableBashIntegration = true;
 }