From f44a5826f2073d77a88a215989d2641fb01ffe3c Mon Sep 17 00:00:00 2001
From: willifan <willifan@proton.me>
Date: Fri, 11 Oct 2024 19:00:07 +0200
Subject: [PATCH 1/3] moved hyfetch to shell

---
 users/willifan/common/default.nix             | 1 -
 users/willifan/common/shell/default.nix       | 1 +
 users/willifan/common/{ => shell}/hyfetch.nix | 0
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename users/willifan/common/{ => shell}/hyfetch.nix (100%)

diff --git a/users/willifan/common/default.nix b/users/willifan/common/default.nix
index 2d1a652..bb63c10 100644
--- a/users/willifan/common/default.nix
+++ b/users/willifan/common/default.nix
@@ -8,7 +8,6 @@
 
     ./envvar.nix
     ./git.nix
-    ./hyfetch.nix
     ./locales.nix
     ./user.nix
   ];
diff --git a/users/willifan/common/shell/default.nix b/users/willifan/common/shell/default.nix
index 08704ad..b18c40b 100644
--- a/users/willifan/common/shell/default.nix
+++ b/users/willifan/common/shell/default.nix
@@ -2,6 +2,7 @@
 {
 
   imports = [
+    ./hyfetch.nix
     ./nushell.nix
     ./ssh.nix
     ./starship.nix
diff --git a/users/willifan/common/hyfetch.nix b/users/willifan/common/shell/hyfetch.nix
similarity index 100%
rename from users/willifan/common/hyfetch.nix
rename to users/willifan/common/shell/hyfetch.nix

From a20e749bd76284fea06b5a74e3049474eea3f87f Mon Sep 17 00:00:00 2001
From: willifan <willifan@proton.me>
Date: Sat, 12 Oct 2024 21:50:17 +0200
Subject: [PATCH 2/3] configured and set default to bash, added zoxide

---
 users/willifan/common/shell/bash.nix     | 17 +++++++++++++++++
 users/willifan/common/shell/default.nix  |  4 +++-
 users/willifan/common/shell/nushell.nix  | 11 +++++++++--
 users/willifan/common/shell/starship.nix |  1 -
 users/willifan/common/shell/zoxide.nix   | 13 +++++++++++++
 5 files changed, 42 insertions(+), 4 deletions(-)
 create mode 100644 users/willifan/common/shell/bash.nix
 create mode 100644 users/willifan/common/shell/zoxide.nix

diff --git a/users/willifan/common/shell/bash.nix b/users/willifan/common/shell/bash.nix
new file mode 100644
index 0000000..ece7fb5
--- /dev/null
+++ b/users/willifan/common/shell/bash.nix
@@ -0,0 +1,17 @@
+{ ... }:
+{
+  
+  home-manager.users.willifan = {
+    programs = {
+      bash = {
+        enable = true;
+      };
+      starship = {
+        enableBashIntegration = true;
+      };
+    };
+  };
+
+#  programs.bash.blesh.enable = true;
+
+}
diff --git a/users/willifan/common/shell/default.nix b/users/willifan/common/shell/default.nix
index b18c40b..6064585 100644
--- a/users/willifan/common/shell/default.nix
+++ b/users/willifan/common/shell/default.nix
@@ -2,13 +2,15 @@
 {
 
   imports = [
+    ./bash.nix
     ./hyfetch.nix
     ./nushell.nix
     ./ssh.nix
     ./starship.nix
+    ./zoxide.nix
     ./zsh.nix
   ];
 
-  users.users.willifan.shell = pkgs.nushell;
+  users.users.willifan.shell = pkgs.bash;
 
 }
diff --git a/users/willifan/common/shell/nushell.nix b/users/willifan/common/shell/nushell.nix
index a07f4e0..77d54d9 100644
--- a/users/willifan/common/shell/nushell.nix
+++ b/users/willifan/common/shell/nushell.nix
@@ -1,8 +1,15 @@
 { ... }:
 {
 
-  home-manager.users.willifan.programs.nushell = {
-    enable = true;
+  home-manager.users.willifan = {
+    programs = {
+      nushell = {
+        enable = true;
+      };
+      starship = {
+        enableNushellIntegration = true;
+      };
+    };
   };
 
 }
diff --git a/users/willifan/common/shell/starship.nix b/users/willifan/common/shell/starship.nix
index 585f20e..417b914 100644
--- a/users/willifan/common/shell/starship.nix
+++ b/users/willifan/common/shell/starship.nix
@@ -3,7 +3,6 @@
 
   home-manager.users.willifan.programs.starship = {
     enable = true;
-    enableNushellIntegration = true;
     settings = {
       format = lib.concatStrings [
 	"[  ](fg:twelve bg:trans_blue)"
diff --git a/users/willifan/common/shell/zoxide.nix b/users/willifan/common/shell/zoxide.nix
new file mode 100644
index 0000000..4612a20
--- /dev/null
+++ b/users/willifan/common/shell/zoxide.nix
@@ -0,0 +1,13 @@
+{ ... }:
+{
+
+  home-manager.users.willifan = {
+    programs.zoxide = {
+      enable = true;
+      options = [
+        "--cmd cd"
+      ];
+    };
+  };
+
+}

From 0ddacb06ae5226bf22cf356e9b7a801a9164edb9 Mon Sep 17 00:00:00 2001
From: willifan <willifan@proton.me>
Date: Sat, 12 Oct 2024 23:38:11 +0200
Subject: [PATCH 3/3] added eza

---
 users/willifan/common/shell/default.nix |  1 +
 users/willifan/common/shell/eza.nix     | 10 ++++++++++
 2 files changed, 11 insertions(+)
 create mode 100644 users/willifan/common/shell/eza.nix

diff --git a/users/willifan/common/shell/default.nix b/users/willifan/common/shell/default.nix
index 6064585..ca4468f 100644
--- a/users/willifan/common/shell/default.nix
+++ b/users/willifan/common/shell/default.nix
@@ -3,6 +3,7 @@
 
   imports = [
     ./bash.nix
+    ./eza.nix
     ./hyfetch.nix
     ./nushell.nix
     ./ssh.nix
diff --git a/users/willifan/common/shell/eza.nix b/users/willifan/common/shell/eza.nix
new file mode 100644
index 0000000..bcd651d
--- /dev/null
+++ b/users/willifan/common/shell/eza.nix
@@ -0,0 +1,10 @@
+{ ... }:
+{
+
+  home-manager.users.willifan = {
+    programs.eza = {
+      enable = true;
+    };
+  };
+
+}