Mirror/nix-git
Mirror/nix-git
1
0
Fork 0
mirror of https://codeberg.org/privacy1st/nix-git synced 2024-11-22 22:09:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

signal on Wayland

Browse Source
This commit is contained in:
Daniel Langbein 2023-10-19 14:27:47 +02:00
parent 321f42c7a6
commit 9957e2fa2e
Signed by: langfingaz
GPG Key ID: 6C47C753F0823002
2 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/autostart.nix
View File

@ -7,15 +7,19 @@
home.file."keepassxc" = { home.file."keepassxc" = {
target = ".config/autostart/org.keepassxc.KeePassXC.desktop"; target = ".config/autostart/org.keepassxc.KeePassXC.desktop";
source = (pkgs.keepassxc + "/share/applications/org.keepassxc.KeePassXC.desktop"); source = (pkgs.keepassxc + "/share/applications/org.keepassxc.KeePassXC.desktop");
}; };
# home.file."gnome-secrets" = { # home.file."gnome-secrets" = {
# target = ".config/autostart/org.gnome.World.Secrets.desktop"; # target = ".config/autostart/org.gnome.World.Secrets.desktop";
# source = (pkgs.gnome-secrets + "/share/applications/org.gnome.World.Secrets.desktop"); # source = (pkgs.gnome-secrets + "/share/applications/org.gnome.World.Secrets.desktop");
# }; # };
home.file."signal-desktop" = lib.mkIf (osConfig.networking.hostName == "yodaTux") { # home.file."signal-desktop" = lib.mkIf (osConfig.networking.hostName == "yodaTux") {
target = ".config/autostart/" + pkgs.signal-desktop.pname + ".desktop"; # target = ".config/autostart/" + pkgs.signal-desktop.pname + ".desktop";
source = (pkgs.signal-desktop + "/share/applications/" + pkgs.signal-desktop.pname + ".desktop"); # source = (pkgs.signal-desktop + "/share/applications/" + pkgs.signal-desktop.pname + ".desktop");
# };
home.file."signal-desktop-beta" = lib.mkIf (osConfig.networking.hostName == "yodaTux") {
target = ".config/autostart/" + pkgs.signal-desktop-beta.pname + ".desktop";
source = (pkgs.signal-desktop-beta + "/share/applications/" + pkgs.signal-desktop-beta.pname + ".desktop");
}; };
home.file."thunderbird" = lib.mkIf (osConfig.networking.hostName == "yodaTux") { home.file."thunderbird" = lib.mkIf (osConfig.networking.hostName == "yodaTux") {

35
modules/signal-desktop.nix
View File

@ -27,25 +27,30 @@
# https://github.com/stelcodes/nixos-config/commit/79071d30912c5b6c2560654925bcc98533cf758f # https://github.com/stelcodes/nixos-config/commit/79071d30912c5b6c2560654925bcc98533cf758f
# https://github.com/NixOS/nixpkgs/pull/222163 # https://github.com/NixOS/nixpkgs/pull/222163
# https://github.com/NixOS/nixpkgs/issues/261101 # https://github.com/NixOS/nixpkgs/issues/261101
# https://github.com/NixOS/nixpkgs/blob/898cb2064b6e98b8c5499f37e81adbdf2925f7c5/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix#L155
# Wayland support: # Wayland support:
# The following worked once ... But currently Signal crashes. # Temporary fix until the above TODO is resolved.
#
# The following worked multiple times with signal-desktop-beta
# ... But sometimes it crashes on startup.
# signal-desktop-beta --use-tray-icon --enable-features=UseOzonePlatform --ozone-platform=wayland # signal-desktop-beta --use-tray-icon --enable-features=UseOzonePlatform --ozone-platform=wayland
#
# Temporary fix.
# https://github.com/NixOS/nixpkgs/issues/222043#issuecomment-1493457041 # https://github.com/NixOS/nixpkgs/issues/222043#issuecomment-1493457041
# nixpkgs.overlays = [ nixpkgs.overlays = [
# (self: super: { (self: super: {
# signal-desktop-beta = super.signal-desktop-beta.overrideAttrs (old: { signal-desktop-beta = super.signal-desktop-beta.overrideAttrs (old: {
# preFixup = old.preFixup + '' preFixup = old.preFixup + ''
# gappsWrapperArgs+=( gappsWrapperArgs+=(
# --add-flags "--enable-features=UseOzonePlatform" --add-flags "--enable-features=UseOzonePlatform"
# --add-flags "--ozone-platform=wayland" --add-flags "--ozone-platform=wayland"
# ) )
# ''; '';
# }); });
# }) })
# ]; ];
# nixpkgs.overlays = [ # nixpkgs.overlays = [
# (self: super: { # (self: super: {
# unstable.signal-desktop-beta = super.unstable.signal-desktop-beta.overrideAttrs (old: { # unstable.signal-desktop-beta = super.unstable.signal-desktop-beta.overrideAttrs (old: {