From c6da1a7763233b14be00e6dde8fded383491831a Mon Sep 17 00:00:00 2001 From: Noa Aarts Date: Thu, 6 Jun 2024 12:50:28 +0200 Subject: [PATCH] fix the portal thingy --- flake.nix | 3 ++- hosts/default/configuration.nix | 3 +++ modules/hyprland.nix | 9 ++++++++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 81d51bc..6bc15f6 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,8 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable-small"; - # nixpkgs.url = "github:nixos/nixpkgs/master"; + + # nixpkgs.url = "git+file:///home/noa/Documents/programming/nixpkgs?rev=0b0b7cefcce7f67bd56e2903be34db579b22528a"; # nixpkgs.url = "github:NixOS/nixpkgs/d8e0944e6d2ce0f326040e654c07a410e2617d47"; diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix index 9b80be3..d82d3af 100644 --- a/hosts/default/configuration.nix +++ b/hosts/default/configuration.nix @@ -146,6 +146,9 @@ # enable = true; # enableSSHSupport = true; # }; + + xdg.portal.enable = true; + programs = { zsh.enable = true; diff --git a/modules/hyprland.nix b/modules/hyprland.nix index 988c079..44fce76 100644 --- a/modules/hyprland.nix +++ b/modules/hyprland.nix @@ -18,6 +18,10 @@ in wallpapers.automapaper = { enable = lib.mkEnableOption "enable automapaper"; }; + portalPackage = lib.mkOption { + type = lib.types.package; + default = pkgs.xdg-desktop-portal-hyprland; + }; }; imports = [ @@ -54,7 +58,10 @@ in ]; - xdg.portal.configPackages = [ cfg.package ]; + xdg.portal = { + extraPortals = [ cfg.portalPackage ]; + config.common.default = "*"; + }; services.playerctld.enable = true; wayland.windowManager.hyprland = {