From d4084e7a412571298f7b6dda3a6743dc3316c5bf Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Sat, 16 Dec 2023 00:42:33 +0100
Subject: [PATCH] chore: clean up overlays, signal-desktop, slack,

qMasterPassword
---
 .../sway/config/config.d/applications.conf    |  1 -
 overlays/default.nix                          | 14 ++++++++++--
 overlays/signal-desktop.nix                   | 22 -------------------
 3 files changed, 12 insertions(+), 25 deletions(-)
 delete mode 100644 overlays/signal-desktop.nix

diff --git a/modules/graphical/sway/config/config.d/applications.conf b/modules/graphical/sway/config/config.d/applications.conf
index b3346809..00eecef3 100644
--- a/modules/graphical/sway/config/config.d/applications.conf
+++ b/modules/graphical/sway/config/config.d/applications.conf
@@ -49,7 +49,6 @@ for_window [class="(?i)virtualbox"] floating enable border normal
 for_window [class="Xfburn"] floating enable
 for_window [class="^VirtualBox Machine$" title="Running"] floating disable
 for_window [class="^rdesktop" title="rdesktop"] floating disable
-for_window [app_id="signal"] floating enabled
 
 # firefox floating menus
 for_window [window_role="pop-up"] floating enable
diff --git a/overlays/default.nix b/overlays/default.nix
index b547b1f2..e1fc4536 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -8,7 +8,6 @@
     nixosModules = rec {
       overlays = ({ ... }: {
         nixpkgs.overlays = [
-
           (final: prev:
           let
             unstable = import inputs.unstable {
@@ -19,10 +18,22 @@
               #  "slack"
               #];
             };
+            master = import inputs.master {
+              system = prev.system;
+              config.allowUnfreePredicate = pkg: builtins.elem (prev.lib.getName pkg) [
+                "slack"
+              ];
+            };
+            fork = import inputs.fork {
+              system = prev.system;
+            };
           in
           {
             direnv = unstable.direnv;
             nix-direnv = unstable.nix-direnv;
+            qMasterPassword-wayland = master.qMasterPassword-wayland;
+            slack = master.slack;
+            signal-desktop = fork.signal-desktop;
             #vimPlugins = prev.vimPlugins // {inherit (unstable.vimPlugins) nvim-lspconfig;};
           })
           (import ../pkgs)
@@ -31,7 +42,6 @@
           (import ./nix-index.nix)
           (import ./prr.nix)
           (import ./neovim-plugins.nix)
-          (import ./signal-desktop.nix)
         ];
       });
     };
diff --git a/overlays/signal-desktop.nix b/overlays/signal-desktop.nix
deleted file mode 100644
index 26494807..00000000
--- a/overlays/signal-desktop.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-final: prev: {
-  signal-desktop = prev.signal-desktop.overrideAttrs (oldAttrs: rec {
-    inherit (oldAttrs) pname;
-    dir = "Signal";
-    preFixup = ''
-      gappsWrapperArgs+=(
-        --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 and fix showing application icon in tray
-      substituteInPlace $out/share/applications/${pname}.desktop \
-        --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"
-    '';
-  });
-}