From 45f6096f29318454b42771fd4971290b4928c9df Mon Sep 17 00:00:00 2001 From: Daniel Langbein Date: Fri, 20 Oct 2023 14:58:29 +0200 Subject: [PATCH] joplin-desktop on Wayland --- hosts/yodaNas/configuration.nix | 1 + hosts/yodaTab/configuration.nix | 1 + hosts/yodaTux/configuration.nix | 1 + hosts/yodaYoga/configuration.nix | 1 + modules/joplin-desktop.nix | 15 +++++++++++++++ modules/programs.nix | 1 - 6 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 modules/joplin-desktop.nix diff --git a/hosts/yodaNas/configuration.nix b/hosts/yodaNas/configuration.nix index 404cc60..a6bb7bb 100644 --- a/hosts/yodaNas/configuration.nix +++ b/hosts/yodaNas/configuration.nix @@ -24,6 +24,7 @@ #../../modules/vscodium.nix #../../modules/signal-desktop.nix #../../modules/element-desktop.nix + #../../modules/joplin-desktop.nix #../../modules/tor-browser.nix #../../modules/autostart.nix #../../modules/wallpaper.nix diff --git a/hosts/yodaTab/configuration.nix b/hosts/yodaTab/configuration.nix index 9faa70e..2d7056b 100644 --- a/hosts/yodaTab/configuration.nix +++ b/hosts/yodaTab/configuration.nix @@ -23,6 +23,7 @@ ../../modules/vscodium.nix ../../modules/signal-desktop.nix ../../modules/element-desktop.nix + ../../modules/joplin-desktop.nix ../../modules/tor-browser.nix ../../modules/autostart.nix ../../modules/wallpaper.nix diff --git a/hosts/yodaTux/configuration.nix b/hosts/yodaTux/configuration.nix index 59caf86..1919135 100644 --- a/hosts/yodaTux/configuration.nix +++ b/hosts/yodaTux/configuration.nix @@ -23,6 +23,7 @@ ../../modules/vscodium.nix ../../modules/signal-desktop.nix ../../modules/element-desktop.nix + ../../modules/joplin-desktop.nix ../../modules/tor-browser.nix ../../modules/autostart.nix ../../modules/wallpaper.nix diff --git a/hosts/yodaYoga/configuration.nix b/hosts/yodaYoga/configuration.nix index e8aa7fe..e639e15 100644 --- a/hosts/yodaYoga/configuration.nix +++ b/hosts/yodaYoga/configuration.nix @@ -24,6 +24,7 @@ #../../modules/vscodium.nix #../../modules/signal-desktop.nix #../../modules/element-desktop.nix + #../../modules/joplin-desktop.nix #../../modules/tor-browser.nix #../../modules/autostart.nix #../../modules/wallpaper.nix diff --git a/modules/joplin-desktop.nix b/modules/joplin-desktop.nix new file mode 100644 index 0000000..42aca5f --- /dev/null +++ b/modules/joplin-desktop.nix @@ -0,0 +1,15 @@ +{ config, pkgs, lib, ...}: +{ + # TODO: Similar to signal-desktop, joplin-desktop crashes frequently on Wayland. + # As of 2023-10-20, the stable version did not start, + # but unstable does. + + environment.sessionVariables.NIXOS_OZONE_WL = lib.mkIf (config.services.xserver.displayManager.gdm.wayland) "1"; + + users.users.yoda = { + packages = with pkgs; [ + #joplin-desktop # Markdown notes + unstable.joplin-desktop # Markdown notes + ]; + }; +} diff --git a/modules/programs.nix b/modules/programs.nix index fb9a26e..ff1d9dc 100644 --- a/modules/programs.nix +++ b/modules/programs.nix @@ -35,7 +35,6 @@ #gnome-secrets # Password manager (Native Wayland client), but very slow. keepassxc # Password manager. TODO Wayland: Maybe QT_QPA_PLATFORM defined in ghostwriter.nix fixed blurry fonts? tartube-yt-dlp # Video downloader (front-end for yt-dlp) - joplin-desktop # Markdown notes rnote # Handwritten notes xournalpp # Handwritte notes pdfarranger # PDF files: Split, merge, rotate, rearrange, export selected pages