From 9ebc393c6f4d9ceda947a74d8895fb107c81b5f6 Mon Sep 17 00:00:00 2001
From: Tao Tien <29749622+taotien@users.noreply.github.com>
Date: Wed, 1 Nov 2023 18:58:21 -0700
Subject: [PATCH] sort

---
 extras/dev.nix         | 28 ++++++++++++++--------------
 extras/gaming.nix      |  2 +-
 systems/BASED.nix      |  2 +-
 systems/NOcamp.nix     | 24 ++++++++++++------------
 systems/NOcomputer.nix |  6 +++---
 systems/NOlaptop.nix   |  6 +++---
 users/tao.nix          | 14 +++++++-------
 7 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/extras/dev.nix b/extras/dev.nix
index 820ab9d..91ac7a2 100644
--- a/extras/dev.nix
+++ b/extras/dev.nix
@@ -1,27 +1,27 @@
 { pkgs, ... }: {
   environment.systemPackages = with pkgs; [
-    gnumake
-    unstable.pijul
-    freecad
-    clang
-    rustup
-    nixpkgs-fmt
-    nil
     bacon
-    unstable.cargo
-    unstable.cargo-feature
-    unstable.cargo-rr
+    clang
     clang-tools
-    unstable.clippy
-    unstable.elf2uf2-rs
     etcher
+    freecad
     gcc
     gdb
+    gnumake
     lldb
-    unstable.rust-analyzer
-    unstable.rustfmt
+    nil
+    nixpkgs-fmt
+    rustup
+    unstable.cargo
     unstable.cargo-edit
+    unstable.cargo-feature
+    unstable.cargo-rr
+    unstable.clippy
+    unstable.elf2uf2-rs
+    unstable.pijul
+    unstable.rust-analyzer
     unstable.rustc
+    unstable.rustfmt
     unstable.sccache
     vulkan-loader
   ];
diff --git a/extras/gaming.nix b/extras/gaming.nix
index e46784f..c38f174 100644
--- a/extras/gaming.nix
+++ b/extras/gaming.nix
@@ -2,11 +2,11 @@
   imports = [ aagl.nixosModules.default ];
 
   environment.systemPackages = with pkgs; [
+    unstable.heroic
     unstable.lutris
     unstable.mangohud
     unstable.prismlauncher
     wine
-    unstable.heroic
     # unstable.parsec-bin
   ];
 
diff --git a/systems/BASED.nix b/systems/BASED.nix
index 1cae013..72183eb 100644
--- a/systems/BASED.nix
+++ b/systems/BASED.nix
@@ -1,6 +1,5 @@
 { lib, pkgs, modulesPath, ... }: {
   environment.systemPackages = with pkgs; [
-    localsend
     bat
     bottom
     cifs-utils
@@ -10,6 +9,7 @@
     firefox
     git
     helix
+    localsend
     mesa
     mpv
     ouch
diff --git a/systems/NOcamp.nix b/systems/NOcamp.nix
index 59eb8b1..bd427d4 100644
--- a/systems/NOcamp.nix
+++ b/systems/NOcamp.nix
@@ -1,15 +1,15 @@
 { pkgs, ... }: {
-	environment.systemPackages = with pkgs; [
-		qgroundcontrol
-		qgis-ltr
-		arduino
-		firefox
-	];
+  environment.systemPackages = with pkgs; [
+    arduino
+    firefox
+    qgis-ltr
+    qgroundcontrol
+  ];
 
-	networking.hostName = "NObcer";
-	users.users.ssrov = {
-		isNormalUser = true;
-		extraGroups = [ "dialout" ];
-		hashedPassword = "";
-	};
+  networking.hostName = "NObcer";
+  users.users.ssrov = {
+    isNormalUser = true;
+    extraGroups = [ "dialout" ];
+    hashedPassword = "";
+  };
 }
diff --git a/systems/NOcomputer.nix b/systems/NOcomputer.nix
index 9e55126..272f24c 100644
--- a/systems/NOcomputer.nix
+++ b/systems/NOcomputer.nix
@@ -6,13 +6,13 @@
 
   environment.systemPackages = with pkgs;
     [
+      # egl-wayland
       # mesa
-      openrgb
+      # nvidia-vaapi-driver
       gwe
       liquidctl
+      openrgb
       snapper
-      # egl-wayland
-      # nvidia-vaapi-driver
     ];
 
   environment.sessionVariables = {
diff --git a/systems/NOlaptop.nix b/systems/NOlaptop.nix
index b7c4bf6..65508fc 100644
--- a/systems/NOlaptop.nix
+++ b/systems/NOlaptop.nix
@@ -1,8 +1,8 @@
-{ pkgs, prescurve, ... }: {
+{ pkgs, ... }: {
   environment.systemPackages = with pkgs; [
-    prescurve
-    intel-gpu-tools
     # libsForQt5.skanpage
+    # prescurve
+    intel-gpu-tools
     powertop
   ];
 
diff --git a/users/tao.nix b/users/tao.nix
index af777bf..0dcd3c2 100644
--- a/users/tao.nix
+++ b/users/tao.nix
@@ -1,5 +1,6 @@
 { pkgs, ... }: {
   users.users.tao.packages = with pkgs; [
+    # cider
     # enchant
     # expressvpn
     # fractal
@@ -13,8 +14,8 @@
     appimage-run
     aspell
     aspellDicts.en
+    birdtray
     bottles
-    # cider
     darktable
     deluge
     discord
@@ -26,31 +27,30 @@
     libsForQt5.kdeconnect-kde
     obs-studio
     ocs-url
+    onefetch
     onlyoffice-bin
     ripgrep-all
     rustdesk
     snapper
+    syncthingtray
     tectonic
     texlab
+    thunderbird
     tio
     typst-lsp
+    unstable.joshuto
     unstable.nushell
     unstable.oculante
+    unstable.pandoc
     unstable.prusa-slicer
     unstable.starship
     unstable.typst
     unstable.wezterm
-    unstable.joshuto
     unstable.yazi
     virt-manager
     zathura
     zoom-us
     zoxide
-    onefetch
-    thunderbird
-    birdtray
-    syncthingtray
-    unstable.pandoc
   ];
   programs.mosh.enable = true;
   environment.shells = with pkgs; [ unstable.nushell ];