6 files changed, 9 insertions, 9 deletions
diff --git a/machines/ceres/sysidentity.nix b/machines/ceres/sysidentity.nix
index ca42f12..d0b31d3 100644
--- a/machines/ceres/sysidentity.nix
+++ b/machines/ceres/sysidentity.nix
@@ -3,5 +3,5 @@ groups: {
   arch = "x86_64-linux";
   kind = "personal";
 
-  include = groups.desktop ++ [ "work" ];
+  include = groups.pc;
 }
diff --git a/machines/iso/configuration.nix b/machines/iso/configuration.nix
index c8b641f..f29901c 100644
--- a/machines/iso/configuration.nix
+++ b/machines/iso/configuration.nix
@@ -18,7 +18,7 @@
 
   environment.systemPackages = with pkgs; [
     # General CLI
-    git texinfo lsof tree bc
+    busybox git texinfo lsof tree bc
     # Hardware managment
     lshw lm_sensors efibootmgr usbutils cdrtools pipewire bluez
     unetbootin
@@ -60,7 +60,7 @@
 
   fonts.packages = with pkgs; [
     # Note to self: DO NOT INSTALL ADOBE FONTS!
-    corefonts vistafonts liberation_ttf helvetica-neue-lt-std noto-fonts noto-fonts-emoji cm_unicode #symbola
+    corefonts vista-fonts liberation_ttf helvetica-neue-lt-std noto-fonts noto-fonts-color-emoji cm_unicode #symbola
     # CJK
     noto-fonts-cjk-sans arphic-ukai arphic-uming takao wqy_microhei wqy_zenhei
   ];
diff --git a/machines/juno/hardware-configuration.nix b/machines/juno/hardware-configuration.nix
index c4a2428..77bdc6b 100644
--- a/machines/juno/hardware-configuration.nix
+++ b/machines/juno/hardware-configuration.nix
@@ -37,7 +37,8 @@
   nixpkgs.config.packageOverrides = pkgs: {
     intel-vaapi-driver = pkgs.intel-vaapi-driver.override { enableHybridCodec = true; };
   };
-  hardware.opengl = {
+
+  hardware.graphics = {
     enable = true;
     extraPackages = with pkgs; [
       intel-media-driver # LIBVA_DRIVER_NAME=iHD
diff --git a/machines/minerva/sysidentity.nix b/machines/minerva/sysidentity.nix
index 879951e..f591ec5 100644
--- a/machines/minerva/sysidentity.nix
+++ b/machines/minerva/sysidentity.nix
@@ -3,5 +3,5 @@ groups: {
   arch = "x86_64-linux";
   kind = "personal";
 
-  include = groups.laptop ++ [ "gui-powerful" "work" ];
+  include = groups.laptop ++ [ "desktop-media-creation" "dev-kubernetes" "dev-netsim" ];
 }
diff --git a/machines/vesta/configuration.nix b/machines/vesta/configuration.nix
index e7b3b61..012715d 100644
--- a/machines/vesta/configuration.nix
+++ b/machines/vesta/configuration.nix
@@ -1,6 +1,6 @@
 { pkgs, ... }: {
   environment.systemPackages = with pkgs; [
-    alsa-plugins radeontop glxinfo vulkan-tools clinfo gpu-viewer lutris wine gns3-server gns3-gui docker tigervnc ubridge vpcs
+    alsa-plugins radeontop mesa-demos vulkan-tools clinfo gpu-viewer lutris wine gns3-server gns3-gui docker tigervnc ubridge vpcs
   ];
 
   security.wrappers.ubridge = {
diff --git a/machines/vesta/hardware-configuration.nix b/machines/vesta/hardware-configuration.nix
index eae1348..998b95e 100644
--- a/machines/vesta/hardware-configuration.nix
+++ b/machines/vesta/hardware-configuration.nix
@@ -64,7 +64,7 @@
   # systemd.tmpfiles.rules = [
   #   "L+    /opt/rocm/hip   -    -    -     -    ${pkgs.rocmPackages.clr}"
   # ];
-  hardware.opengl = {
+  hardware.graphics = {
     # Mesa
     enable = true;
 
@@ -81,9 +81,8 @@
     # ];
 
     # Vulkan
-    driSupport = true;
     # For 32 bit applications
-    driSupport32Bit = true;
+    enable32Bit = true;
   };
   # system.replaceRuntimeDependencies = [
   #   ({ original = pkgs.mesa; replacement = (import /srv/nixpkgs-mesa { }).pkgs.mesa; })