From 49f4fa3a5ccf3e4e6c26cd0322615a29a3710777 Mon Sep 17 00:00:00 2001
From: willifan <willifan@proton.me>
Date: Mon, 7 Oct 2024 01:48:27 +0200
Subject: [PATCH] reorganized shell configs

---
 users/willifan/common/default.nix         |  3 +--
 users/willifan/common/shell/default.nix   | 11 +++++++++++
 users/willifan/common/shell/nushell.nix   |  8 ++++++++
 users/willifan/common/{ => shell}/ssh.nix |  0
 users/willifan/common/shell/starship.nix  |  4 ++++
 users/willifan/common/{ => shell}/zsh.nix |  0
 users/willifan/common/utils/default.nix   |  1 -
 7 files changed, 24 insertions(+), 3 deletions(-)
 create mode 100644 users/willifan/common/shell/default.nix
 create mode 100644 users/willifan/common/shell/nushell.nix
 rename users/willifan/common/{ => shell}/ssh.nix (100%)
 create mode 100644 users/willifan/common/shell/starship.nix
 rename users/willifan/common/{ => shell}/zsh.nix (100%)

diff --git a/users/willifan/common/default.nix b/users/willifan/common/default.nix
index f00a412..ac14084 100644
--- a/users/willifan/common/default.nix
+++ b/users/willifan/common/default.nix
@@ -2,14 +2,13 @@
 {
   imports = [
     ./nixvim
+    ./shell
     ./utils
     ./envvar.nix
     ./git.nix
     ./hyfetch.nix
     ./locales.nix
-    #./ssh.nix
     ./user.nix
-    ./zsh.nix
   ];
 
   home-manager.users.willifan.home.stateVersion = "23.11";
diff --git a/users/willifan/common/shell/default.nix b/users/willifan/common/shell/default.nix
new file mode 100644
index 0000000..c362ab4
--- /dev/null
+++ b/users/willifan/common/shell/default.nix
@@ -0,0 +1,11 @@
+{ ... }:
+{
+
+  imports = [
+    ./nushell.nix
+    ./ssh.nix
+    ./starship.nix
+    ./zsh.nix
+  ];
+
+}
diff --git a/users/willifan/common/shell/nushell.nix b/users/willifan/common/shell/nushell.nix
new file mode 100644
index 0000000..a07f4e0
--- /dev/null
+++ b/users/willifan/common/shell/nushell.nix
@@ -0,0 +1,8 @@
+{ ... }:
+{
+
+  home-manager.users.willifan.programs.nushell = {
+    enable = true;
+  };
+
+}
diff --git a/users/willifan/common/ssh.nix b/users/willifan/common/shell/ssh.nix
similarity index 100%
rename from users/willifan/common/ssh.nix
rename to users/willifan/common/shell/ssh.nix
diff --git a/users/willifan/common/shell/starship.nix b/users/willifan/common/shell/starship.nix
new file mode 100644
index 0000000..facb35d
--- /dev/null
+++ b/users/willifan/common/shell/starship.nix
@@ -0,0 +1,4 @@
+{ ... }:
+{
+
+}
diff --git a/users/willifan/common/zsh.nix b/users/willifan/common/shell/zsh.nix
similarity index 100%
rename from users/willifan/common/zsh.nix
rename to users/willifan/common/shell/zsh.nix
diff --git a/users/willifan/common/utils/default.nix b/users/willifan/common/utils/default.nix
index 13bcbe4..a85f7c2 100644
--- a/users/willifan/common/utils/default.nix
+++ b/users/willifan/common/utils/default.nix
@@ -7,6 +7,5 @@
     programs.bat.enable = true;
     programs.btop.enable = true;
     programs.yazi.enable = true;
-    programs.nushell.enable = true;
   };
 }