From 3a95abdcd4bbbfcabdb04a470fdb9082134118be Mon Sep 17 00:00:00 2001
From: Tao Tien <29749622+taotien@users.noreply.github.com>
Date: Thu, 28 Mar 2024 00:49:09 -0700
Subject: [PATCH] cleanup

---
 extras/gaming.nix    | 2 +-
 systems/BASED.nix    | 3 +++
 systems/NOlaptop.nix | 4 ----
 users/tao.nix        | 3 ---
 users/vy.nix         | 4 ----
 5 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/extras/gaming.nix b/extras/gaming.nix
index 500f62c..0b56144 100644
--- a/extras/gaming.nix
+++ b/extras/gaming.nix
@@ -15,7 +15,7 @@
     lutris
     mangohud
     prismlauncher
-    protonup
+    protonup-qt
     wine
     # yuzu # nintendo can suck the shit out of my asshole
   ];
diff --git a/systems/BASED.nix b/systems/BASED.nix
index 1e638c7..e8a2b14 100644
--- a/systems/BASED.nix
+++ b/systems/BASED.nix
@@ -12,10 +12,13 @@
     cifs-utils
     du-dust
     exfatprogs
+    firefox
+    ffmpeg
     git
     inputs.helix.packages.${pkgs.system}.default
     localsend
     mesa
+    mpv
     neofetch
     ouch
     pueue
diff --git a/systems/NOlaptop.nix b/systems/NOlaptop.nix
index ae6f4a2..8f7cab2 100644
--- a/systems/NOlaptop.nix
+++ b/systems/NOlaptop.nix
@@ -42,10 +42,6 @@ MatchName=Framework Laptop 16 Keyboard Module*
 # MatchDMIModalias=dmi:*svnFramework:pnLaptop16*
 AttrKeyboardIntegration=internal";
   };
-  # services.xserver.libinput = {
-  #   enable = true;
-  #   touchpad.disableWhileTyping = true;
-  # };
 
   services.xserver.displayManager.defaultSession = "plasma";
   services.xserver.displayManager.sddm.wayland.enable = true;
diff --git a/users/tao.nix b/users/tao.nix
index 83a93d9..dd0dd37 100644
--- a/users/tao.nix
+++ b/users/tao.nix
@@ -31,8 +31,6 @@
     calibre
     darktable
     deluge
-    ffmpeg
-    firefox
     jellyfin-media-player
     jellyfin-mpv-shim
     keepassxc
@@ -43,7 +41,6 @@
     # libsForQt5.plasma-integration
     kdePackages.plasma-vault
     miniserve
-    mpv
     nushell
     obs-studio
     onlyoffice-bin
diff --git a/users/vy.nix b/users/vy.nix
index a8f4547..d5ca7a3 100644
--- a/users/vy.nix
+++ b/users/vy.nix
@@ -1,15 +1,11 @@
 {pkgs, ...}: {
   users.users.vy.packages = with pkgs; [
     audacity
-    firefox
     jellyfin-media-player
     keepassxc
-    libsForQt5.kdeconnect-kde
-    mpv
     onlyoffice-bin
     snapper
     syncthingtray
-    wezterm
     yt-dlp
     zoom-us
   ];