From cfef939e7d5035187fd2924dbd5a54cd1b5370a9 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Mon, 10 Jul 2023 20:58:41 +0100
Subject: [PATCH] Add fzf config and integration

---
 home/env/bash.nix | 24 ++++++++++++++----------
 home/env/fish.nix | 41 ++++++++++++++++++++++-------------------
 home/env/fzf.nix  | 19 +++++++++++++++++++
 home/env/zsh.nix  |  1 +
 4 files changed, 56 insertions(+), 29 deletions(-)
 create mode 100644 home/env/fzf.nix

diff --git a/home/env/bash.nix b/home/env/bash.nix
index 80ea3669..306c37b6 100644
--- a/home/env/bash.nix
+++ b/home/env/bash.nix
@@ -1,13 +1,17 @@
 {...}: {
-  programs.bash.enable = true;
-  programs.readline = {
-    enable = true;
-    includeSystemConfig = true;
-    extraConfig = ''
-      set completion-ignore-case On
-    '';
+  programs = {
+    bash.enable = true;
+    readline = {
+      enable = true;
+      includeSystemConfig = true;
+      extraConfig = ''
+        set completion-ignore-case On
+      '';
+    };
+    keychain.enableBashIntegration = true;
+    starship.enableBashIntegration = true;
+    direnv.enableBashIntegration = true;
+    nix-index.enableBashIntegration = true;
+    fzf.enableBashIntegration = true;
   };
-  programs.keychain.enableBashIntegration = true;
-  programs.starship.enableBashIntegration = true;
-  programs.nix-index.enableBashIntegration = true;
 }
diff --git a/home/env/fish.nix b/home/env/fish.nix
index cdaade45..87a7187a 100644
--- a/home/env/fish.nix
+++ b/home/env/fish.nix
@@ -1,22 +1,25 @@
 {pkgs, ...}: {
-  programs.fish = {
-    enable = true;
-    shellAbbrs = {lg = "lazygit";};
-    plugins = [
-      {
-        name = "tokyonight";
-        src =
-          pkgs.fetchFromGitHub {
-            owner = "folke";
-            repo = "tokyonight.nvim";
-            rev = "cd5156f4b4a6c4c337a46deb0c0bd37319920833";
-            sha256 = "/ht+ixR1eyYR0la00Xq5q1gCsgb5Ly90JghERwbaDPQ=";
-          }
-          + "/extras/fish/tokyonight_night.fish";
-      }
-    ];
+  programs = {
+    fish = {
+      enable = true;
+      shellAbbrs = {lg = "lazygit";};
+      plugins = [
+        {
+          name = "tokyonight";
+          src =
+            pkgs.fetchFromGitHub {
+              owner = "folke";
+              repo = "tokyonight.nvim";
+              rev = "cd5156f4b4a6c4c337a46deb0c0bd37319920833";
+              sha256 = "/ht+ixR1eyYR0la00Xq5q1gCsgb5Ly90JghERwbaDPQ=";
+            }
+            + "/extras/fish/tokyonight_night.fish";
+        }
+      ];
+    };
+    keychain.enableFishIntegration = true;
+    starship.enableFishIntegration = true;
+    nix-index.enableFishIntegration = true;
+    fzf.enableFishIntegration = true;
   };
-  programs.keychain.enableFishIntegration = true;
-  programs.starship.enableFishIntegration = true;
-  programs.nix-index.enableFishIntegration = true;
 }
diff --git a/home/env/fzf.nix b/home/env/fzf.nix
new file mode 100644
index 00000000..d7a83c15
--- /dev/null
+++ b/home/env/fzf.nix
@@ -0,0 +1,19 @@
+{...}: {
+  programs.fzf = {
+    enable = true;
+    colors = {
+      fg = "-1";
+      bg = "-1";
+      hl = "#c678dd";
+      "fg+" = "#ffffff";
+      "bg+" = "#4b5263";
+      "hl+" = "#d858fe";
+      info = "#98c379";
+      prompt = "#61afef";
+      pointer = "#be5046";
+      marker = "#e5c07b";
+      spinner = "#61afef";
+      header = "#61afef";
+    };
+  };
+}
diff --git a/home/env/zsh.nix b/home/env/zsh.nix
index 83887ce5..023f0987 100644
--- a/home/env/zsh.nix
+++ b/home/env/zsh.nix
@@ -15,5 +15,6 @@
     starship.enableZshIntegration = true;
     direnv.enableZshIntegration = true;
     nix-index.enableZshIntegration = true;
+    fzf.enableZshIntegration = true;
   };
 }