chore: clean up overlays, signal-desktop, slack,

qMasterPassword
This commit is contained in:
teutat3s 2023-12-16 00:42:33 +01:00
parent bae27118f1
commit d4084e7a41
Signed by: teutat3s
GPG key ID: 4FA1D3FA524F22C1
3 changed files with 12 additions and 25 deletions

View file

@ -49,7 +49,6 @@ for_window [class="(?i)virtualbox"] floating enable border normal
for_window [class="Xfburn"] floating enable for_window [class="Xfburn"] floating enable
for_window [class="^VirtualBox Machine$" title="Running"] floating disable for_window [class="^VirtualBox Machine$" title="Running"] floating disable
for_window [class="^rdesktop" title="rdesktop"] floating disable for_window [class="^rdesktop" title="rdesktop"] floating disable
for_window [app_id="signal"] floating enabled
# firefox floating menus # firefox floating menus
for_window [window_role="pop-up"] floating enable for_window [window_role="pop-up"] floating enable

View file

@ -8,7 +8,6 @@
nixosModules = rec { nixosModules = rec {
overlays = ({ ... }: { overlays = ({ ... }: {
nixpkgs.overlays = [ nixpkgs.overlays = [
(final: prev: (final: prev:
let let
unstable = import inputs.unstable { unstable = import inputs.unstable {
@ -19,10 +18,22 @@
# "slack" # "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 in
{ {
direnv = unstable.direnv; direnv = unstable.direnv;
nix-direnv = unstable.nix-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;}; #vimPlugins = prev.vimPlugins // {inherit (unstable.vimPlugins) nvim-lspconfig;};
}) })
(import ../pkgs) (import ../pkgs)
@ -31,7 +42,6 @@
(import ./nix-index.nix) (import ./nix-index.nix)
(import ./prr.nix) (import ./prr.nix)
(import ./neovim-plugins.nix) (import ./neovim-plugins.nix)
(import ./signal-desktop.nix)
]; ];
}); });
}; };

View file

@ -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"
'';
});
}