git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #65449 from worldofpeace/disable-portals

nixos/xdg: disable portals (again, again)

commit7f2f31a812faeadecafc5ff97f2f22430efc5c04 authorworldofpeace <worldofpeace@protonmail.ch> dateMon 29 Jul 2019, 21:47 (7 years ago) parent179ab191b21c9d
4 files changed+31−3
nixos/modules/config/xdg/portal.nix+22−2 nixos/modules/services/desktops/flatpak.nix+6 nixos/modules/services/x11/desktop-managers/gnome3.nix+1 nixos/modules/services/x11/desktop-managers/plasma5.nix+2−1
nixos/modules/config/xdg/portal.nix+22−2
@@ -1,10 +1,12 @@
11{ config, pkgs ,lib ,... }:
2+
23with lib;
4+
35{
46 options.xdg.portal = {
57 enable =
68 mkEnableOption "<link xlink:href='https://github.com/flatpak/xdg-desktop-portal'>xdg desktop integration</link>"//{
7− default = config.services.xserver.enable;
9+ default = false;
810 };
911
1012 extraPortals = mkOption {
@@ -19,6 +21,17 @@ with lib;
1921 environments you probably want to add them yourself.
2022 '';
2123 };
24+
25+ gtkUsePortal = mkOption {
26+ type = types.bool;
27+ default = false;
28+ description = ''
29+ Sets environment variable <literal>GTK_USE_PORTAL</literal> to <literal>1</literal>.
30+ This is needed for packages ran outside Flatpak to respect and use XDG Desktop Portals.
31+ For example, you'd need to set this for non-flatpak Firefox to use native filechoosers.
32+ Defaults to <literal>false</literal> to respect its opt-in nature.
33+ '';
34+ };
2235 };
2336
2437 config =
@@ -28,10 +41,17 @@ with lib;
2841
2942 in mkIf cfg.enable {
3043
44+ assertions = [
45+ { assertion = (cfg.gtkUsePortal -> cfg.extraPortals != []);
46+ message = "Setting xdg.portal.gtkUsePortal to true requires a portal implementation in xdg.portal.extraPortals such as xdg-desktop-portal-gtk or xdg-desktop-portal-kde.";
47+ }
48+ ];
49+
3150 services.dbus.packages = packages;
3251 systemd.packages = packages;
52+
3353 environment.variables = {
34− GTK_USE_PORTAL = "1";
54+ GTK_USE_PORTAL = optional cfg.gtkUsePortal "1";
3555 XDG_DESKTOP_PORTAL_PATH = map (p: "${p}/share/xdg-desktop-portal/portals") cfg.extraPortals;
3656 };
3757 };
nixos/modules/services/desktops/flatpak.nix+6
@@ -22,6 +22,12 @@ in {
2222 ###### implementation
2323 config = mkIf cfg.enable {
2424
25+ assertions = [
26+ { assertion = (config.xdg.portal.enable == true);
27+ message = "To use Flatpak you must enable XDG Desktop Portals with xdg.portal.enable.";
28+ }
29+ ];
30+
2531 environment.systemPackages = [ pkgs.flatpak ];
2632
2733 services.dbus.packages = [ pkgs.flatpak ];
nixos/modules/services/x11/desktop-managers/gnome3.nix+1
@@ -154,6 +154,7 @@ in {
154154 services.hardware.bolt.enable = mkDefault true;
155155 services.xserver.libinput.enable = mkDefault true; # for controlling touchpad settings via gnome control center
156156 systemd.packages = [ pkgs.gnome3.vino ];
157+ xdg.portal.enable = true;
157158 xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
158159
159160 # If gnome3 is installed, build vim for gtk3 too.
nixos/modules/services/x11/desktop-managers/plasma5.nix+2−1
@@ -170,7 +170,7 @@ in
170170
171171 xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/
172172 ]
173−
173+
174174 # Phonon audio backend
175175 ++ lib.optional (cfg.phononBackend == "gstreamer") libsForQt5.phonon-backend-gstreamer
176176 ++ lib.optional (cfg.phononBackend == "gstreamer" && cfg.enableQt4Support) pkgs.phonon-backend-gstreamer
@@ -233,6 +233,7 @@ in
233233 security.pam.services.sddm.enableKwallet = true;
234234 security.pam.services.slim.enableKwallet = true;
235235
236+ xdg.portal.enable = true;
236237 xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-kde ];
237238
238239 # Update the start menu for each user that is currently logged in