From eb713cc12e395947cc0188b5578da23bd6b55fb2 Mon Sep 17 00:00:00 2001
From: Guanran Wang <guanran928@outlook.com>
Date: Thu, 30 Nov 2023 02:38:05 +0800
Subject: [PATCH] home: sorting

---
 .../applications/android-tools/default.nix    |   4 +++
 .../applications/batsignal/default.nix        |   3 ++
 .../applications/bottom/default.nix           |   3 ++
 .../applications/fastfetch/default.nix        |   3 ++
 .../home-manager/applications/fd/default.nix  |   3 ++
 .../applications/hyperfine/default.nix        |   5 ++++
 .../applications/joshuto/default.nix          |   3 ++
 .../applications/lunar-client/default.nix     |   3 ++
 .../applications/mangohud/default.nix         |   6 ++++
 .../applications/osu-lazer/default.nix        |   3 ++
 .../applications/prismlauncher/default.nix    |   3 ++
 .../applications/protonup-qt/default.nix      |   3 ++
 .../applications/qbittorrent/default.nix      |   3 ++
 .../applications/ripgrep/default.nix          |   3 ++
 .../applications/steam/default.nix            |   3 ++
 .../applications/tealdeer/default.nix         |   3 ++
 .../applications/trashy/default.nix           |   3 ++
 .../applications/wget/default.nix             |   3 ++
 .../applications/ydict/default.nix            |   6 ++++
 .../applications/zoxide/default.nix           |   3 ++
 .../profiles/command-line/nixos/default.nix   |   6 ----
 .../command-line/nixos/fancy-stuff.nix        |   3 --
 .../resources/fancy-stuff/default.nix         |  14 ---------
 .../{ => profiles/core}/default.nix           |   2 +-
 .../graphical}/darwin/default.nix             |   2 +-
 .../graphical}/nixos/default.nix              |   4 +--
 .../graphical}/nixos/fonts/default.nix        |   0
 .../fonts/fontconfig/conf.d/nixos-fonts.conf  |   0
 .../fontconfig/conf.d/old-chinese-fonts.conf  |   0
 .../fonts/fontconfig/conf.d/qt-fonts.conf     |   0
 .../fontconfig/conf.d/unliked-fonts.conf      |   0
 .../fontconfig/conf.d/windows-fonts.conf      |   0
 .../nixos/fonts/fontconfig/fonts.conf         |   0
 .../graphical}/nixos/packages.nix             |   0
 .../graphical}/nixos/scripts/bin/lofi         |   0
 .../nixos/scripts/bin/minecraft-inputfix      |   0
 .../nixos/scripts/bin/wrapped-brightnessctl   |   0
 .../graphical}/nixos/scripts/bin/wrapped-grim |   0
 .../nixos/scripts/bin/wrapped-mpvpaper        |   0
 .../nixos/scripts/bin/wrapped-pamixer         |   0
 .../graphical}/nixos/scripts/bin/wrapped-swww |   0
 .../nixos/scripts/bin/wrapped-wayshot         |   0
 .../graphical}/nixos/scripts/default.nix      |   0
 .../graphical}/nixos/theme.nix                |   0
 .../graphical}/nixos/wallpapers/default.nix   |   0
 .../wallpapers/wallpapers/Mojave Night.jpg    | Bin
 .../wallpapers/wallpapers/wallpaper1.png      | Bin
 .../wallpapers/wallpapers/wallpaper2.jpg      | Bin
 .../wallpapers/wallpapers/wallpaper3.jpg      | Bin
 .../wallpapers/wallpapers/wallpaper4.png      | Bin
 .../wallpapers/wallpapers/wallpaper5.png      | Bin
 .../graphical}/nixos/xdg-mime.nix             |   0
 .../non-graphical}/common/default.nix         |  28 ++++++++----------
 .../non-graphical}/darwin/default.nix         |   2 +-
 .../non-graphical/nixos/default.nix           |   6 ++++
 .../profiles/gaming/darwin/default.nix        |   5 ----
 .../profiles/gaming/nixos/default.nix         |  17 -----------
 .../profiles/opt-in/gaming/darwin/default.nix |   5 ++++
 .../profiles/opt-in/gaming/nixos/default.nix  |   9 ++++++
 .../opt-in/torrenting/nixos/default.nix       |   5 ++++
 .../profiles/torrenting/nixos/default.nix     |   3 --
 .../nixos/profiles/core/default.nix           |   4 +--
 .../profiles/device-type/desktop/default.nix  |   4 +--
 .../nixos/profiles/opt-in/gaming.nix          |   2 +-
 .../nixos/profiles/opt-in/torrenting.nix      |   2 +-
 65 files changed, 118 insertions(+), 74 deletions(-)
 create mode 100644 users/guanranwang/home-manager/applications/android-tools/default.nix
 create mode 100644 users/guanranwang/home-manager/applications/batsignal/default.nix
 create mode 100644 users/guanranwang/home-manager/applications/bottom/default.nix
 create mode 100644 users/guanranwang/home-manager/applications/fastfetch/default.nix
 create mode 100644 users/guanranwang/home-manager/applications/fd/default.nix
 create mode 100644 users/guanranwang/home-manager/applications/hyperfine/default.nix
 create mode 100644 users/guanranwang/home-manager/applications/joshuto/default.nix
 create mode 100644 users/guanranwang/home-manager/applications/lunar-client/default.nix
 create mode 100644 users/guanranwang/home-manager/applications/mangohud/default.nix
 create mode 100644 users/guanranwang/home-manager/applications/osu-lazer/default.nix
 create mode 100644 users/guanranwang/home-manager/applications/prismlauncher/default.nix
 create mode 100644 users/guanranwang/home-manager/applications/protonup-qt/default.nix
 create mode 100644 users/guanranwang/home-manager/applications/qbittorrent/default.nix
 create mode 100644 users/guanranwang/home-manager/applications/ripgrep/default.nix
 create mode 100644 users/guanranwang/home-manager/applications/steam/default.nix
 create mode 100644 users/guanranwang/home-manager/applications/tealdeer/default.nix
 create mode 100644 users/guanranwang/home-manager/applications/trashy/default.nix
 create mode 100644 users/guanranwang/home-manager/applications/wget/default.nix
 create mode 100644 users/guanranwang/home-manager/applications/ydict/default.nix
 create mode 100644 users/guanranwang/home-manager/applications/zoxide/default.nix
 delete mode 100644 users/guanranwang/home-manager/profiles/command-line/nixos/default.nix
 delete mode 100644 users/guanranwang/home-manager/profiles/command-line/nixos/fancy-stuff.nix
 delete mode 100644 users/guanranwang/home-manager/profiles/command-line/resources/fancy-stuff/default.nix
 rename users/guanranwang/home-manager/{ => profiles/core}/default.nix (97%)
 rename users/guanranwang/home-manager/profiles/{graphical-stuff => device-type/graphical}/darwin/default.nix (96%)
 rename users/guanranwang/home-manager/profiles/{graphical-stuff => device-type/graphical}/nixos/default.nix (86%)
 rename users/guanranwang/home-manager/profiles/{graphical-stuff => device-type/graphical}/nixos/fonts/default.nix (100%)
 rename users/guanranwang/home-manager/profiles/{graphical-stuff => device-type/graphical}/nixos/fonts/fontconfig/conf.d/nixos-fonts.conf (100%)
 rename users/guanranwang/home-manager/profiles/{graphical-stuff => device-type/graphical}/nixos/fonts/fontconfig/conf.d/old-chinese-fonts.conf (100%)
 rename users/guanranwang/home-manager/profiles/{graphical-stuff => device-type/graphical}/nixos/fonts/fontconfig/conf.d/qt-fonts.conf (100%)
 rename users/guanranwang/home-manager/profiles/{graphical-stuff => device-type/graphical}/nixos/fonts/fontconfig/conf.d/unliked-fonts.conf (100%)
 rename users/guanranwang/home-manager/profiles/{graphical-stuff => device-type/graphical}/nixos/fonts/fontconfig/conf.d/windows-fonts.conf (100%)
 rename users/guanranwang/home-manager/profiles/{graphical-stuff => device-type/graphical}/nixos/fonts/fontconfig/fonts.conf (100%)
 rename users/guanranwang/home-manager/profiles/{graphical-stuff => device-type/graphical}/nixos/packages.nix (100%)
 rename users/guanranwang/home-manager/profiles/{graphical-stuff => device-type/graphical}/nixos/scripts/bin/lofi (100%)
 rename users/guanranwang/home-manager/profiles/{graphical-stuff => device-type/graphical}/nixos/scripts/bin/minecraft-inputfix (100%)
 rename users/guanranwang/home-manager/profiles/{graphical-stuff => device-type/graphical}/nixos/scripts/bin/wrapped-brightnessctl (100%)
 rename users/guanranwang/home-manager/profiles/{graphical-stuff => device-type/graphical}/nixos/scripts/bin/wrapped-grim (100%)
 rename users/guanranwang/home-manager/profiles/{graphical-stuff => device-type/graphical}/nixos/scripts/bin/wrapped-mpvpaper (100%)
 rename users/guanranwang/home-manager/profiles/{graphical-stuff => device-type/graphical}/nixos/scripts/bin/wrapped-pamixer (100%)
 rename users/guanranwang/home-manager/profiles/{graphical-stuff => device-type/graphical}/nixos/scripts/bin/wrapped-swww (100%)
 rename users/guanranwang/home-manager/profiles/{graphical-stuff => device-type/graphical}/nixos/scripts/bin/wrapped-wayshot (100%)
 rename users/guanranwang/home-manager/profiles/{graphical-stuff => device-type/graphical}/nixos/scripts/default.nix (100%)
 rename users/guanranwang/home-manager/profiles/{graphical-stuff => device-type/graphical}/nixos/theme.nix (100%)
 rename users/guanranwang/home-manager/profiles/{graphical-stuff => device-type/graphical}/nixos/wallpapers/default.nix (100%)
 rename users/guanranwang/home-manager/profiles/{graphical-stuff => device-type/graphical}/nixos/wallpapers/wallpapers/Mojave Night.jpg (100%)
 rename users/guanranwang/home-manager/profiles/{graphical-stuff => device-type/graphical}/nixos/wallpapers/wallpapers/wallpaper1.png (100%)
 rename users/guanranwang/home-manager/profiles/{graphical-stuff => device-type/graphical}/nixos/wallpapers/wallpapers/wallpaper2.jpg (100%)
 rename users/guanranwang/home-manager/profiles/{graphical-stuff => device-type/graphical}/nixos/wallpapers/wallpapers/wallpaper3.jpg (100%)
 rename users/guanranwang/home-manager/profiles/{graphical-stuff => device-type/graphical}/nixos/wallpapers/wallpapers/wallpaper4.png (100%)
 rename users/guanranwang/home-manager/profiles/{graphical-stuff => device-type/graphical}/nixos/wallpapers/wallpapers/wallpaper5.png (100%)
 rename users/guanranwang/home-manager/profiles/{graphical-stuff => device-type/graphical}/nixos/xdg-mime.nix (100%)
 rename users/guanranwang/home-manager/profiles/{command-line/resources => device-type/non-graphical}/common/default.nix (51%)
 rename users/guanranwang/home-manager/profiles/{command-line => device-type/non-graphical}/darwin/default.nix (80%)
 create mode 100644 users/guanranwang/home-manager/profiles/device-type/non-graphical/nixos/default.nix
 delete mode 100644 users/guanranwang/home-manager/profiles/gaming/darwin/default.nix
 delete mode 100644 users/guanranwang/home-manager/profiles/gaming/nixos/default.nix
 create mode 100644 users/guanranwang/home-manager/profiles/opt-in/gaming/darwin/default.nix
 create mode 100644 users/guanranwang/home-manager/profiles/opt-in/gaming/nixos/default.nix
 create mode 100644 users/guanranwang/home-manager/profiles/opt-in/torrenting/nixos/default.nix
 delete mode 100644 users/guanranwang/home-manager/profiles/torrenting/nixos/default.nix

