git.iko.soy/typeable/nixpkgs
on master help sign in
nixos/xdg: add portal option

This factors the configuration out of the flatpak module.

commit90b1197301eb714e64a508c3be2dd073b24caed3 authorPasquale <p3dimaria@hotmail.it> dateWed 10 Jul 2019, 16:01 (7 years ago) parent2ce67ce
6 files changed+46−20
nixos/modules/config/xdg/portal.nix+38 nixos/modules/module-list.nix+1 nixos/modules/rename.nix+1 nixos/modules/services/desktops/flatpak.nix+3−19 nixos/modules/services/x11/desktop-managers/gnome3.nix+1−1 nixos/modules/services/x11/desktop-managers/plasma5.nix+2
nixos/modules/config/xdg/portal.nixnew file+38
@@ -0,0 +1,38 @@
1+{ config, pkgs ,lib ,... }:
2+with lib;
3+{
4+ options.xdg.portal = {
5+ enable =
6+ mkEnableOption "<link xlink:href='https://github.com/flatpak/xdg-desktop-portal'>xdg desktop integration</link>"//{
7+ default = true;
8+ };
9+
10+ extraPortals = mkOption {
11+ type = types.listOf types.package;
12+ default = [];
13+ description = ''
14+ List of additional portals to add to path. Portals allow interaction
15+ with system, like choosing files or taking screenshots. At minimum,
16+ a desktop portal implementation should be listed. GNOME and KDE already
17+ adds <package>xdg-desktop-portal-gtk</package>; and
18+ <package>xdg-desktop-portal-kde</package> respectively. On other desktop
19+ environments you probably want to add them yourself.
20+ '';
21+ };
22+ };
23+
24+ config =
25+ let
26+ cfg = config.xdg.portal;
27+ packages = [ pkgs.xdg-desktop-portal ] ++ cfg.extraPortals;
28+
29+ in mkIf cfg.enable {
30+
31+ services.dbus.packages = packages;
32+ systemd.packages = packages;
33+ environment.variables = {
34+ GTK_USE_PORTAL = "1";
35+ XDG_DESKTOP_PORTAL_PATH = map (p: "${p}/share/xdg-desktop-portal/portals") cfg.extraPortals;
36+ };
37+ };
38+}
nixos/modules/module-list.nix+1
@@ -11,6 +11,7 @@
1111 ./config/xdg/icons.nix
1212 ./config/xdg/menus.nix
1313 ./config/xdg/mime.nix
14+ ./config/xdg/portal.nix
1415 ./config/appstream.nix
1516 ./config/xdg/sounds.nix
1617 ./config/gtk/gtk-icon-cache.nix
nixos/modules/rename.nix+1
@@ -19,6 +19,7 @@ with lib;
1919 let value = getAttrFromPath [ "services" "ddclient" "domain" ] config;
2020 in if value != "" then [ value ] else []))
2121 (mkRemovedOptionModule [ "services" "ddclient" "homeDir" ] "")
22+ (mkRenamedOptionModule [ "services" "flatpak" "extraPortals" ] [ "xdg" "portal" "extraPortals" ])
2223 (mkRenamedOptionModule [ "services" "i2pd" "extIp" ] [ "services" "i2pd" "address" ])
2324 (mkRenamedOptionModule [ "services" "kubernetes" "apiserver" "admissionControl" ] [ "services" "kubernetes" "apiserver" "enableAdmissionPlugins" ])
2425 (mkRenamedOptionModule [ "services" "kubernetes" "apiserver" "address" ] ["services" "kubernetes" "apiserver" "bindAddress"])
nixos/modules/services/desktops/flatpak.nix+3−19
@@ -15,38 +15,22 @@ in {
1515 options = {
1616 services.flatpak = {
1717 enable = mkEnableOption "flatpak";
18−
19− extraPortals = mkOption {
20− type = types.listOf types.package;
21− default = [];
22− description = ''
23− List of additional portals to add to path. Portals allow interaction
24− with system, like choosing files or taking screenshots. At minimum,
25− a desktop portal implementation should be listed. GNOME already
26− adds <package>xdg-desktop-portal-gtk</package>; for KDE, there
27− is <package>xdg-desktop-portal-kde</package>. Other desktop
28− environments will probably want to do the same.
29− '';
30− };
3118 };
3219 };
3320
3421
3522 ###### implementation
3623 config = mkIf cfg.enable {
24+
3725 environment.systemPackages = [ pkgs.flatpak ];
3826
39− services.dbus.packages = [ pkgs.flatpak pkgs.xdg-desktop-portal ] ++ cfg.extraPortals;
27+ services.dbus.packages = [ pkgs.flatpak ];
4028
41− systemd.packages = [ pkgs.flatpak pkgs.xdg-desktop-portal ] ++ cfg.extraPortals;
29+ systemd.packages = [ pkgs.flatpak ];
4230
4331 environment.profiles = [
4432 "$HOME/.local/share/flatpak/exports"
4533 "/var/lib/flatpak/exports"
4634 ];
47−
48− environment.variables = {
49− XDG_DESKTOP_PORTAL_PATH = map (p: "${p}/share/xdg-desktop-portal/portals") cfg.extraPortals;
50− };
5135 };
5236}
nixos/modules/services/x11/desktop-managers/gnome3.nix+1−1
@@ -154,7 +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− services.flatpak.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
157+ xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
158158
159159 # If gnome3 is installed, build vim for gtk3 too.
160160 nixpkgs.config.vim.gui = "gtk3";
nixos/modules/services/x11/desktop-managers/plasma5.nix+2
@@ -224,6 +224,8 @@ in
224224 security.pam.services.sddm.enableKwallet = true;
225225 security.pam.services.slim.enableKwallet = true;
226226
227+ xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-kde ];
228+
227229 # Update the start menu for each user that is currently logged in
228230 system.userActivationScripts.plasmaSetup = ''
229231 # The KDE icon cache is supposed to update itself