movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00
Code Activity

nixos/desktop-managers: Add xdg.portal.config or xdg.portal.configPackages

Browse source 
See the changes in x-d-p 1.17 for details.
This commit is contained in:
Bobby Rong 2023-09-19 21:48:58 +08:00 • committed by Jan Tojnar
parent 2cea4367b1
commit 39a1279b4d
9 changed files with 18 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
nixos/modules/services/x11/desktop-managers/budgie.nix
View file

@ -202,6 +202,7 @@ in {
xdg.portal.extraPortals = with pkgs; [ xdg.portal.extraPortals = with pkgs; [
xdg-desktop-portal-gtk # provides a XDG Portals implementation. xdg-desktop-portal-gtk # provides a XDG Portals implementation.
]; ];
xdg.portal.configPackages = mkDefault [ pkgs.budgie.budgie-desktop ];
services.geoclue2.enable = mkDefault true; # for BCC's Privacy > Location Services panel. services.geoclue2.enable = mkDefault true; # for BCC's Privacy > Location Services panel.
services.upower.enable = config.powerManagement.enable; # for Budgie's Status Indicator and BCC's Power panel. services.upower.enable = config.powerManagement.enable; # for Budgie's Status Indicator and BCC's Power panel.

3
nixos/modules/services/x11/desktop-managers/cinnamon.nix
View file

@ -200,6 +200,9 @@ in
}) })
]; ];
# https://salsa.debian.org/cinnamon-team/cinnamon/-/commit/f87c64f8d35ba406eb11ad442989a0716f6620cf#
xdg.portal.config.x-cinnamon.default = mkDefault [ "xapp" "gtk" ];
# Override GSettings schemas # Override GSettings schemas
environment.sessionVariables.NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-overrides}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas"; environment.sessionVariables.NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-overrides}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas";

3
nixos/modules/services/x11/desktop-managers/deepin.nix
View file

@ -78,6 +78,9 @@ in
}) })
]; ];
# https://github.com/NixOS/nixpkgs/pull/247766#issuecomment-1722839259
xdg.portal.config.deepin.default = mkDefault [ "gtk" ];
environment.sessionVariables = { environment.sessionVariables = {
NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-overrides}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas"; NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-overrides}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas";
DDE_POLKIT_AGENT_PLUGINS_DIRS = [ "${pkgs.deepin.dpa-ext-gnomekeyring}/lib/polkit-1-dde/plugins" ]; DDE_POLKIT_AGENT_PLUGINS_DIRS = [ "${pkgs.deepin.dpa-ext-gnomekeyring}/lib/polkit-1-dde/plugins" ];

1
nixos/modules/services/x11/desktop-managers/gnome.nix
View file

@ -353,6 +353,7 @@ in
buildPortalsInGnome = false; buildPortalsInGnome = false;
}) })
]; ];
xdg.portal.configPackages = mkDefault [ pkgs.gnome.gnome-session ];
networking.networkmanager.enable = mkDefault true; networking.networkmanager.enable = mkDefault true;

3
nixos/modules/services/x11/desktop-managers/lxqt.nix
View file

@ -70,6 +70,9 @@ in
services.xserver.libinput.enable = mkDefault true; services.xserver.libinput.enable = mkDefault true;
xdg.portal.lxqt.enable = true; xdg.portal.lxqt.enable = true;
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1050804
xdg.portal.config.lxqt.default = mkDefault [ "lxqt" "gtk" ];
}; };
} }

2
nixos/modules/services/x11/desktop-managers/mate.nix
View file

@ -77,6 +77,8 @@ in
security.pam.services.mate-screensaver.unixAuth = true; security.pam.services.mate-screensaver.unixAuth = true;
xdg.portal.configPackages = mkDefault [ pkgs.mate.mate-desktop ];
environment.pathsToLink = [ "/share" ]; environment.pathsToLink = [ "/share" ];
}; };

5
nixos/modules/services/x11/desktop-managers/pantheon.nix
View file

@ -229,9 +229,6 @@ in
xdg.portal.enable = true; xdg.portal.enable = true;
xdg.portal.extraPortals = [ xdg.portal.extraPortals = [
# Some Pantheon apps enforce portal usage, we need this for e.g. notifications.
# Currently we have buildPortalsInGnome enabled, if you run into issues related
# to https://github.com/flatpak/xdg-desktop-portal/issues/656 please report to us.
pkgs.xdg-desktop-portal-gtk pkgs.xdg-desktop-portal-gtk
] ++ (with pkgs.pantheon; [ ] ++ (with pkgs.pantheon; [
elementary-files elementary-files
@ -239,6 +236,8 @@ in
xdg-desktop-portal-pantheon xdg-desktop-portal-pantheon
]); ]);
xdg.portal.configPackages = mkDefault [ pkgs.pantheon.elementary-default-settings ];
# Override GSettings schemas # Override GSettings schemas
environment.sessionVariables.NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-desktop-schemas}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas"; environment.sessionVariables.NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-desktop-schemas}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas";

1
nixos/modules/services/x11/desktop-managers/plasma5.nix
View file

@ -372,6 +372,7 @@ in
xdg.portal.enable = true; xdg.portal.enable = true;
xdg.portal.extraPortals = [ plasma5.xdg-desktop-portal-kde ]; xdg.portal.extraPortals = [ plasma5.xdg-desktop-portal-kde ];
xdg.portal.configPackages = mkDefault [ plasma5.xdg-desktop-portal-kde ];
# xdg-desktop-portal-kde expects PipeWire to be running. # xdg-desktop-portal-kde expects PipeWire to be running.
# This does not, by default, replace PulseAudio. # This does not, by default, replace PulseAudio.
services.pipewire.enable = mkDefault true; services.pipewire.enable = mkDefault true;

2
nixos/modules/services/x11/desktop-managers/xfce.nix
View file

@ -178,5 +178,7 @@ in
]) excludePackages; ]) excludePackages;
security.pam.services.xfce4-screensaver.unixAuth = cfg.enableScreensaver; security.pam.services.xfce4-screensaver.unixAuth = cfg.enableScreensaver;
xdg.portal.configPackages = mkDefault [ pkgs.xfce.xfce4-session ];
}; };
} }