wine: patch 9.0 to not crash on MLO, valere tweaks

nixos/configs/nix.nix

@@ -48,8 +48,8 @@
         [ ];
   };
 
-  nixpkgs.config.permittedInsecurePackages = [
+	# Allow Olm, as this is just remarking that Matrix is inherently
-    "olm-3.2.16"
+	# not as secure as it claims to be. ~~lol, w/e, it's matrix~~
-  ];
+  nixpkgs.config.permittedInsecurePackages = [ "olm-3.2.16" ];
 
 }

nixos/hosts/valere/default.nix

@@ -55,38 +55,39 @@
   # Disable the NVIDIA GPU unless we explicitly request it.
   hardware.nvidiaOptimus.disable = true;
 
-  specialisation.optimus.configuration = {
+	# TEMPORARILY DISABLED DUE TO KERNEL WONK
-    system.nixos.tags = [ "NVIDIA" ];
+   #specialisation.optimus.configuration = {
-    services.xserver.videoDrivers = [ "nvidia" ];
+   #  system.nixos.tags = [ "NVIDIA" ];
+   #  services.xserver.videoDrivers = [ "nvidia" ];
 
-    # Set up the NVIDIA half of the GPU setup.
+   #  # Set up the NVIDIA half of the GPU setup.
-    # These are used only in the "enabled" configuration.
+   #  # These are used only in the "enabled" configuration.
-    hardware.nvidia = {
+   #  hardware.nvidia = {
-      modesetting.enable = true;
+   #    modesetting.enable = true;
 
-      # Prefer the open NVIDIA driver.
+   #    # Prefer the open NVIDIA driver.
-      open = true;
+   #    open = true;
 
-      # Enable the nvidia-settings command.
+   #    # Enable the nvidia-settings command.
-      nvidiaSettings = true;
+   #    nvidiaSettings = true;
 
-      # Offloading setup: use GPU when asked for by command, and not otherwise.
+   #    # Offloading setup: use GPU when asked for by command, and not otherwise.
-      prime = {
+   #    prime = {
-        sync.enable = true;
+   #      sync.enable = true;
 
-        # Specify how to find our GPUs.
+   #      # Specify how to find our GPUs.
-        intelBusId = "PCI:0:2:0";
+   #      intelBusId = "PCI:0:2:0";
-        nvidiaBusId = "PCI:1:0:0";
+   #      nvidiaBusId = "PCI:1:0:0";
-      };
+   #    };
 
-    };
+   #  };
 
-    # Include the NVIDIA X11.
+   # # Include the NVIDIA X11 driver.
-    boot.extraModulePackages = [ config.boot.kernelPackages.nvidia_x11 ];
+   # boot.extraModulePackages = [ config.boot.kernelPackages.nvidia_x11 ];
 
-    # Don't disable optimus on this config.
+   # # Don't disable optimus on this config.
-    hardware.nvidiaOptimus.disable = lib.mkForce false;
+   # hardware.nvidiaOptimus.disable = lib.mkForce false;
-  };
+  #};
 
   # Provide memtest86, since that's nice.
   boot.loader.systemd-boot.memtest86.enable = true;
@@ -103,7 +104,7 @@
   boot.kernelPatches = [
     {
       name = "enable-dell-privacy";
-      patch = ./00-support-dell-smbios.patch;
+      patch = null;
 
       extraStructuredConfig = with lib.kernel; {
         DELL_WMI_PRIVACY = yes;

nixos/overlays/fixup-wine/00-remove-ellipse-assert.patch

@@ -0,0 +1,13 @@
+diff --git a/dlls/user32/text.c b/dlls/user32/text.c
+index 1896627..a114773 100644
+--- a/dlls/user32/text.c
++++ b/dlls/user32/text.c
+@@ -743,7 +743,7 @@ static const WCHAR *TEXT_NextLineW( HDC hdc, const WCHAR *str, int *count,
+                 /* If we are here after a path ellipsification it must be
+                  * because even the ellipsis itself didn't fit.
+                  */
+-                assert (pellip->under == 0 && pellip->after == 0);
++                //assert (pellip->under == 0 && pellip->after == 0);
+                 pellip->before = before;
+                 pellip->len = len_ellipsis;
+                 /* pellip->after remains as zero as does

nixos/packages/gui.pkgs.nix

@@ -10,6 +10,18 @@
   niri,
   ...
 }:
+let
+
+	# Hack wine to not explode when starting MLO.
+  wineWayland = (pkgs.wineWowPackages.stableFull.override { waylandSupport = true; });
+  wine = wineWayland.overrideAttrs (prev: {
+
+		patches = prev.patches ++ [
+			../overlays/fixup-wine/00-remove-ellipse-assert.patch
+		];
+
+  });
+in
 with pkgs;
 [
   wezterm
@@ -35,9 +47,9 @@ with pkgs;
           /set weechat.bar.buffers.position top
           /set buflist.format.buffer "\''${format_number}\''${indent}\''${cut:20,...,\''${format_nick_prefix}\''${format_name}}"
           /set buflist.look.sort active
-          /remote add deprekages https://irc.ktemk.in:8001
+          /remote add deprekated https://irc.ktemk.in:8001
-          /set relay.remote.deprekages.password "\''${sec.data.remote}"
+          /set relay.remote.deprekated.password "\''${sec.data.remote}"
-          /remote connect deprekages
+          /remote connect deprekated
         '';
 
       };
@@ -147,7 +159,7 @@ with pkgs;
   if pkgs.stdenv.isx86_64 then
     [
       jupyter # For now.
-      (wineWowPackages.stableFull.override { waylandSupport = true; })
+      wine
       winetricks
       zoom-us
       masterpdfeditor

wezterm/wezterm.lua

@@ -208,7 +208,7 @@ config = {
 font_overrides = {
 	miko = 10,
 	hinata = 16,
-	valere = 10,
+	valere = 12,
 	utol = 13,
 	trailblazer = 10,
 	kanbaru = 12,