Alright this ain't finished cause of the home stuff but I don't wanna lose what I've done. Impermanence, disko, lots of changes. TODO: add modularity to home.

modules/home/programs/misc/avtools/default.nix

@@ -5,6 +5,7 @@
     spotdl
     playerctl
     ffmpeg
+    alsa-utils
     puddletag
     pulsemixer
   ];

modules/home/programs/misc/chat/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, lib, config, ... }:
+{ pkgs, ... }:
 {
   home.packages = with pkgs; [
     vesktop

modules/home/programs/misc/default.nix

@@ -3,7 +3,11 @@
   imports = [
     ./avtools
     ./chat
+    ./gaming
     ./general
     ./headless
+    ./production
+    ./remote-desktop
+    ./school
   ];
 }

modules/home/programs/misc/gaming/emulators/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, lib, config, ... }:
+{ pkgs, ... }:
 {
   home.packages = with pkgs; [
     dolphin-emu
@@ -6,6 +6,6 @@
     ryujinx
     duckstation
     pcsx2
-    #lime3ds
+    #unstable.lime3ds
   ];
 }

modules/home/programs/misc/gaming/launchers/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, lib, config, ... }:
+{ pkgs, ... }:
 {
   home.packages = with pkgs; [
     steam

modules/home/programs/misc/gaming/xash3d/default.nix

@@ -1,6 +1,4 @@
-{ pkgs, lib, config, ... }:
+{ pkgs, ... }:
 {
-  home.packages = with pkgs; [
-    xash3d
-  ];
+  home.packages = with pkgs; [ xash3d ];
 }

modules/home/programs/misc/general/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, lib, config, ... }:
+{ pkgs, ... }:
 {
   home.packages = with pkgs; [
     imv

modules/home/programs/misc/headless/default.nix

@@ -2,12 +2,9 @@
 {
   home.packages = with pkgs; [
     gotop
-    tcptrack
     p7zip
     vimv
     dua
-    pciutils
-    usbutils
     protonvpn-cli_2
   ];
 }

modules/home/programs/misc/production/default.nix

@@ -1,15 +1,12 @@
 { pkgs, blender-bin, ... }:
 {
-  imports = [
-    ./obs
-  ];
+  imports = [ ./obs ];
 
   home.packages = with pkgs; [
     krita
     inkscape
     audacity
     blender_4_2
-    sunvox
   ];
 
   nixpkgs.overlays = [ blender-bin.overlays.default ];

modules/home/programs/misc/production/obs/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, lib, config, ... }:
+{ pkgs, ... }:
 {
   programs.obs-studio = {
     enable = true;

modules/home/programs/misc/school/default.nix

@@ -4,6 +4,6 @@
     remmina
     freerdp
     zoom-us
-    globalprotect-openconnect
+    unstable.gpauth
   ];
 }