Merge pull request #220384 from Scrumplex/cool-fish-plugins

6 files changed, 131 insertions, 0 deletions

diff --git a/pkgs/shells/fish/plugins/bobthefish.nix b/pkgs/shells/fish/plugins/bobthefish.nix
new file mode 100644
index 00000000000..e39f6198534
--- /dev/null
+++ b/pkgs/shells/fish/plugins/bobthefish.nix
@@ -0,0 +1,23 @@
+{ lib
+, buildFishPlugin
+, fetchFromGitHub
+,
+}:
+buildFishPlugin rec {
+  pname = "bobthefish";
+  version = "unstable-2022-08-02";
+
+  src = fetchFromGitHub {
+    owner = "oh-my-fish";
+    repo = "theme-bobthefish";
+    rev = "2dcfcab653ae69ae95ab57217fe64c97ae05d8de";
+    sha256 = "sha256-jBbm0wTNZ7jSoGFxRkTz96QHpc5ViAw9RGsRBkCQEIU=";
+  };
+
+  meta = with lib; {
+    description = "A Powerline-style, Git-aware fish theme optimized for awesome";
+    homepage = "https://github.com/oh-my-fish/theme-bobthefish";
+    license = licenses.mit;
+    maintainers = with maintainers; [ Scrumplex ];
+  };
+}
diff --git a/pkgs/shells/fish/plugins/bobthefisher.nix b/pkgs/shells/fish/plugins/bobthefisher.nix
new file mode 100644
index 00000000000..1930890d4de
--- /dev/null
+++ b/pkgs/shells/fish/plugins/bobthefisher.nix
@@ -0,0 +1,23 @@
+{ lib
+, buildFishPlugin
+, fetchFromGitHub
+,
+}:
+buildFishPlugin rec {
+  pname = "bobthefisher";
+  version = "unstable-2023-03-09";
+
+  src = fetchFromGitHub {
+    owner = "Scrumplex";
+    repo = "bobthefisher";
+    rev = "6528033a2c9ca90611d04b6a4afd2131b9495cdc";
+    sha256 = "sha256-UDoSMFKtd6ur10guqJlkpA0YSCBv45FR5QKJqdXZWgw=";
+  };
+
+  meta = with lib; {
+    description = "A Powerline-style, Git-aware fish theme optimized for awesome (fork of bobthefish)";
+    homepage = "https://github.com/Scrumplex/bobthefisher";
+    license = licenses.mit;
+    maintainers = with maintainers; [ Scrumplex ];
+  };
+}
diff --git a/pkgs/shells/fish/plugins/default.nix b/pkgs/shells/fish/plugins/default.nix
index 8f8dd128c84..dbac3e30e34 100644
--- a/pkgs/shells/fish/plugins/default.nix
+++ b/pkgs/shells/fish/plugins/default.nix
@@ -5,6 +5,10 @@ lib.makeScope newScope (self: with self; {
 
   autopair = callPackage ./autopair.nix { };
 
+  bobthefish = callPackage ./bobthefish.nix { };
+
+  bobthefisher = callPackage ./bobthefisher.nix { };
+
   buildFishPlugin = callPackage ./build-fish-plugin.nix { };
 
   colored-man-pages = callPackage ./colored-man-pages.nix { };
@@ -24,10 +28,14 @@ lib.makeScope newScope (self: with self; {
 
   forgit = callPackage ./forgit.nix { };
 
+  fzf = callPackage ./fzf.nix { };
+
   fzf-fish = callPackage ./fzf-fish.nix { };
 
   grc = callPackage ./grc.nix { };
 
+  humantime-fish = callPackage ./humantime-fish.nix { };
+
   hydro = callPackage ./hydro.nix { };
 
   pisces = callPackage ./pisces.nix { };
@@ -41,6 +49,8 @@ lib.makeScope newScope (self: with self; {
   sponge = callPackage ./sponge.nix { };
 
   tide = callPackage ./tide.nix { };
+
+  z = callPackage ./z.nix { };
 } // lib.optionalAttrs config.allowAliases {
   autopair-fish = self.autopair; # Added 2023-03-10
 })
diff --git a/pkgs/shells/fish/plugins/fzf.nix b/pkgs/shells/fish/plugins/fzf.nix
new file mode 100644
index 00000000000..fa7e33da6a7
--- /dev/null
+++ b/pkgs/shells/fish/plugins/fzf.nix
@@ -0,0 +1,23 @@
+{ lib
+, buildFishPlugin
+, fetchFromGitHub
+,
+}:
+buildFishPlugin rec {
+  pname = "fzf";
+  version = "unstable-2021-05-12";
+
+  src = fetchFromGitHub {
+    owner = "jethrokuan";
+    repo = pname;
+    rev = "479fa67d7439b23095e01b64987ae79a91a4e283";
+    sha256 = "sha256-28QW/WTLckR4lEfHv6dSotwkAKpNJFCShxmKFGQQ1Ew=";
+  };
+
+  meta = with lib; {
+    description = "Ef-fish-ient fish keybindings for fzf";
+    homepage = "https://github.com/jethrokuan/fzf";
+    license = licenses.mit;
+    maintainers = with maintainers; [ Scrumplex ];
+  };
+}
diff --git a/pkgs/shells/fish/plugins/humantime-fish.nix b/pkgs/shells/fish/plugins/humantime-fish.nix
new file mode 100644
index 00000000000..8e1c960e59e
--- /dev/null
+++ b/pkgs/shells/fish/plugins/humantime-fish.nix
@@ -0,0 +1,29 @@
+{ lib
+, buildFishPlugin
+, fetchFromGitHub
+, fishtape
+,
+}:
+buildFishPlugin rec {
+  pname = "humantime-fish";
+  version = "unstable-2022-04-08";
+
+  src = fetchFromGitHub {
+    owner = "jorgebucaran";
+    repo = "humantime.fish";
+    rev = "53b2adb4c6aff0da569c931a3cc006efcd0e7219";
+    sha256 = "sha256-792rPsf2WDIYcP8gn6TbHh9RZvskfOAL/oKfpilaLh0=";
+  };
+
+  checkPlugins = [ fishtape ];
+  checkPhase = ''
+    fishtape tests/humantime.fish
+  '';
+
+  meta = with lib; {
+    description = "Turn milliseconds into a human-readable string in Fish";
+    homepage = "https://github.com/jorgebucaran/humantime.fish";
+    license = licenses.mit;
+    maintainers = with maintainers; [ Scrumplex ];
+  };
+}
diff --git a/pkgs/shells/fish/plugins/z.nix b/pkgs/shells/fish/plugins/z.nix
new file mode 100644
index 00000000000..207c68a43d7
--- /dev/null
+++ b/pkgs/shells/fish/plugins/z.nix
@@ -0,0 +1,23 @@
+{ lib
+, buildFishPlugin
+, fetchFromGitHub
+,
+}:
+buildFishPlugin rec {
+  pname = "z";
+  version = "unstable-2022-04-08";
+
+  src = fetchFromGitHub {
+    owner = "jethrokuan";
+    repo = pname;
+    rev = "85f863f20f24faf675827fb00f3a4e15c7838d76";
+    sha256 = "sha256-+FUBM7CodtZrYKqU542fQD+ZDGrd2438trKM0tIESs0=";
+  };
+
+  meta = with lib; {
+    description = "Pure-fish z directory jumping";
+    homepage = "https://github.com/jethrokuan/z";
+    license = licenses.mit;
+    maintainers = with maintainers; [ Scrumplex ];
+  };
+}