diff --git a/users/guanranwang/home-manager/applications/android-tools/default.nix b/users/guanranwang/home-manager/applications/android-tools/default.nix
new file mode 100644
index 0000000..0f9a267
--- /dev/null
+++ b/users/guanranwang/home-manager/applications/android-tools/default.nix
@@ -0,0 +1,4 @@
+{pkgs, ...}: {
+  # requires sudo
+  home.packages = [pkgs.android-tools];
+}
diff --git a/users/guanranwang/home-manager/applications/batsignal/default.nix b/users/guanranwang/home-manager/applications/batsignal/default.nix
new file mode 100644
index 0000000..22d5780
--- /dev/null
+++ b/users/guanranwang/home-manager/applications/batsignal/default.nix
@@ -0,0 +1,3 @@
+{...}: {
+  services.batsignal.enable = true;
+}
diff --git a/users/guanranwang/home-manager/applications/bottom/default.nix b/users/guanranwang/home-manager/applications/bottom/default.nix
new file mode 100644
index 0000000..09306f9
--- /dev/null
+++ b/users/guanranwang/home-manager/applications/bottom/default.nix
@@ -0,0 +1,3 @@
+{...}: {
+  programs.bottom.enable = true;
+}
diff --git a/users/guanranwang/home-manager/applications/fastfetch/default.nix b/users/guanranwang/home-manager/applications/fastfetch/default.nix
new file mode 100644
index 0000000..8123d8c
--- /dev/null
+++ b/users/guanranwang/home-manager/applications/fastfetch/default.nix
@@ -0,0 +1,3 @@
+{pkgs, ...}: {
+  home.packages = [pkgs.fastfetch];
+}
diff --git a/users/guanranwang/home-manager/applications/fd/default.nix b/users/guanranwang/home-manager/applications/fd/default.nix
new file mode 100644
index 0000000..e957fe2
--- /dev/null
+++ b/users/guanranwang/home-manager/applications/fd/default.nix
@@ -0,0 +1,3 @@
+{pkgs, ...}: {
+  home.packages = [pkgs.fd];
+}
diff --git a/users/guanranwang/home-manager/applications/hyperfine/default.nix b/users/guanranwang/home-manager/applications/hyperfine/default.nix
new file mode 100644
index 0000000..ef74660
--- /dev/null
+++ b/users/guanranwang/home-manager/applications/hyperfine/default.nix
@@ -0,0 +1,5 @@
+{pkgs, ...}: {
+  home.packages = [
+    pkgs.hyperfine
+  ];
+}
diff --git a/users/guanranwang/home-manager/applications/joshuto/default.nix b/users/guanranwang/home-manager/applications/joshuto/default.nix
new file mode 100644
index 0000000..a5698ae
--- /dev/null
+++ b/users/guanranwang/home-manager/applications/joshuto/default.nix
@@ -0,0 +1,3 @@
+{...}: {
+  programs.joshuto.enable = true;
+}
diff --git a/users/guanranwang/home-manager/applications/lunar-client/default.nix b/users/guanranwang/home-manager/applications/lunar-client/default.nix
new file mode 100644
index 0000000..b6014ab
--- /dev/null
+++ b/users/guanranwang/home-manager/applications/lunar-client/default.nix
@@ -0,0 +1,3 @@
+{pkgs, ...}: {
+  home.packages = [pkgs.lunar-client];
+}
diff --git a/users/guanranwang/home-manager/applications/mangohud/default.nix b/users/guanranwang/home-manager/applications/mangohud/default.nix
new file mode 100644
index 0000000..8059944
--- /dev/null
+++ b/users/guanranwang/home-manager/applications/mangohud/default.nix
@@ -0,0 +1,6 @@
+{...}: {
+  programs.mangohud = {
+    enable = true;
+    # TODO: add configuration, i have no idea how to display stuff with nix syntax
+  };
+}
diff --git a/users/guanranwang/home-manager/applications/osu-lazer/default.nix b/users/guanranwang/home-manager/applications/osu-lazer/default.nix
new file mode 100644
index 0000000..7d6d44b
--- /dev/null
+++ b/users/guanranwang/home-manager/applications/osu-lazer/default.nix
@@ -0,0 +1,3 @@
+{pkgs, ...}: {
+  home.packages = [pkgs.osu-lazer-bin];
+}
diff --git a/users/guanranwang/home-manager/applications/prismlauncher/default.nix b/users/guanranwang/home-manager/applications/prismlauncher/default.nix
new file mode 100644
index 0000000..9a1b952
--- /dev/null
+++ b/users/guanranwang/home-manager/applications/prismlauncher/default.nix
@@ -0,0 +1,3 @@
+{pkgs, ...}: {
+  home.packages = [pkgs.prismlauncher];
+}
diff --git a/users/guanranwang/home-manager/applications/protonup-qt/default.nix b/users/guanranwang/home-manager/applications/protonup-qt/default.nix
new file mode 100644
index 0000000..1defdf9
--- /dev/null
+++ b/users/guanranwang/home-manager/applications/protonup-qt/default.nix
@@ -0,0 +1,3 @@
+{pkgs, ...}: {
+  home.packages = [pkgs.protonup-qt];
+}
diff --git a/users/guanranwang/home-manager/applications/qbittorrent/default.nix b/users/guanranwang/home-manager/applications/qbittorrent/default.nix
new file mode 100644
index 0000000..34b808d
--- /dev/null
+++ b/users/guanranwang/home-manager/applications/qbittorrent/default.nix
@@ -0,0 +1,3 @@
+{pkgs, ...}: {
+  home.packages = [pkgs.qbittorrent];
+}
diff --git a/users/guanranwang/home-manager/applications/ripgrep/default.nix b/users/guanranwang/home-manager/applications/ripgrep/default.nix
new file mode 100644
index 0000000..2a27259
--- /dev/null
+++ b/users/guanranwang/home-manager/applications/ripgrep/default.nix
@@ -0,0 +1,3 @@
+{...}: {
+  programs.ripgrep.enable = true;
+}
diff --git a/users/guanranwang/home-manager/applications/steam/default.nix b/users/guanranwang/home-manager/applications/steam/default.nix
new file mode 100644
index 0000000..5e6c21a
--- /dev/null
+++ b/users/guanranwang/home-manager/applications/steam/default.nix
@@ -0,0 +1,3 @@
+{pkgs, ...}: {
+  home.packages = [pkgs.steam];
+}
diff --git a/users/guanranwang/home-manager/applications/tealdeer/default.nix b/users/guanranwang/home-manager/applications/tealdeer/default.nix
new file mode 100644
index 0000000..b2592e4
--- /dev/null
+++ b/users/guanranwang/home-manager/applications/tealdeer/default.nix
@@ -0,0 +1,3 @@
+{...}: {
+  programs.tealdeer.enable = true;
+}
diff --git a/users/guanranwang/home-manager/applications/trashy/default.nix b/users/guanranwang/home-manager/applications/trashy/default.nix
new file mode 100644
index 0000000..4d527a5
--- /dev/null
+++ b/users/guanranwang/home-manager/applications/trashy/default.nix
@@ -0,0 +1,3 @@
+{pkgs, ...}: {
+  home.packages = [pkgs.trashy];
+}
diff --git a/users/guanranwang/home-manager/applications/wget/default.nix b/users/guanranwang/home-manager/applications/wget/default.nix
new file mode 100644
index 0000000..0dd574d
--- /dev/null
+++ b/users/guanranwang/home-manager/applications/wget/default.nix
@@ -0,0 +1,3 @@
+{pkgs, ...}: {
+  home.packages = [pkgs.wget];
+}
diff --git a/users/guanranwang/home-manager/applications/ydict/default.nix b/users/guanranwang/home-manager/applications/ydict/default.nix
new file mode 100644
index 0000000..dc81a3a
--- /dev/null
+++ b/users/guanranwang/home-manager/applications/ydict/default.nix
@@ -0,0 +1,6 @@
+{pkgs, ...}: {
+  home.packages = [pkgs.ydict];
+  home.shellAliases = {
+    "yd" = "ydict -c";
+  };
+}
diff --git a/users/guanranwang/home-manager/applications/zoxide/default.nix b/users/guanranwang/home-manager/applications/zoxide/default.nix
new file mode 100644
index 0000000..9fd06ef
--- /dev/null
+++ b/users/guanranwang/home-manager/applications/zoxide/default.nix
@@ -0,0 +1,3 @@
+{...}: {
+  programs.zoxide.enable = true;
+}
diff --git a/users/guanranwang/home-manager/profiles/command-line/nixos/default.nix b/users/guanranwang/home-manager/profiles/command-line/nixos/default.nix
deleted file mode 100644
index 558d079..0000000
--- a/users/guanranwang/home-manager/profiles/command-line/nixos/default.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{pkgs, ...}: {
-  imports = [../resources/common];
-  home.packages = with pkgs; [
-    trashy
-  ];
-}
diff --git a/users/guanranwang/home-manager/profiles/command-line/nixos/fancy-stuff.nix b/users/guanranwang/home-manager/profiles/command-line/nixos/fancy-stuff.nix
deleted file mode 100644
index a61f99c..0000000
--- a/users/guanranwang/home-manager/profiles/command-line/nixos/fancy-stuff.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{...}: {
-  imports = [../resources/fancy-stuff];
-}
diff --git a/users/guanranwang/home-manager/profiles/command-line/resources/fancy-stuff/default.nix b/users/guanranwang/home-manager/profiles/command-line/resources/fancy-stuff/default.nix
deleted file mode 100644
index 5d47319..0000000
--- a/users/guanranwang/home-manager/profiles/command-line/resources/fancy-stuff/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{pkgs, ...}: {
-  home.shellAliases = {
-    "yd" = "ydict -c";
-  };
-  home.packages = with pkgs; [
-    ### Fancy stuff
-    fastfetch
-    freshfetch
-    ydict
-    yt-dlp
-    aria2
-    android-tools
-  ];
-}
diff --git a/users/guanranwang/home-manager/default.nix b/users/guanranwang/home-manager/profiles/core/default.nix
similarity index 97%
rename from users/guanranwang/home-manager/default.nix
rename to users/guanranwang/home-manager/profiles/core/default.nix
index bd167fd..820b65d 100644
--- a/users/guanranwang/home-manager/default.nix
+++ b/users/guanranwang/home-manager/profiles/core/default.nix
@@ -25,6 +25,6 @@
   programs.home-manager.enable = true;
 
   imports = [
-    ./modules
+    ../../modules
   ];
 }
