From 1d52958cdecff65f98c354291d62b9d5067c97ce Mon Sep 17 00:00:00 2001
From: Bryan Ramos <bryan@ramos.codes>
Date: Fri, 1 Mar 2024 14:07:34 -0500
Subject: [PATCH] update

---
 src/system/machines/desktop/hardware.nix | 1 -
 src/system/machines/desktop/system.nix   | 3 ++-
 src/system/machines/server/default.nix   | 2 +-
 src/user/configs/default.nix             | 6 ++----
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/system/machines/desktop/hardware.nix b/src/system/machines/desktop/hardware.nix
index 1f2732d..6625e01 100644
--- a/src/system/machines/desktop/hardware.nix
+++ b/src/system/machines/desktop/hardware.nix
@@ -53,4 +53,3 @@
   powerManagement.cpuFreqGovernor = lib.mkDefault "performance";
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }
-
diff --git a/src/system/machines/desktop/system.nix b/src/system/machines/desktop/system.nix
index 2b886e8..a2d6709 100644
--- a/src/system/machines/desktop/system.nix
+++ b/src/system/machines/desktop/system.nix
@@ -6,7 +6,8 @@
   users.users = {
     ${config.user.name} = {
       isNormalUser = true;
-      extraGroups = config.user.groups;
+      extraGroups = config.user.groups
+        ++ [ "video" "audio" "kvm" "libvirtd" "docker" ];
       openssh.authorizedKeys.keys = config.user.sshKeys;
     };
   };
diff --git a/src/system/machines/server/default.nix b/src/system/machines/server/default.nix
index 58605a4..5237d0c 100644
--- a/src/system/machines/server/default.nix
+++ b/src/system/machines/server/default.nix
@@ -2,7 +2,7 @@
 
 {
   imports = [
-    ../../../user
+    ../../../user/configs
     ./hardware.nix
     ./system.nix
   ];
diff --git a/src/user/configs/default.nix b/src/user/configs/default.nix
index ca58f78..5de4451 100644
--- a/src/user/configs/default.nix
+++ b/src/user/configs/default.nix
@@ -10,9 +10,7 @@
         shell = pkgs.bash;
 
         groups = [
-          "wheel" "networkmanager" "home-manager"
-          "input" "video" "audio"
-          "kvm" "libvirtd" "docker"
+          "wheel" "networkmanager" "home-manager" "input"
         ];
 
         sshKeys = [
@@ -20,7 +18,7 @@
           "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBK2ROz7EVvE+nzF5k9EYZ2v3JhBzk058uh3QJTzcG4t70fkZgh9y56AOx26eXlKQWuuV05e8EkWRuVI8gfA2ROI="
         ];
 
-        gitConfig= {
+        gitConfig = {
           userName = "Bryan Ramos";
           userEmail = "bryan@ramos.codes";
           signing = {