From b7b5c3bb4d3a8d01ba55b2e391f86f135d064744 Mon Sep 17 00:00:00 2001
From: Gerg-L <GregLeyda@proton.me>
Date: Sun, 25 Feb 2024 18:49:05 -0500
Subject: [PATCH] remove running vm without sudo clean up groups

---
 hosts/game-desktop/main.nix    |  1 -
 hosts/gerg-desktop/Windows.xml |  2 +-
 hosts/gerg-desktop/main.nix    |  1 -
 hosts/gerg-desktop/vfio.nix    | 12 +++---------
 hosts/media-laptop/main.nix    |  5 +----
 5 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/hosts/game-desktop/main.nix b/hosts/game-desktop/main.nix
index d2ef21d..c251af3 100644
--- a/hosts/game-desktop/main.nix
+++ b/hosts/game-desktop/main.nix
@@ -65,7 +65,6 @@ _:
         useDefaultShell = true;
         uid = 1000;
         isNormalUser = true;
-        extraGroups = [ "audio" ];
         initialHashedPassword = "";
       };
       "root" = {
diff --git a/hosts/gerg-desktop/Windows.xml b/hosts/gerg-desktop/Windows.xml
index 32a1d05..390279c 100644
--- a/hosts/gerg-desktop/Windows.xml
+++ b/hosts/gerg-desktop/Windows.xml
@@ -43,7 +43,7 @@
       <synic state='on'/>
       <stimer state='on'/>
       <reset state='off'/>
-      <vendor_id state='on' value='abcdefghijkl'/>
+      <vendor_id state='on' value='AuthenticAMD'/>
       <frequencies state='on'/>
       <reenlightenment state='off'/>
       <tlbflush state='on'/>
diff --git a/hosts/gerg-desktop/main.nix b/hosts/gerg-desktop/main.nix
index b84a046..c4ed918 100644
--- a/hosts/gerg-desktop/main.nix
+++ b/hosts/gerg-desktop/main.nix
@@ -141,7 +141,6 @@
         isNormalUser = true;
         extraGroups = [
           "wheel"
-          "audio"
           "adbusers"
           #"plugdev"
         ];
diff --git a/hosts/gerg-desktop/vfio.nix b/hosts/gerg-desktop/vfio.nix
index 3db6b28..8c81f9d 100644
--- a/hosts/gerg-desktop/vfio.nix
+++ b/hosts/gerg-desktop/vfio.nix
@@ -107,7 +107,7 @@ in
         ovmf.enable = true;
         verbatimConfig = ''
           user = "gerg"
-          group = "kvm"
+          group = "users"
           namespaces = []
         '';
       };
@@ -119,19 +119,13 @@ in
       cfg_monitors
     ];
     shellAliases = {
-      vm-start = "virsh -c qemu:///system start Windows";
-      vm-stop = "virsh -c qemu:///system shutdown Windows";
+      vm-start = "virsh start Windows";
+      vm-stop = "virsh shutdown Windows";
     };
   };
 
   programs.virt-manager.enable = true;
 
-  users.users.gerg.extraGroups = [
-    "kvm"
-    "libvirtd"
-    "input"
-  ];
-
   services.xserver.displayManager.xserverArgs = lib.mkAfter [ "-config /etc/Xorg/active.conf" ];
   services.xserver.displayManager.sessionCommands = lib.mkBefore ''
     if ! [ -e "/etc/Xorg/ONE_MONITOR" ] ; then
diff --git a/hosts/media-laptop/main.nix b/hosts/media-laptop/main.nix
index 5451525..f0f5370 100644
--- a/hosts/media-laptop/main.nix
+++ b/hosts/media-laptop/main.nix
@@ -43,10 +43,7 @@ _:
         useDefaultShell = true;
         uid = 1000;
         isNormalUser = true;
-        extraGroups = [
-          "networkmanager"
-          "audio"
-        ];
+        extraGroups = [ "networkmanager" ];
         initialHashedPassword = "";
       };
       "root" = {