diff --git a/users/guanranwang/home-manager/profiles/graphical-stuff/darwin/default.nix b/users/guanranwang/home-manager/profiles/device-type/graphical/darwin/default.nix
similarity index 96%
rename from users/guanranwang/home-manager/profiles/graphical-stuff/darwin/default.nix
rename to users/guanranwang/home-manager/profiles/device-type/graphical/darwin/default.nix
index dc1555e..4282029 100644
--- a/users/guanranwang/home-manager/profiles/graphical-stuff/darwin/default.nix
+++ b/users/guanranwang/home-manager/profiles/device-type/graphical/darwin/default.nix
@@ -4,7 +4,7 @@
   lib,
   ...
 }: {
-  imports = map (n: ../../../../home-manager/applications/${n}) [
+  imports = map (n: ../../../../applications/${n}) [
     # Terminal
     "alacritty"
 
diff --git a/users/guanranwang/home-manager/profiles/graphical-stuff/nixos/default.nix b/users/guanranwang/home-manager/profiles/device-type/graphical/nixos/default.nix
similarity index 86%
rename from users/guanranwang/home-manager/profiles/graphical-stuff/nixos/default.nix
rename to users/guanranwang/home-manager/profiles/device-type/graphical/nixos/default.nix
index a582eae..0a6f75e 100644
--- a/users/guanranwang/home-manager/profiles/graphical-stuff/nixos/default.nix
+++ b/users/guanranwang/home-manager/profiles/device-type/graphical/nixos/default.nix
@@ -9,7 +9,7 @@
       ./theme.nix
       ./xdg-mime.nix
     ]
-    ++ map (n: ../../../../home-manager/applications/${n}) [
+    ++ map (n: ../../../../applications/${n}) [
       # Terminal
       "alacritty"
 
@@ -33,7 +33,7 @@
       # Media
       "loupe"
       "mpv"
-      "spotify/spicetify"
+      "spotify/spicetify.nix"
       "amberol"
       "mousai"
 
diff --git a/users/guanranwang/home-manager/profiles/graphical-stuff/nixos/fonts/default.nix b/users/guanranwang/home-manager/profiles/device-type/graphical/nixos/fonts/default.nix
similarity index 100%
rename from users/guanranwang/home-manager/profiles/graphical-stuff/nixos/fonts/default.nix
rename to users/guanranwang/home-manager/profiles/device-type/graphical/nixos/fonts/default.nix
diff --git a/users/guanranwang/home-manager/profiles/graphical-stuff/nixos/fonts/fontconfig/conf.d/nixos-fonts.conf b/users/guanranwang/home-manager/profiles/device-type/graphical/nixos/fonts/fontconfig/conf.d/nixos-fonts.conf
similarity index 100%
rename from users/guanranwang/home-manager/profiles/graphical-stuff/nixos/fonts/fontconfig/conf.d/nixos-fonts.conf
rename to users/guanranwang/home-manager/profiles/device-type/graphical/nixos/fonts/fontconfig/conf.d/nixos-fonts.conf
diff --git a/users/guanranwang/home-manager/profiles/graphical-stuff/nixos/fonts/fontconfig/conf.d/old-chinese-fonts.conf b/users/guanranwang/home-manager/profiles/device-type/graphical/nixos/fonts/fontconfig/conf.d/old-chinese-fonts.conf
similarity index 100%
rename from users/guanranwang/home-manager/profiles/graphical-stuff/nixos/fonts/fontconfig/conf.d/old-chinese-fonts.conf
rename to users/guanranwang/home-manager/profiles/device-type/graphical/nixos/fonts/fontconfig/conf.d/old-chinese-fonts.conf
diff --git a/users/guanranwang/home-manager/profiles/graphical-stuff/nixos/fonts/fontconfig/conf.d/qt-fonts.conf b/users/guanranwang/home-manager/profiles/device-type/graphical/nixos/fonts/fontconfig/conf.d/qt-fonts.conf
similarity index 100%
rename from users/guanranwang/home-manager/profiles/graphical-stuff/nixos/fonts/fontconfig/conf.d/qt-fonts.conf
rename to users/guanranwang/home-manager/profiles/device-type/graphical/nixos/fonts/fontconfig/conf.d/qt-fonts.conf
diff --git a/users/guanranwang/home-manager/profiles/graphical-stuff/nixos/fonts/fontconfig/conf.d/unliked-fonts.conf b/users/guanranwang/home-manager/profiles/device-type/graphical/nixos/fonts/fontconfig/conf.d/unliked-fonts.conf
similarity index 100%
rename from users/guanranwang/home-manager/profiles/graphical-stuff/nixos/fonts/fontconfig/conf.d/unliked-fonts.conf
rename to users/guanranwang/home-manager/profiles/device-type/graphical/nixos/fonts/fontconfig/conf.d/unliked-fonts.conf
diff --git a/users/guanranwang/home-manager/profiles/graphical-stuff/nixos/fonts/fontconfig/conf.d/windows-fonts.conf b/users/guanranwang/home-manager/profiles/device-type/graphical/nixos/fonts/fontconfig/conf.d/windows-fonts.conf
similarity index 100%
rename from users/guanranwang/home-manager/profiles/graphical-stuff/nixos/fonts/fontconfig/conf.d/windows-fonts.conf
rename to users/guanranwang/home-manager/profiles/device-type/graphical/nixos/fonts/fontconfig/conf.d/windows-fonts.conf
diff --git a/users/guanranwang/home-manager/profiles/graphical-stuff/nixos/fonts/fontconfig/fonts.conf b/users/guanranwang/home-manager/profiles/device-type/graphical/nixos/fonts/fontconfig/fonts.conf
similarity index 100%
rename from users/guanranwang/home-manager/profiles/graphical-stuff/nixos/fonts/fontconfig/fonts.conf
rename to users/guanranwang/home-manager/profiles/device-type/graphical/nixos/fonts/fontconfig/fonts.conf
diff --git a/users/guanranwang/home-manager/profiles/graphical-stuff/nixos/packages.nix b/users/guanranwang/home-manager/profiles/device-type/graphical/nixos/packages.nix
similarity index 100%
rename from users/guanranwang/home-manager/profiles/graphical-stuff/nixos/packages.nix
rename to users/guanranwang/home-manager/profiles/device-type/graphical/nixos/packages.nix
diff --git a/users/guanranwang/home-manager/profiles/graphical-stuff/nixos/scripts/bin/lofi b/users/guanranwang/home-manager/profiles/device-type/graphical/nixos/scripts/bin/lofi
similarity index 100%
rename from users/guanranwang/home-manager/profiles/graphical-stuff/nixos/scripts/bin/lofi
rename to users/guanranwang/home-manager/profiles/device-type/graphical/nixos/scripts/bin/lofi
diff --git a/users/guanranwang/home-manager/profiles/graphical-stuff/nixos/scripts/bin/minecraft-inputfix b/users/guanranwang/home-manager/profiles/device-type/graphical/nixos/scripts/bin/minecraft-inputfix
similarity index 100%
rename from users/guanranwang/home-manager/profiles/graphical-stuff/nixos/scripts/bin/minecraft-inputfix
rename to users/guanranwang/home-manager/profiles/device-type/graphical/nixos/scripts/bin/minecraft-inputfix
diff --git a/users/guanranwang/home-manager/profiles/graphical-stuff/nixos/scripts/bin/wrapped-brightnessctl b/users/guanranwang/home-manager/profiles/device-type/graphical/nixos/scripts/bin/wrapped-brightnessctl
similarity index 100%
rename from users/guanranwang/home-manager/profiles/graphical-stuff/nixos/scripts/bin/wrapped-brightnessctl
rename to users/guanranwang/home-manager/profiles/device-type/graphical/nixos/scripts/bin/wrapped-brightnessctl
diff --git a/users/guanranwang/home-manager/profiles/graphical-stuff/nixos/scripts/bin/wrapped-grim b/users/guanranwang/home-manager/profiles/device-type/graphical/nixos/scripts/bin/wrapped-grim
similarity index 100%
rename from users/guanranwang/home-manager/profiles/graphical-stuff/nixos/scripts/bin/wrapped-grim
rename to users/guanranwang/home-manager/profiles/device-type/graphical/nixos/scripts/bin/wrapped-grim
diff --git a/users/guanranwang/home-manager/profiles/graphical-stuff/nixos/scripts/bin/wrapped-mpvpaper b/users/guanranwang/home-manager/profiles/device-type/graphical/nixos/scripts/bin/wrapped-mpvpaper
similarity index 100%
rename from users/guanranwang/home-manager/profiles/graphical-stuff/nixos/scripts/bin/wrapped-mpvpaper
rename to users/guanranwang/home-manager/profiles/device-type/graphical/nixos/scripts/bin/wrapped-mpvpaper
diff --git a/users/guanranwang/home-manager/profiles/graphical-stuff/nixos/scripts/bin/wrapped-pamixer b/users/guanranwang/home-manager/profiles/device-type/graphical/nixos/scripts/bin/wrapped-pamixer
similarity index 100%
rename from users/guanranwang/home-manager/profiles/graphical-stuff/nixos/scripts/bin/wrapped-pamixer
rename to users/guanranwang/home-manager/profiles/device-type/graphical/nixos/scripts/bin/wrapped-pamixer
diff --git a/users/guanranwang/home-manager/profiles/graphical-stuff/nixos/scripts/bin/wrapped-swww b/users/guanranwang/home-manager/profiles/device-type/graphical/nixos/scripts/bin/wrapped-swww
similarity index 100%
rename from users/guanranwang/home-manager/profiles/graphical-stuff/nixos/scripts/bin/wrapped-swww
rename to users/guanranwang/home-manager/profiles/device-type/graphical/nixos/scripts/bin/wrapped-swww
diff --git a/users/guanranwang/home-manager/profiles/graphical-stuff/nixos/scripts/bin/wrapped-wayshot b/users/guanranwang/home-manager/profiles/device-type/graphical/nixos/scripts/bin/wrapped-wayshot
similarity index 100%
rename from users/guanranwang/home-manager/profiles/graphical-stuff/nixos/scripts/bin/wrapped-wayshot
rename to users/guanranwang/home-manager/profiles/device-type/graphical/nixos/scripts/bin/wrapped-wayshot
diff --git a/users/guanranwang/home-manager/profiles/graphical-stuff/nixos/scripts/default.nix b/users/guanranwang/home-manager/profiles/device-type/graphical/nixos/scripts/default.nix
similarity index 100%
rename from users/guanranwang/home-manager/profiles/graphical-stuff/nixos/scripts/default.nix
rename to users/guanranwang/home-manager/profiles/device-type/graphical/nixos/scripts/default.nix
diff --git a/users/guanranwang/home-manager/profiles/graphical-stuff/nixos/theme.nix b/users/guanranwang/home-manager/profiles/device-type/graphical/nixos/theme.nix
similarity index 100%
rename from users/guanranwang/home-manager/profiles/graphical-stuff/nixos/theme.nix
rename to users/guanranwang/home-manager/profiles/device-type/graphical/nixos/theme.nix
diff --git a/users/guanranwang/home-manager/profiles/graphical-stuff/nixos/wallpapers/default.nix b/users/guanranwang/home-manager/profiles/device-type/graphical/nixos/wallpapers/default.nix
similarity index 100%
rename from users/guanranwang/home-manager/profiles/graphical-stuff/nixos/wallpapers/default.nix
rename to users/guanranwang/home-manager/profiles/device-type/graphical/nixos/wallpapers/default.nix
diff --git a/users/guanranwang/home-manager/profiles/graphical-stuff/nixos/wallpapers/wallpapers/Mojave Night.jpg b/users/guanranwang/home-manager/profiles/device-type/graphical/nixos/wallpapers/wallpapers/Mojave Night.jpg
similarity index 100%
rename from users/guanranwang/home-manager/profiles/graphical-stuff/nixos/wallpapers/wallpapers/Mojave Night.jpg
rename to users/guanranwang/home-manager/profiles/device-type/graphical/nixos/wallpapers/wallpapers/Mojave Night.jpg
diff --git a/users/guanranwang/home-manager/profiles/graphical-stuff/nixos/wallpapers/wallpapers/wallpaper1.png b/users/guanranwang/home-manager/profiles/device-type/graphical/nixos/wallpapers/wallpapers/wallpaper1.png
similarity index 100%
rename from users/guanranwang/home-manager/profiles/graphical-stuff/nixos/wallpapers/wallpapers/wallpaper1.png
rename to users/guanranwang/home-manager/profiles/device-type/graphical/nixos/wallpapers/wallpapers/wallpaper1.png
diff --git a/users/guanranwang/home-manager/profiles/graphical-stuff/nixos/wallpapers/wallpapers/wallpaper2.jpg b/users/guanranwang/home-manager/profiles/device-type/graphical/nixos/wallpapers/wallpapers/wallpaper2.jpg
similarity index 100%
rename from users/guanranwang/home-manager/profiles/graphical-stuff/nixos/wallpapers/wallpapers/wallpaper2.jpg
rename to users/guanranwang/home-manager/profiles/device-type/graphical/nixos/wallpapers/wallpapers/wallpaper2.jpg
diff --git a/users/guanranwang/home-manager/profiles/graphical-stuff/nixos/wallpapers/wallpapers/wallpaper3.jpg b/users/guanranwang/home-manager/profiles/device-type/graphical/nixos/wallpapers/wallpapers/wallpaper3.jpg
similarity index 100%
rename from users/guanranwang/home-manager/profiles/graphical-stuff/nixos/wallpapers/wallpapers/wallpaper3.jpg
rename to users/guanranwang/home-manager/profiles/device-type/graphical/nixos/wallpapers/wallpapers/wallpaper3.jpg
diff --git a/users/guanranwang/home-manager/profiles/graphical-stuff/nixos/wallpapers/wallpapers/wallpaper4.png b/users/guanranwang/home-manager/profiles/device-type/graphical/nixos/wallpapers/wallpapers/wallpaper4.png
similarity index 100%
rename from users/guanranwang/home-manager/profiles/graphical-stuff/nixos/wallpapers/wallpapers/wallpaper4.png
rename to users/guanranwang/home-manager/profiles/device-type/graphical/nixos/wallpapers/wallpapers/wallpaper4.png
diff --git a/users/guanranwang/home-manager/profiles/graphical-stuff/nixos/wallpapers/wallpapers/wallpaper5.png b/users/guanranwang/home-manager/profiles/device-type/graphical/nixos/wallpapers/wallpapers/wallpaper5.png
similarity index 100%
rename from users/guanranwang/home-manager/profiles/graphical-stuff/nixos/wallpapers/wallpapers/wallpaper5.png
rename to users/guanranwang/home-manager/profiles/device-type/graphical/nixos/wallpapers/wallpapers/wallpaper5.png
diff --git a/users/guanranwang/home-manager/profiles/graphical-stuff/nixos/xdg-mime.nix b/users/guanranwang/home-manager/profiles/device-type/graphical/nixos/xdg-mime.nix
similarity index 100%
rename from users/guanranwang/home-manager/profiles/graphical-stuff/nixos/xdg-mime.nix
rename to users/guanranwang/home-manager/profiles/device-type/graphical/nixos/xdg-mime.nix
diff --git a/users/guanranwang/home-manager/profiles/command-line/resources/common/default.nix b/users/guanranwang/home-manager/profiles/device-type/non-graphical/common/default.nix
similarity index 51%
rename from users/guanranwang/home-manager/profiles/command-line/resources/common/default.nix
rename to users/guanranwang/home-manager/profiles/device-type/non-graphical/common/default.nix
index 6784a3d..8433e2a 100644
--- a/users/guanranwang/home-manager/profiles/command-line/resources/common/default.nix
+++ b/users/guanranwang/home-manager/profiles/device-type/non-graphical/common/default.nix
@@ -1,10 +1,21 @@
-{pkgs, ...}: {
+{...}: {
   imports = [
     ../../../../applications/git
     ../../../../applications/starship
     ../../../../applications/eza
     ../../../../applications/skim
     ../../../../applications/bat
+    ../../../../applications/bottom
+    ../../../../applications/zoxide
+    ../../../../applications/ripgrep
+    ../../../../applications/wget
+    ../../../../applications/fd
+    ../../../../applications/hyperfine
+
+    ../../../../applications/ydict
+    ../../../../applications/fastfetch
+    ../../../../applications/android-tools
+    ../../../../applications/tealdeer
   ];
 
   home.shellAliases = {
@@ -15,19 +26,6 @@
     "setproxy" = let
       proxy = "http://127.0.0.1:7890/";
     in "export http_proxy=${proxy} https_proxy=${proxy} ftp_proxy=${proxy} rsync_proxy=${proxy}";
-    "unsetproxy" = "set -e http_proxy https_proxy all_proxy"; # fish syntax (?)
-  };
-
-  home.packages = with pkgs; [
-    wget
-    fd
-    hyperfine
-  ];
-  programs = {
-    tealdeer.enable = true;
-    zoxide.enable = true;
-    bottom.enable = true;
-    joshuto.enable = true;
-    ripgrep.enable = true;
+    "unsetproxy" = "set -e http_proxy https_proxy all_proxy";
   };
 }
diff --git a/users/guanranwang/home-manager/profiles/command-line/darwin/default.nix b/users/guanranwang/home-manager/profiles/device-type/non-graphical/darwin/default.nix
similarity index 80%
rename from users/guanranwang/home-manager/profiles/command-line/darwin/default.nix
rename to users/guanranwang/home-manager/profiles/device-type/non-graphical/darwin/default.nix
index 2953c2e..b377276 100644
--- a/users/guanranwang/home-manager/profiles/command-line/darwin/default.nix
+++ b/users/guanranwang/home-manager/profiles/device-type/non-graphical/darwin/default.nix
@@ -1,5 +1,5 @@
 {pkgs, ...}: {
-  imports = [../resources/common];
+  imports = [../common];
   home.packages = with pkgs; [
     ### Outdated macOS components
     coreutils
diff --git a/users/guanranwang/home-manager/profiles/device-type/non-graphical/nixos/default.nix b/users/guanranwang/home-manager/profiles/device-type/non-graphical/nixos/default.nix
new file mode 100644
index 0000000..f4f34f4
--- /dev/null
+++ b/users/guanranwang/home-manager/profiles/device-type/non-graphical/nixos/default.nix
@@ -0,0 +1,6 @@
+{...}: {
+  imports = [
+    ../common
+    ../../../../applications/trashy
+  ];
+}
diff --git a/users/guanranwang/home-manager/profiles/gaming/darwin/default.nix b/users/guanranwang/home-manager/profiles/gaming/darwin/default.nix
deleted file mode 100644
index 218f086..0000000
--- a/users/guanranwang/home-manager/profiles/gaming/darwin/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{pkgs, ...}: {
-  home.packages = with pkgs; [
-    prismlauncher
-  ];
-}
diff --git a/users/guanranwang/home-manager/profiles/gaming/nixos/default.nix b/users/guanranwang/home-manager/profiles/gaming/nixos/default.nix
deleted file mode 100644
index e6b8197..0000000
--- a/users/guanranwang/home-manager/profiles/gaming/nixos/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{pkgs, ...}: {
-  home.packages = with pkgs; [
-    ### Games
-    steam
-    osu-lazer-bin
-    prismlauncher
-    #lunar-client
-
-    ### Tools
-    protonup-qt
-  ];
-
-  programs.mangohud = {
-    enable = true;
-    # TODO: add configuration, i have no idea how to display stuff with nix syntax
-  };
-}
diff --git a/users/guanranwang/home-manager/profiles/opt-in/gaming/darwin/default.nix b/users/guanranwang/home-manager/profiles/opt-in/gaming/darwin/default.nix
new file mode 100644
index 0000000..1d428b0
--- /dev/null
+++ b/users/guanranwang/home-manager/profiles/opt-in/gaming/darwin/default.nix
@@ -0,0 +1,5 @@
+{...}: {
+  imports = [
+    ../../../../applications/prismlauncher
+  ];
+}
diff --git a/users/guanranwang/home-manager/profiles/opt-in/gaming/nixos/default.nix b/users/guanranwang/home-manager/profiles/opt-in/gaming/nixos/default.nix
new file mode 100644
index 0000000..d6bc419
--- /dev/null
+++ b/users/guanranwang/home-manager/profiles/opt-in/gaming/nixos/default.nix
@@ -0,0 +1,9 @@
+{...}: {
+  imports = [
+    ../../../../applications/steam
+    ../../../../applications/prismlauncher
+    ../../../../applications/osu-lazer
+    ../../../../applications/mangohud
+    ../../../../applications/protonup-qt
+  ];
+}
diff --git a/users/guanranwang/home-manager/profiles/opt-in/torrenting/nixos/default.nix b/users/guanranwang/home-manager/profiles/opt-in/torrenting/nixos/default.nix
new file mode 100644
index 0000000..b6aa54e
--- /dev/null
+++ b/users/guanranwang/home-manager/profiles/opt-in/torrenting/nixos/default.nix
@@ -0,0 +1,5 @@
+{...}: {
+  imports = [
+    ../../../../applications/qbittorrent
+  ];
+}
diff --git a/users/guanranwang/home-manager/profiles/torrenting/nixos/default.nix b/users/guanranwang/home-manager/profiles/torrenting/nixos/default.nix
deleted file mode 100644
index f7e342a..0000000
--- a/users/guanranwang/home-manager/profiles/torrenting/nixos/default.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{pkgs, ...}: {
-  home.packages = with pkgs; [qbittorrent];
-}
diff --git a/users/guanranwang/nixos/profiles/core/default.nix b/users/guanranwang/nixos/profiles/core/default.nix
index 6d86929..ac2f3b6 100644
--- a/users/guanranwang/nixos/profiles/core/default.nix
+++ b/users/guanranwang/nixos/profiles/core/default.nix
@@ -50,7 +50,7 @@
 
   ### home-manager
   home-manager.users.guanranwang.imports = map (n: ../../../home-manager/${n}) [
-    "default.nix"
-    "profiles/command-line/nixos"
+    "profiles/core"
+    "profiles/device-type/non-graphical/nixos"
   ];
 }
diff --git a/users/guanranwang/nixos/profiles/device-type/desktop/default.nix b/users/guanranwang/nixos/profiles/device-type/desktop/default.nix
index 3b60511..4e80f06 100644
--- a/users/guanranwang/nixos/profiles/device-type/desktop/default.nix
+++ b/users/guanranwang/nixos/profiles/device-type/desktop/default.nix
@@ -18,8 +18,8 @@
 
   ### home-manager
   home-manager.users.guanranwang.imports = map (n: ../../../../home-manager/${n}) [
-    "profiles/command-line/nixos/fancy-stuff.nix"
-    "profiles/graphical-stuff/nixos"
+    "profiles/device-type/non-graphical/nixos"
+    "profiles/device-type/graphical/nixos"
   ];
 
   fonts.enableDefaultPackages = false;
diff --git a/users/guanranwang/nixos/profiles/opt-in/gaming.nix b/users/guanranwang/nixos/profiles/opt-in/gaming.nix
index 375e5d8..60d57fe 100644
--- a/users/guanranwang/nixos/profiles/opt-in/gaming.nix
+++ b/users/guanranwang/nixos/profiles/opt-in/gaming.nix
@@ -1,5 +1,5 @@
 {...}: {
   home-manager.users.guanranwang.imports = [
-    ../../../home-manager/profiles/gaming/nixos
+    ../../../home-manager/profiles/opt-in/gaming/nixos
   ];
 }
diff --git a/users/guanranwang/nixos/profiles/opt-in/torrenting.nix b/users/guanranwang/nixos/profiles/opt-in/torrenting.nix
index e817bc7..69f2c2e 100644
--- a/users/guanranwang/nixos/profiles/opt-in/torrenting.nix
+++ b/users/guanranwang/nixos/profiles/opt-in/torrenting.nix
@@ -1,5 +1,5 @@
 {...}: {
   home-manager.users.guanranwang.imports = [
-    ../../../home-manager/profiles/torrenting/nixos
+    ../../../home-manager/profiles/opt-in/torrenting/nixos
   ];
 }