migrated channel 24.05 to unstable

modules/services/nvidia.nix

@@ -10,10 +10,9 @@
     boot.kernelParams = lib.mkIf (config.networking.hostName == "workstation") [ "nvidia-drm.fbdev=1" ];
     services.xserver.videoDrivers = [ "nvidia" ];
     hardware = {
-      opengl = {
+      graphics = {
         enable = true;
-        driSupport = true;
-        driSupport32Bit = true;
+        enable32Bit = true;
         extraPackages = with pkgs; [
           nvidia-vaapi-driver
           vaapiVdpau

modules/services/printing.nix

@@ -13,7 +13,7 @@ in
 {
   options.my.services.printing.enable = lib.mkEnableOption "enable";
   config = lib.mkIf config.my.services.printing.enable {
-    users.users.jawz.packages = [ pkgs.gnome.simple-scan ];
+    users.users.jawz.packages = [ pkgs.simple-scan ];
     services.printing = {
       enable = true;
       drivers = printingDrivers;

modules/services/sound.nix

@@ -10,7 +10,6 @@
   config = lib.mkIf config.my.services.sound.enable {
     hardware.pulseaudio.enable = false;
     security.rtkit.enable = true; # make pipewire realtime-capable
-    sound.enable = false;
     services.pipewire = {
       enable = true;
       alsa.enable = true;