From 4b5507f374b91a7d08e881a174232d0ad1936882 Mon Sep 17 00:00:00 2001
From: oddlama <oddlama@oddlama.org>
Date: Sun, 10 Sep 2023 12:44:58 +0200
Subject: [PATCH] refactor: move users/common to modules/config structure like
 for hosts

---
 users/common/default.nix                              | 11 -----------
 users/{common => modules/config}/htop.nix             |  0
 users/{common => modules/config}/impermanence.nix     |  0
 users/{common => modules/config}/neovim.nix           |  0
 users/{common => modules/config}/shell/default.nix    |  0
 users/{common => modules/config}/shell/fish.nix       |  0
 users/{common => modules/config}/shell/nushell.nix    |  0
 users/{common => modules/config}/shell/starship.nix   |  2 +-
 .../{common => modules/config}/shell/zsh/default.nix  |  0
 users/{common => modules/config}/shell/zsh/zshrc      |  0
 users/{common => modules/config}/utils.nix            |  0
 users/modules/default.nix                             | 11 +++++++++++
 users/{common => }/modules/uid.nix                    |  0
 users/myuser/default.nix                              |  2 +-
 users/root/default.nix                                |  2 +-
 15 files changed, 14 insertions(+), 14 deletions(-)
 delete mode 100644 users/common/default.nix
 rename users/{common => modules/config}/htop.nix (100%)
 rename users/{common => modules/config}/impermanence.nix (100%)
 rename users/{common => modules/config}/neovim.nix (100%)
 rename users/{common => modules/config}/shell/default.nix (100%)
 rename users/{common => modules/config}/shell/fish.nix (100%)
 rename users/{common => modules/config}/shell/nushell.nix (100%)
 rename users/{common => modules/config}/shell/starship.nix (99%)
 rename users/{common => modules/config}/shell/zsh/default.nix (100%)
 rename users/{common => modules/config}/shell/zsh/zshrc (100%)
 rename users/{common => modules/config}/utils.nix (100%)
 create mode 100644 users/modules/default.nix
 rename users/{common => }/modules/uid.nix (100%)

diff --git a/users/common/default.nix b/users/common/default.nix
deleted file mode 100644
index f86d90c..0000000
--- a/users/common/default.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{...}: {
-  imports = [
-    ./modules/uid.nix
-
-    ./htop.nix
-    ./impermanence.nix
-    ./neovim.nix
-    ./shell
-    ./utils.nix
-  ];
-}
diff --git a/users/common/htop.nix b/users/modules/config/htop.nix
similarity index 100%
rename from users/common/htop.nix
rename to users/modules/config/htop.nix
diff --git a/users/common/impermanence.nix b/users/modules/config/impermanence.nix
similarity index 100%
rename from users/common/impermanence.nix
rename to users/modules/config/impermanence.nix
diff --git a/users/common/neovim.nix b/users/modules/config/neovim.nix
similarity index 100%
rename from users/common/neovim.nix
rename to users/modules/config/neovim.nix
diff --git a/users/common/shell/default.nix b/users/modules/config/shell/default.nix
similarity index 100%
rename from users/common/shell/default.nix
rename to users/modules/config/shell/default.nix
diff --git a/users/common/shell/fish.nix b/users/modules/config/shell/fish.nix
similarity index 100%
rename from users/common/shell/fish.nix
rename to users/modules/config/shell/fish.nix
diff --git a/users/common/shell/nushell.nix b/users/modules/config/shell/nushell.nix
similarity index 100%
rename from users/common/shell/nushell.nix
rename to users/modules/config/shell/nushell.nix
diff --git a/users/common/shell/starship.nix b/users/modules/config/shell/starship.nix
similarity index 99%
rename from users/common/shell/starship.nix
rename to users/modules/config/shell/starship.nix
index c309856..6140e27 100644
--- a/users/common/shell/starship.nix
+++ b/users/modules/config/shell/starship.nix
@@ -32,7 +32,7 @@
       hostname = {
         format = "[$ssh_symbol$hostname]($style)";
         ssh_only = false;
-        ssh_symbol = "🌐";
+        ssh_symbol = "->";
         style = "cyan";
       };
       directory = {
diff --git a/users/common/shell/zsh/default.nix b/users/modules/config/shell/zsh/default.nix
similarity index 100%
rename from users/common/shell/zsh/default.nix
rename to users/modules/config/shell/zsh/default.nix
diff --git a/users/common/shell/zsh/zshrc b/users/modules/config/shell/zsh/zshrc
similarity index 100%
rename from users/common/shell/zsh/zshrc
rename to users/modules/config/shell/zsh/zshrc
diff --git a/users/common/utils.nix b/users/modules/config/utils.nix
similarity index 100%
rename from users/common/utils.nix
rename to users/modules/config/utils.nix
diff --git a/users/modules/default.nix b/users/modules/default.nix
new file mode 100644
index 0000000..8630191
--- /dev/null
+++ b/users/modules/default.nix
@@ -0,0 +1,11 @@
+{...}: {
+  imports = [
+    ./uid.nix
+
+    ./config/htop.nix
+    ./config/impermanence.nix
+    ./config/neovim.nix
+    ./config/shell
+    ./config/utils.nix
+  ];
+}
diff --git a/users/common/modules/uid.nix b/users/modules/uid.nix
similarity index 100%
rename from users/common/modules/uid.nix
rename to users/modules/uid.nix
diff --git a/users/myuser/default.nix b/users/myuser/default.nix
index 96181af..5a9b17a 100644
--- a/users/myuser/default.nix
+++ b/users/myuser/default.nix
@@ -28,7 +28,7 @@ in {
 
   home-manager.users.${myuser} = {
     imports = [
-      ../common
+      ../modules
       ./dev
       ./graphical
       ./neovim
diff --git a/users/root/default.nix b/users/root/default.nix
index 01d07ec..198d3f0 100644
--- a/users/root/default.nix
+++ b/users/root/default.nix
@@ -15,7 +15,7 @@
 
   home-manager.users.root = {
     imports = [
-      ../common
+      ../modules
     ];
 
     home = {