refactor(xdg.portal): move all xdg.portal options -> system

This commit is contained in:
ooks-io 2024-05-19 17:12:01 +12:00
parent 1d70d4342e
commit 3ab9bec923
4 changed files with 1 additions and 8 deletions

View file

@ -23,7 +23,6 @@ in
}; };
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
xdg.portal.enable = true;
home.sessionVariables = { home.sessionVariables = {
CLUTTER_BACKEND = "wayland"; CLUTTER_BACKEND = "wayland";
NIXOS_OZONE_WL = "1"; NIXOS_OZONE_WL = "1";

View file

@ -12,10 +12,6 @@ in
]; ];
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
xdg.portal = {
extraPortals = [ inputs.xdg-portal-hyprland.packages.${pkgs.system}.default ];
};
home.packages = [ home.packages = [
pkgs.hyprpicker pkgs.hyprpicker
hyprvolume hyprvolume

View file

@ -34,8 +34,6 @@ in
"Net/IconThemeName" = gtk.iconTheme.name; "Net/IconThemeName" = gtk.iconTheme.name;
}; };
}; };
xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
}); });
} }

View file

@ -2,7 +2,6 @@
let let
inherit (lib) mkIf; inherit (lib) mkIf;
inherit (builtins) elem;
isx86Linux = pkgs: with pkgs.stdenv; hostPlatform.isLinux && hostPlatform.isx86; isx86Linux = pkgs: with pkgs.stdenv; hostPlatform.isLinux && hostPlatform.isx86;
host = config.systemModules.host; host = config.systemModules.host;
in in
@ -18,6 +17,7 @@ in
}; };
xdg.portal = { xdg.portal = {
enable = true; enable = true;
xdgOpenUsePortal = true;
extraPortals = [ extraPortals = [
pkgs.xdg-desktop-portal-gtk pkgs.xdg-desktop-portal-gtk
]; ];