From 099bcb150b60d8d2bfe724dd12001cf81cf78a1f Mon Sep 17 00:00:00 2001 From: Bun Date: Fri, 16 May 2025 11:29:37 -0400 Subject: [PATCH] Move xdg portals into home-manager --- modules/home/wms/programs/default.nix | 1 + modules/home/wms/programs/portals/default.nix | 12 ++++++++++++ modules/system/services/general/default.nix | 1 - modules/system/services/general/portals/default.nix | 7 ------- 4 files changed, 13 insertions(+), 8 deletions(-) create mode 100644 modules/home/wms/programs/portals/default.nix delete mode 100644 modules/system/services/general/portals/default.nix diff --git a/modules/home/wms/programs/default.nix b/modules/home/wms/programs/default.nix index 4828dc84..498b1e3f 100644 --- a/modules/home/wms/programs/default.nix +++ b/modules/home/wms/programs/default.nix @@ -4,6 +4,7 @@ ./clipman ./kanshi ./mako + ./portals ./rofi ./swayidle ./swaylock diff --git a/modules/home/wms/programs/portals/default.nix b/modules/home/wms/programs/portals/default.nix new file mode 100644 index 00000000..b54c9d9f --- /dev/null +++ b/modules/home/wms/programs/portals/default.nix @@ -0,0 +1,12 @@ +{ config, pkgs, ... }: +{ + xdg.portal = { + enable = config.home.desktop.enable; + configPackages = config.xdg.portal.extraPortals; + xdgOpenUsePortal = true; + extraPortals = with pkgs; [ + xdg-desktop-portal-gtk + xdg-desktop-portal-wlr + ]; + }; +} diff --git a/modules/system/services/general/default.nix b/modules/system/services/general/default.nix index 9612da44..96b68f06 100644 --- a/modules/system/services/general/default.nix +++ b/modules/system/services/general/default.nix @@ -4,7 +4,6 @@ ./displaymanager ./keyd ./libvirtd - ./portals ./snowflake ./ssh ./tlp diff --git a/modules/system/services/general/portals/default.nix b/modules/system/services/general/portals/default.nix deleted file mode 100644 index 4bdecd68..00000000 --- a/modules/system/services/general/portals/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ config, lib, pkgs, ... }: -{ - xdg.portal.extraPortals = with pkgs; lib.mkIf config.system.desktop.enable [ - xdg-desktop-portal-gnome - xdg-desktop-portal-wlr - ]; -}