From 865e05bd3e974d5e445bd4d8bb14ae79af57faad Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Mon, 20 Nov 2023 18:43:39 +0100
Subject: [PATCH] chore: cleanup overlays as we're following nixos-unstable

---
 modules/nix/default.nix     |  3 +++
 overlays/default.nix        | 26 +++++++-------------------
 overlays/signal-desktop.nix | 21 +++++++++------------
 3 files changed, 19 insertions(+), 31 deletions(-)

diff --git a/modules/nix/default.nix b/modules/nix/default.nix
index 25b89e68..6cbeb7f7 100644
--- a/modules/nix/default.nix
+++ b/modules/nix/default.nix
@@ -6,8 +6,11 @@
   ...
 }: {
   nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
+    "1password"
+    "1password-cli"
     "cups-brother-hl3140cw"
     "facetimehd-firmware"
+    "slack"
     "veracrypt"
     "zoom"
   ];
diff --git a/overlays/default.nix b/overlays/default.nix
index 44ef5014..6932b2ac 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -13,34 +13,22 @@
           let
             unstable = import inputs.unstable {
               system = prev.system;
-              config.allowUnfreePredicate = pkg: builtins.elem (prev.lib.getName pkg) [
-                "1password-cli"
-                "1password"
-                "slack"
-              ];
+              #config.allowUnfreePredicate = pkg: builtins.elem (prev.lib.getName pkg) [
+              #  "1password-cli"
+              #  "1password"
+              #  "slack"
+              #];
             };
           in
           {
-            nixd = unstable.nixd;
-
-            _1password = unstable._1password;
-            _1password-gui = unstable._1password-gui;
-
-            thunderbird = unstable.thunderbird;
-
-            docker_24 = unstable.docker_24;
-
-            flyctl = unstable.flyctl;
-
-            slack = unstable.slack;
-            vimPlugins = prev.vimPlugins // {inherit (unstable.vimPlugins) nvim-lspconfig;};
+            #slack = unstable.slack;
+            #vimPlugins = prev.vimPlugins // {inherit (unstable.vimPlugins) nvim-lspconfig;};
           })
           (import ../pkgs)
           (import ./blesh.nix)
           (import ./manix.nix)
           (import ./mdbook-multilang.nix inputs)
           (import ./prr.nix)
-          (import ./rnix-lsp.nix)
           (import ./neovim-plugins.nix)
           (import ./signal-desktop.nix)
         ];
diff --git a/overlays/signal-desktop.nix b/overlays/signal-desktop.nix
index 4cab3bc8..26494807 100644
--- a/overlays/signal-desktop.nix
+++ b/overlays/signal-desktop.nix
@@ -1,23 +1,20 @@
 final: prev: {
   signal-desktop = prev.signal-desktop.overrideAttrs (oldAttrs: rec {
     inherit (oldAttrs) pname;
-    version = "6.38.0";
-    hash = "sha256-y2mwO7Qc01vuIeJUcAxYDD97DXOwXCd8wNZmkG4maF0=";
     dir = "Signal";
-    src = prev.fetchurl {
-      url = "https://updates.signal.org/desktop/apt/pool/s/${pname}/${pname}_${version}_amd64.deb";
-      inherit hash;
-    };
-
     preFixup = ''
       gappsWrapperArgs+=(
-        --prefix LD_LIBRARY_PATH : "${prev.lib.makeLibraryPath [prev.stdenv.cc.cc prev.pipewire]}"
-        --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-features=UseOzonePlatform --ozone-platform=wayland}}"
-        --suffix PATH : ${prev.lib.makeBinPath [prev.xdg-utils]}
+        --prefix LD_LIBRARY_PATH : "${prev.lib.makeLibraryPath [ prev.stdenv.cc.cc prev.pipewire ] }"
+        # Currently crashes see https://github.com/NixOS/nixpkgs/issues/222043
+        --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"
+        --suffix PATH : ${prev.lib.makeBinPath [ prev.xdg-utils ]}
       )
-      # Fix the desktop link
+
+      # Fix the desktop link and fix showing application icon in tray
       substituteInPlace $out/share/applications/${pname}.desktop \
-        --replace "/opt/${dir}/${pname}" $out/bin/${pname}
+        --replace "/opt/${dir}/${pname}" $out/bin/${pname} \
+        ${if pname == "signal-desktop" then "--replace \"bin/signal-desktop\" \"bin/signal-desktop --use-tray-icon\"" else ""}
+
       autoPatchelf --no-recurse -- "$out/lib/${dir}/"
       patchelf --add-needed ${prev.libpulseaudio}/lib/libpulse.so "$out/lib/${dir}/resources/app.asar.unpacked/node_modules/@signalapp/ringrtc/build/linux/libringrtc-x64.node"
     '';