From 934a0eeea5f248d41ebe90c0882c2b45e0f9345f Mon Sep 17 00:00:00 2001
From: Guanran Wang <guanran928@outlook.com>
Date: Fri, 10 Nov 2023 02:23:06 +0800
Subject: [PATCH] nixos,home: sort home.packages

---
 users/guanranwang/home-manager/nixos/home.nix | 74 +++++++++----------
 .../nixos/presets/desktop/gaming.nix          |  8 +-
 .../home-manager/resources/wm/gnome.nix       | 30 +++++---
 3 files changed, 60 insertions(+), 52 deletions(-)

diff --git a/users/guanranwang/home-manager/nixos/home.nix b/users/guanranwang/home-manager/nixos/home.nix
index d3a5ea8..5cc364c 100644
--- a/users/guanranwang/home-manager/nixos/home.nix
+++ b/users/guanranwang/home-manager/nixos/home.nix
@@ -5,65 +5,63 @@
 
     packages =
       (with pkgs; [
-        # gui
-        gparted
-        timeshift
+        # Messaging
+        ### Matrix
+        neochat # kinda buggy with window resizing, but it works and its not electron
+        #nheko # wont let me login for some reason
+        #fractal # does not work with Mozilla's SAML login
 
-        ### matrix
-        #fluffychat
-        element-desktop
-        cinny-desktop
-        #nheko
+        ##                 # vvv 3 UI libraries I dislike vvv
+        #cinny-desktop #   # Tauri
+        #element-desktop # # Electron
+        #fluffychat #      # Flutter
 
-        ### misc
-        bitwarden
+        ### Misc
+        telegram-desktop
         #discord
         #qq
-        tuba
-        protonup-qt
-        piper
-        telegram-desktop
-        qbittorrent
-        gradience
-        dippi
-        obs-studio
-        gnome.seahorse
-        gnome.file-roller
-        gnome.gnome-weather
-        gnome.gnome-calculator
-        gnome.dconf-editor
 
+        # Misc
+        bitwarden
+        obs-studio
+        gparted
+        timeshift
+        #tuba
+        #piper
+        #gradience
+        #dippi
+
+        ### Terminal
         # TUI
-        joshuto # rs
+        joshuto
         bottom
         helix
         skim
         bat
 
-        # cli
+        # CLI
+        sops
+        nix-output-monitor
         fastfetch
         wget
-        sops
-        skim
         ydict
-        nix-output-monitor
-        zoxide # rs
-        trashy
-        eza
-        ripgrep
+        skim
         fd
+        ripgrep
+        eza
+        zoxide
+        trashy
         freshfetch
         hyperfine
       ])
       ++ (with pkgs.gnome; [
-        # GNOME
         nautilus
         zenity
-
-        # GNOME only
-        #gnome-tweaks
-        #gnome-software
-        #gnome-shell-extensions
+        seahorse
+        file-roller
+        gnome-weather
+        gnome-calculator
+        dconf-editor
       ]);
   };
 
diff --git a/users/guanranwang/home-manager/nixos/presets/desktop/gaming.nix b/users/guanranwang/home-manager/nixos/presets/desktop/gaming.nix
index f1dbdc1..e6b8197 100644
--- a/users/guanranwang/home-manager/nixos/presets/desktop/gaming.nix
+++ b/users/guanranwang/home-manager/nixos/presets/desktop/gaming.nix
@@ -1,9 +1,13 @@
 {pkgs, ...}: {
   home.packages = with pkgs; [
+    ### Games
     steam
-    #lunar-client
-    prismlauncher
     osu-lazer-bin
+    prismlauncher
+    #lunar-client
+
+    ### Tools
+    protonup-qt
   ];
 
   programs.mangohud = {
diff --git a/users/guanranwang/home-manager/resources/wm/gnome.nix b/users/guanranwang/home-manager/resources/wm/gnome.nix
index e34654a..e36a1c4 100644
--- a/users/guanranwang/home-manager/resources/wm/gnome.nix
+++ b/users/guanranwang/home-manager/resources/wm/gnome.nix
@@ -3,16 +3,22 @@
   imports = [
     ./components/wallpaper.nix
   ];
-  home.packages = with pkgs.gnomeExtensions; [
-    # GNOME extensions
-    arcmenu
-    appindicator
-    blur-my-shell
-    caffeine
-    dash-to-panel
-    dash-to-dock
-    gamemode # outdated
-    just-perfection
-    kimpanel
-  ];
+  home.packages =
+    (with pkgs.gnomeExtensions; [
+      # GNOME extensions
+      arcmenu
+      appindicator
+      blur-my-shell
+      caffeine
+      dash-to-panel
+      dash-to-dock
+      gamemode # outdated
+      just-perfection
+      kimpanel
+    ])
+    ++ (with pkgs.gnome; [
+      gnome-tweaks
+      gnome-software
+      gnome-shell-extensions
+    ]);
 }