diff --git a/nixos/configs/nix.nix b/nixos/configs/nix.nix index fda698e..a8340b7 100644 --- a/nixos/configs/nix.nix +++ b/nixos/configs/nix.nix @@ -48,8 +48,8 @@ [ ]; }; - nixpkgs.config.permittedInsecurePackages = [ - "olm-3.2.16" - ]; + # Allow Olm, as this is just remarking that Matrix is inherently + # not as secure as it claims to be. ~~lol, w/e, it's matrix~~ + nixpkgs.config.permittedInsecurePackages = [ "olm-3.2.16" ]; } diff --git a/nixos/hosts/valere/default.nix b/nixos/hosts/valere/default.nix index 90a9c35..7d69486 100644 --- a/nixos/hosts/valere/default.nix +++ b/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 = { - system.nixos.tags = [ "NVIDIA" ]; - services.xserver.videoDrivers = [ "nvidia" ]; + # TEMPORARILY DISABLED DUE TO KERNEL WONK + #specialisation.optimus.configuration = { + # system.nixos.tags = [ "NVIDIA" ]; + # services.xserver.videoDrivers = [ "nvidia" ]; - # Set up the NVIDIA half of the GPU setup. - # These are used only in the "enabled" configuration. - hardware.nvidia = { - modesetting.enable = true; + # # Set up the NVIDIA half of the GPU setup. + # # These are used only in the "enabled" configuration. + # hardware.nvidia = { + # modesetting.enable = true; - # Prefer the open NVIDIA driver. - open = true; + # # Prefer the open NVIDIA driver. + # open = true; - # Enable the nvidia-settings command. - nvidiaSettings = true; + # # Enable the nvidia-settings command. + # nvidiaSettings = true; - # Offloading setup: use GPU when asked for by command, and not otherwise. - prime = { - sync.enable = true; + # # Offloading setup: use GPU when asked for by command, and not otherwise. + # prime = { + # sync.enable = true; - # Specify how to find our GPUs. - intelBusId = "PCI:0:2:0"; - nvidiaBusId = "PCI:1:0:0"; - }; + # # Specify how to find our GPUs. + # intelBusId = "PCI:0:2:0"; + # nvidiaBusId = "PCI:1:0:0"; + # }; - }; + # }; - # Include the NVIDIA X11. - boot.extraModulePackages = [ config.boot.kernelPackages.nvidia_x11 ]; + # # Include the NVIDIA X11 driver. + # boot.extraModulePackages = [ config.boot.kernelPackages.nvidia_x11 ]; - # Don't disable optimus on this config. - hardware.nvidiaOptimus.disable = lib.mkForce false; - }; + # # Don't disable optimus on this config. + # 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; diff --git a/nixos/overlays/fixup-wine/00-remove-ellipse-assert.patch b/nixos/overlays/fixup-wine/00-remove-ellipse-assert.patch new file mode 100644 index 0000000..4ecece6 --- /dev/null +++ b/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 diff --git a/nixos/packages/gui.pkgs.nix b/nixos/packages/gui.pkgs.nix index cb7a0e9..e34cfac 100644 --- a/nixos/packages/gui.pkgs.nix +++ b/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 - /set relay.remote.deprekages.password "\''${sec.data.remote}" - /remote connect deprekages + /remote add deprekated https://irc.ktemk.in:8001 + /set relay.remote.deprekated.password "\''${sec.data.remote}" + /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 diff --git a/wezterm/wezterm.lua b/wezterm/wezterm.lua index bbedfd9..49f34ce 100644 --- a/wezterm/wezterm.lua +++ b/wezterm/wezterm.lua @@ -208,7 +208,7 @@ config = { font_overrides = { miko = 10, hinata = 16, - valere = 10, + valere = 12, utol = 13, trailblazer = 10, kanbaru = 12,