From fc749603a7e18f452b8754468507b2918ac6e77e Mon Sep 17 00:00:00 2001
From: Sojus07 <Sojus07>
Date: Fri, 7 Feb 2025 15:22:23 +0100
Subject: [PATCH] PogChamp

---
 modules/home/nix/git.nix    |  4 ++--
 modules/home/nix/shell.nix  |  7 ++-----
 modules/system/nix/pkgs.nix | 35 ++++++++++++++++++-----------------
 3 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/modules/home/nix/git.nix b/modules/home/nix/git.nix
index eb0e9a8..70b11f5 100644
--- a/modules/home/nix/git.nix
+++ b/modules/home/nix/git.nix
@@ -3,8 +3,8 @@
   programs = {
     git = {
       enable = true;
-      userName = "fqbn207";
-      userEmail = "fqbn207";
+      userName = "Sojus07";
+      userEmail = "Sojus07";
     };
   };
 }
diff --git a/modules/home/nix/shell.nix b/modules/home/nix/shell.nix
index 3110aeb..3bf2198 100644
--- a/modules/home/nix/shell.nix
+++ b/modules/home/nix/shell.nix
@@ -19,7 +19,8 @@
         gc = "git commit";
         ga = "git add -A";
         http = "python3 -m http.server";
-        ls = "${pkgs.eza}/bin/eza -la --icons";
+        ls = "${pkgs.eza}/bin/eza -l --icons";
+        tree = "${pkgs.eza}/bin/eza --tree --icons";
         cp = "cp -rv";
         mv = "mv -v";
         mkdir = "mkdir -pv";
@@ -30,10 +31,6 @@
           name = "z";
           src = pkgs.fishPlugins.z.src;
         }
-        {
-          name = "sponge";
-          src = pkgs.fishPlugins.sponge.src;
-        }
         {
           name = "pisces";
           src = pkgs.fishPlugins.pisces.src;
diff --git a/modules/system/nix/pkgs.nix b/modules/system/nix/pkgs.nix
index 52f00ee..7b0df4a 100644
--- a/modules/system/nix/pkgs.nix
+++ b/modules/system/nix/pkgs.nix
@@ -1,7 +1,7 @@
 { config, pkgs, ... }:
 {
   environment.systemPackages = with pkgs; [
-    # sys
+    # System utilities
     unzip
     yt-dlp
     inetutils
@@ -10,18 +10,18 @@
     curl
     dosfstools
     ntfs3g
+    usbutils
+    alsa-utils
+    pavucontrol
+    flameshot
     feh
     gnumake
-    flameshot
     tree
     gdb
     vscode
-    pavucontrol
-    usbutils
-    alsa-utils
     neovide
 
-    # cli
+    # Command-line utilities
     neofetch
     fastfetch
     onefetch
@@ -32,10 +32,9 @@
     fzf
     htop
     btop
-    kew
     jq
 
-    # dev
+    # Development & compilers
     rustup
     python3
     python312Packages.pip
@@ -44,18 +43,20 @@
     go
     dotnet-sdk
     bear
+
+    # Android development
     android-tools
     android-udev-rules
     android-studio-tools
-    
+
+    # Windows compatibility
     wine
     winetricks
 
-    # embedded
+    # Embedded & hardware development
     espup
     esphome
     esptool
-    ethtool
     espflash
     minicom
     pulseview
@@ -67,21 +68,21 @@
     chirp
     picocom
     pwndbg
-    gdb
     minipro
+    ethtool
 
-    # LSPs
+    # Language servers (LSPs)
     nixd
     arduino-language-server
 
-    # libs
+    # Libraries
     python312Packages.pyserial
     python312Packages.meshtastic
 
-    # virt
+    # Virtualization
     qemu
 
-    # SDR
+    # Software Defined Radio (SDR)
     noaa-apt
     wsjtx
     qsstv
@@ -93,7 +94,7 @@
     gqrx
     multimon-ng
 
-    # misc
+    # Miscellaneous
     cava
     vesktop
     pacman