From 844e4f61846d7d30167d1be12a7d8ba1922e287a Mon Sep 17 00:00:00 2001
From: Chris Toph <toph@ryot.foo>
Date: Tue, 22 Apr 2025 21:13:47 -0400
Subject: [PATCH] Refactor user group assignment in minimal default.nix and
 clean up unused dependencies in citron-emu package.nix

---
 hosts/users/minimal/default.nix |  2 +-
 pkgs/citron-emu/package.nix     | 75 ---------------------------------
 2 files changed, 1 insertion(+), 76 deletions(-)

diff --git a/hosts/users/minimal/default.nix b/hosts/users/minimal/default.nix
index 370b1b6..d2b71df 100644
--- a/hosts/users/minimal/default.nix
+++ b/hosts/users/minimal/default.nix
@@ -15,9 +15,9 @@ in
   users.users.${hostSpec.username} = {
     isNormalUser = true;
     password = hostSpec.password;
+    group = "ryot";
     extraGroups = [
       "wheel"
-      "ryot"
     ];
   };
 }
diff --git a/pkgs/citron-emu/package.nix b/pkgs/citron-emu/package.nix
index d00ff7e..7087c6b 100644
--- a/pkgs/citron-emu/package.nix
+++ b/pkgs/citron-emu/package.nix
@@ -6,93 +6,18 @@ pkgs.stdenvNoCC.mkDerivation rec {
     url = "https://git.citron-emu.org/Citron/Citron/releases/download/v0.6.1-canary-refresh/Citron-Linux-Canary-Refresh_0.6.1_compatibility.tar.gz";
     sha256 = "sha256:00d2mn2pc51gaz47db15q95gkd6x3566a2a8vc0lhq37jvyfq72r";
   };
-  # sourceRoot = ".";
-  # nativeBuildInputs = with pkgs; [
-  #   gzip
-  # ];
   runtimeLibs = with pkgs; [
     qt6.qtbase
     ffmpeg
     libusb1
     libva
     SDL2
-    # libGL
-    # libGLU
-    # libevent
-    # libffi
-    # libjpeg
-    # libpng
-    # libstartup_notification
-    # libvpx
-    # libwebp
-
-    # git
-    #   vulkan-headers
-    #   vulkan-utility-libraries
-    #   boost185
-    #   autoconf
-    #   fmt
-    #   llvm_19
-    #   nasm
-    #   lz4
-    #   nlohmann_json
-    # ffmpeg
-    # #   qt6.qtbase
-    # #   enet
-    # libva
-    # #   vcpkg
-    # #   libopus
-    # #   udev
-
-    # stdenv.cc.cc
-
-    # fontconfig
-    # libxkbcommon
-    # zlib
-    # freetype
-    # gtk3
-    # libxml2
-    # dbus
-    # xcb-util-cursor
-    # alsa-lib
-    # libpulseaudio
-    # pango
-    # atk
-    # cairo
-    # gdk-pixbuf
-    # glib
-    # udev
-    # libva
-    # mesa
-    # libnotify
-    # cups
-    # pciutils
-    # ffmpeg
-    # libglvnd
-    # pipewire
   ];
-  # ++ (with pkgs.xorg; [
-  #   libxcb
-  #   libX11
-  #   libXcursor
-  #   libXrandr
-  #   libXi
-  #   libXext
-  #   libXcomposite
-  #   libXdamage
-  #   libXfixes
-  #   libXScrnSaver
-  # ]);
-
   nativeBuildInputs =
     with pkgs;
     [
       autoPatchelfHook
       kdePackages.wrapQtAppsHook
-
-      # makeWrapper
-      # copyDesktopItems
-      # wrapGAppsHook
     ]
     ++ runtimeLibs;