[General] Update to 24.11

Drop kwin backports
Drop removed printing packages

desktop/general.nix

@@ -100,9 +100,6 @@ in {
       # Enable color management
       services.colord.enable = true;
 
-      hardware.opengl.driSupport = true;
-
-
       environment.systemPackages = with pkgs; [
         p7zip
       ];
@@ -134,7 +131,7 @@ in {
         # package = pkgs.bluez;
       };
 
-      hardware.opengl.driSupport32Bit = mkDefault cfg.gaming.enable;
+      hardware.graphics.enable32Bit = mkDefault cfg.gaming.enable;
     
       environment.systemPackages = with pkgs; [
         glxinfo

desktop/multimedia.nix

@@ -49,7 +49,6 @@ in {
 
 
     # Enable sound.
-    sound.enable = mkOverride 40 false;
     hardware.pulseaudio.enable = mkOverride 40 false;
     services.pipewire = {
       enable = true;

desktop/plasma/plasma6.nix

@@ -16,40 +16,5 @@ in {
 
     # We prefer Plasma Wayland
     services.displayManager.defaultSession = "plasma";
-
-    # Backport explicit sync patches
-    nixpkgs.overlays = [(final: prev: {
-      kdePackages = prev.kdePackages // {
-        kwin = prev.kdePackages.kwin.overrideAttrs (old: {
-          patches = old.patches ++ [
-            (prev.fetchpatch {
-              url = "https://invent.kde.org/plasma/kwin/-/commit/c99b3d52f254f3ec60fa27b3100aee79bb57a5f2.diff";
-              hash = "sha256-2C5droOWbJjymz00ZfCYTT60qpXmfyvwGURZROTfzjQ=";
-            })
-            (prev.fetchpatch {
-              url = "https://invent.kde.org/plasma/kwin/-/commit/4aac3914b8744b41d7aa8d9440f19dca4ba3480c.diff";
-              hash = "sha256-qAgsiRGikIAu5+hZ/np4bAywORRx16zl5pJcZL/n3Jg=";
-            })
-            (prev.fetchpatch {
-              url = "https://invent.kde.org/plasma/kwin/-/commit/c56576a62a167930bf1ce7e0130b1ded17fb4efb.diff";
-              hash = "sha256-f9+1NUgsC18QUQZVRefDVnnKnMxJthBtj/SHQtZotgc=";
-            })
-            (prev.fetchpatch {
-              url = "https://invent.kde.org/plasma/kwin/-/commit/272e856780c7386ff1aa3e063975ab1624954a7d.diff";
-              hash = "sha256-kgzwhJ1qV78J6DbszVBS2uQfpy/1BVrdZ7IuRz3R4ps=";
-            })
-            (prev.fetchpatch {
-              url = "https://invent.kde.org/plasma/kwin/-/commit/a5bcbf1c37e8e3a15c26b9b634204f2846b45dde.diff";
-              hash = "sha256-Urx3NlaAwUoGds2UWQCeVtJxdIWJsfnSnIsZcXGA8MQ=";
-            })
-            (prev.fetchpatch {
-              url = "https://invent.kde.org/plasma/kwin/-/commit/b162003695f34d64fff929056245c2046cf42e65.diff";
-              hash = "sha256-prHXvmI8ByytOHgl90/BQe4Uuo3RYy+ByLlmGUXjf28=";
-            })
-          ];
-        });
-      };
-    })];
-    
   };
 }

desktop/printing.nix

@@ -26,7 +26,6 @@ in {
         cups-brother-hl1110
         cups-toshiba-estudio
         cups-brother-hl1210w
-        hll2390dw-cups
         cups-brother-hl3140cw
         cups-brother-hll2340dw
         cups-drv-rastertosag-gdi
@@ -65,7 +64,6 @@ in {
       "cups-toshiba-estudio"
       "cups-brother-hl1210w"
       "cups-brother-hl1210W"
-      "hll2390dw-cups"
       "cups-brother-hl3140cw"
       "cups-brother-hll2340dw"
       "cups-drv-rastertosag-gdi"

flake.nix

@@ -1,8 +1,7 @@
 {
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
     nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
-    nixpkgs-master.url = "github:NixOS/nixpkgs/master";
 
     nur.url = "github:nix-community/NUR";
     suyu = {

hardware/amd/amdgpu.nix

@@ -39,8 +39,6 @@ in {
     hardware.amdgpu.amdvlk.enable = cfg.defaultVulkanImplementation == "amdvlk";
     hardware.amdgpu.amdvlk.support32Bit.enable = mkDefault config.hardware.amdgpu.amdvlk.enable;
 
-    hardware.opengl.enable = true;
-
     systemd.tmpfiles.rules = [
       "L+    /opt/rocm/hip   -    -    -     -    ${pkgs.rocmPackages.clr}"
     ];

hardware/amd/default.nix

@@ -32,9 +32,7 @@ in {
       backend = [ "amd" ];
     };
 
-    hardware.opengl = {
+    hardware.graphics.enable = true;
-      enable = true;
-    };
 
     aviallon.hardware.mesa.enable = mkDefault (!cfg.useProprietary);
   };

hardware/intel/default.nix

@@ -23,7 +23,7 @@ in
     };
   
     boot.initrd.kernelModules = [ "i915" ];
-    hardware.opengl = {
+    hardware.graphics = {
       enable = true;
       extraPackages = with pkgs; []
         ++ [

hardware/mesa.nix

@@ -59,7 +59,7 @@ in {
   };
 
   config = mkIf cfg.enable {
-    programs.corectrl.enable = mkDefault config.hardware.opengl.enable;
+    programs.corectrl.enable = mkDefault config.hardware.graphics.enable;
 
     aviallon.hardware.mesa.package = mkIf cfg.unstable pkgs.unstable.mesa;
     aviallon.hardware.mesa.package32 = mkIf cfg.unstable pkgs.unstable.driversi686Linux.mesa;
@@ -71,7 +71,7 @@ in {
         optimizePkg { lto = false; } cfg.package32);
     };
 
-    hardware.opengl = {
+    hardware.graphics = {
       package = with pkgs; cfg.internal.package.drivers;
       package32 = with pkgs; cfg.internal.package32.drivers;
 

hardware/nvidia/default.nix

@@ -25,8 +25,6 @@ in {
   };
 
   config = mkIf cfg.enable {
-    hardware.opengl.driSupport32Bit = true;
-
     aviallon.programs.nvtop = {
       enable = true;
     };

hardware/nvidia/proprietary.nix

@@ -144,11 +144,11 @@ in {
     # For now, prefer using package overrides
     # aviallon.programs.config.cudaSupport = mkDefault true;
 
-    hardware.opengl.extraPackages = with pkgs; [
+    hardware.graphics.extraPackages = with pkgs; [
       nvidia-vaapi-driver
     ];
 
-    hardware.opengl.extraPackages32 = with pkgs.pkgsi686Linux; [
+    hardware.graphics.extraPackages32 = with pkgs.pkgsi686Linux; [
       nvidia-vaapi-driver
     ];