From 5c2a9662eb299f63afde8f3e301ac7108e8dbbee Mon Sep 17 00:00:00 2001
From: zoe <ZoeOosting@outlook.com>
Date: Thu, 23 Mar 2023 12:37:15 +0100
Subject: [PATCH] remove fish shell greeting again

---
 fish/settings.nix | 23 +++++++++++++++++++----
 home.nix          |  6 +++++-
 user.nix          |  4 ++++
 3 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/fish/settings.nix b/fish/settings.nix
index 0368de5..cc46db7 100644
--- a/fish/settings.nix
+++ b/fish/settings.nix
@@ -1,17 +1,23 @@
 { config, pkgs, ... }: {
   home-manager.users.zoe.programs.fish = {
     interactiveShellInit = ''
+      set fish_greeting
+      supercolor --columns 5
       set -g man_blink -o red
       set -g man_bold -o green
       set -g man_standout -b black
-      supercolor --columns 5
     '';
     enable = true;
-    shellAliases = {};
+    shellAbbrs = {
+      icat = "kitty +kitten icat";
+    };
+    shellAliases = {
+      ls = "lsd";
+    };
     plugins = [
       {
-        name = "pure";
-        src = pkgs.fishPlugins.pure.src;
+        name = "fzf-fish";
+        src = pkgs.fishPlugins.fzf-fish.src;
       }
       {
         name = "done";
@@ -30,6 +36,15 @@
           sha256 = "uoZ4eSFbZlsRfISIkJQp24qPUNqxeD0JbRb/gVdRYlA=";
         };
       }
+      {
+        name = "z";
+        src = pkgs.fetchFromGitHub {
+          owner = "jethrokuan";
+          repo = "z";
+          rev = "85f863f20f24faf675827fb00f3a4e15c7838d76";
+          sha256 = "+FUBM7CodtZrYKqU542fQD+ZDGrd2438trKM0tIESs0=";
+        };
+      }
     ];
     functions = {
       fuck = ''
diff --git a/home.nix b/home.nix
index da711e2..708e288 100644
--- a/home.nix
+++ b/home.nix
@@ -84,7 +84,11 @@ in
         package = pkgs.catppuccin-gtk;
       };
     };
-
+    programs.starship = {
+      enable = true;
+      enableFishIntegration = true;
+      enableBashIntegration = true;
+    };
   };
 
 }
diff --git a/user.nix b/user.nix
index 7dce04f..c51c193 100644
--- a/user.nix
+++ b/user.nix
@@ -100,6 +100,10 @@ in
       supercolor.packages.${pkgs.system}.default
       kaokao.packages.${pkgs.system}.default
       thefuck
+      lsd
+      bat
+      fd
+      fzf
 
       # window manager
       rofimoji