From 639bce933f7df264cf5cae18eb09c8f3f3db6ba8 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Thu, 29 Jun 2023 03:05:46 +0200
Subject: [PATCH] nvidia wayland sucks

---
 hosts/sopp/default.nix | 10 ++++++++--
 profiles/locale-no.nix |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/hosts/sopp/default.nix b/hosts/sopp/default.nix
index ee78084..2e32fcb 100644
--- a/hosts/sopp/default.nix
+++ b/hosts/sopp/default.nix
@@ -121,14 +121,20 @@
   # nvidia bad
   nixpkgs.config.packageOverrides = (pkgs: {
     discord = pkgs.discord.overrideAttrs (old: rec {
-      desktopItem = old.desktopItem.override (old': {
-        #exec = "${pkgs.coreutils}/bin/env NIXOS_OZONE_WL=1 ${old'.exec}";
+      desktopItem = old.desktopItem.override (old: {
+        #exec = "${pkgs.coreutils}/bin/env NIXOS_OZONE_WL=1 ${old.exec}";
         exec = "${pkgs.coreutils-full}/bin/env NIXOS_OZONE_WL=1 Discord";
       });
       postInstall = ''
         ln -sf "${desktopItem}/share/applications" $out/share/
       '' + old.postInstall;
     });
+    slack = pkgs.slack.overrideAttrs (old: {
+      postInstall = old.postInstall or "" + ''
+        substituteInPlace $out/share/applications/slack.desktop \
+          --replace "$out/bin/slack " "$out/bin/slack --disable-gpu --in-process-gpu "
+      '';
+    });
     element-desktop = pkgs.element-desktop.overrideAttrs (old: {
       desktopItem = old.desktopItem.override (old: {
         exec = "element-desktop --disable-gpu --in-process-gpu %u";
diff --git a/profiles/locale-no.nix b/profiles/locale-no.nix
index 351006e..c393eff 100644
--- a/profiles/locale-no.nix
+++ b/profiles/locale-no.nix
@@ -16,7 +16,7 @@
   services.xserver.xkbVariant = "";
 
   # no caps lock
-  services.xserver.xkbOptions = "ctrl:nocaps";
+  services.xserver.xkbOptions = "ctrl:nocaps"; # TODO: doesn't work
   #console.useXkbConfig = true; # applies to ttys aswell, mutex with console.keyMap
   # run the following to make GNOME reload the xkb options:
   /*