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

element-desktop and signal-desktop on Wayland

Browse Source
This commit is contained in:
Daniel Langbein 2023-10-18 13:29:14 +02:00
parent c212b7f7dc
commit 259a40e915
Signed by: langfingaz
GPG Key ID: 6C47C753F0823002
7 changed files with 86 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hosts/yodaNas/configuration.nix
View File

@ -20,6 +20,8 @@
#../../modules/programs.nix #../../modules/programs.nix
#../../modules/boxes.nix #../../modules/boxes.nix
#../../modules/signal-desktop.nix
#../../modules/element-desktop.nix
#../../modules/autostart.nix #../../modules/autostart.nix
#../../modules/wallpaper.nix #../../modules/wallpaper.nix
#../../modules/fwupd-gnome.nix #../../modules/fwupd-gnome.nix

2
hosts/yodaTab/configuration.nix
View File

@ -19,6 +19,8 @@
../../modules/programs.nix ../../modules/programs.nix
#../../modules/boxes.nix #../../modules/boxes.nix
../../modules/signal-desktop.nix
../../modules/element-desktop.nix
../../modules/autostart.nix ../../modules/autostart.nix
../../modules/wallpaper.nix ../../modules/wallpaper.nix
../../modules/fwupd-gnome.nix ../../modules/fwupd-gnome.nix

2
hosts/yodaTux/configuration.nix
View File

@ -19,6 +19,8 @@
../../modules/programs.nix ../../modules/programs.nix
../../modules/boxes.nix ../../modules/boxes.nix
../../modules/signal-desktop.nix
../../modules/element-desktop.nix
../../modules/autostart.nix ../../modules/autostart.nix
../../modules/wallpaper.nix ../../modules/wallpaper.nix
../../modules/fwupd-gnome.nix ../../modules/fwupd-gnome.nix

2
hosts/yodaYoga/configuration.nix
View File

@ -20,6 +20,8 @@
#../../modules/programs.nix #../../modules/programs.nix
#../../modules/boxes.nix #../../modules/boxes.nix
#../../modules/signal-desktop.nix
#../../modules/element-desktop.nix
#../../modules/autostart.nix #../../modules/autostart.nix
#../../modules/wallpaper.nix #../../modules/wallpaper.nix
#../../modules/fwupd-gnome.nix #../../modules/fwupd-gnome.nix

19
modules/element-desktop.nix Normal file
View File

@ -0,0 +1,19 @@
{ config, pkgs, lib, ... }:
{
users.users.yoda = {
packages = with pkgs; [
# Matrix clients
element-desktop
#fluffychat
# Web version: https://app.cinny.in/
#cinny-desktop
# E2E encryption is not yet implemented: https://gitlab.gnome.org/GNOME/fractal/-/issues/717
#fractal
#nheko
];
};
# The Element package already includes a wrapper that automatically adds `--enable-features=UseOzonePlatform` and `--ozone-platform=wayland` when `NIXOS_OZONE_WL` is set.
# https://discourse.nixos.org/t/partly-overriding-a-desktop-entry/20743/2
environment.sessionVariables.NIXOS_OZONE_WL = lib.mkIf (config.services.xserver.displayManager.gdm.wayland) "1";
}

10
modules/programs.nix
View File

@ -45,17 +45,7 @@
# For spellcheck, see here: https://nixos.wiki/wiki/LibreOffice#Spellcheck # For spellcheck, see here: https://nixos.wiki/wiki/LibreOffice#Spellcheck
libreoffice-fresh libreoffice-fresh
anki-bin # Flashcards anki-bin # Flashcards
signal-desktop # Signal client
transmission-gtk # BitTorrent client transmission-gtk # BitTorrent client
# Matrix clients
element-desktop
#fluffychat
# Web version: https://app.cinny.in/
#cinny-desktop
# E2E encryption is not yet implemented: https://gitlab.gnome.org/GNOME/fractal/-/issues/717
#fractal
#nheko
]; ];
}; };

59
modules/signal-desktop.nix Normal file
View File

@ -0,0 +1,59 @@
{ config, pkgs, lib, ... }:
{
# Import unstable with niv.
nixpkgs.config.packageOverrides = pkgs: {
unstable = import (import ../nix/sources.nix).unstable {
inherit pkgs;
};
};
users.users.yoda = {
packages = with pkgs; [
signal-desktop-beta # Signal client
];
};
# users.users.yoda = {
# packages = with pkgs.unstable; [
# signal-desktop-beta # Signal client
# ];
# };
# TODO: Signal on Wayland without crash
# Signal does also use the NIXOS_OZONE_WL variable to enable Wayland support.
# However, it does currently crash in this mode.
# See
# https://github.com/stelcodes/nixos-config/commit/79071d30912c5b6c2560654925bcc98533cf758f
# https://github.com/NixOS/nixpkgs/pull/222163
# https://github.com/NixOS/nixpkgs/issues/261101
# Wayland support:
# The following worked once ... But currently Signal crashes.
# signal-desktop-beta --use-tray-icon --enable-features=UseOzonePlatform --ozone-platform=wayland
# Temporary fix.
# https://github.com/NixOS/nixpkgs/issues/222043#issuecomment-1493457041
# nixpkgs.overlays = [
# (self: super: {
# signal-desktop-beta = super.signal-desktop-beta.overrideAttrs (old: {
# preFixup = old.preFixup + ''
# gappsWrapperArgs+=(
# --add-flags "--enable-features=UseOzonePlatform"
# --add-flags "--ozone-platform=wayland"
# )
# '';
# });
# })
# ];
# nixpkgs.overlays = [
# (self: super: {
# unstable.signal-desktop-beta = super.unstable.signal-desktop-beta.overrideAttrs (old: {
# preFixup = old.preFixup + ''
# gappsWrapperArgs+=(
# --add-flags "--enable-features=UseOzonePlatform"
# --add-flags "--ozone-platform=wayland"
# )
# '';
# });
# })
# ];
}