From c77b57313c0f4b085d27d326abb89e68b57adbe9 Mon Sep 17 00:00:00 2001 From: Nathan Reiner Date: Sat, 21 Sep 2024 12:56:30 +0200 Subject: update webtray --- common/default.nix | 11 +++++++++++ common/home/default.nix | 8 +++++--- common/services/default.nix | 5 ++++- flake.lock | 14 +++++++------- 4 files changed, 27 insertions(+), 11 deletions(-) diff --git a/common/default.nix b/common/default.nix index 8b21089..8baaf5c 100644 --- a/common/default.nix +++ b/common/default.nix @@ -51,6 +51,17 @@ hardware.bluetooth.enable = true; + xdg.portal = { + enable = true; + config = { + common = { + default = [ "hyprland" ]; + }; + }; + configPackages = [ pkgs.xdg-desktop-portal-hyprland ]; + extraPortals = [ pkgs.xdg-desktop-portal-hyprland ]; + }; + nix.settings.experimental-features = [ "nix-command" "flakes" diff --git a/common/home/default.nix b/common/home/default.nix index e4780d6..139b3ec 100644 --- a/common/home/default.nix +++ b/common/home/default.nix @@ -118,11 +118,11 @@ in xdgOpenUsePortal = true; config = { common = { - default = [ "wlr" ]; + default = [ "hyprland" ]; }; }; - configPackages = [ pkgs.xdg-desktop-portal-wlr ]; - extraPortals = [ pkgs.xdg-desktop-portal-wlr ]; + configPackages = [ pkgs.xdg-desktop-portal-hyprland ]; + extraPortals = [ pkgs.xdg-desktop-portal-hyprland ]; }; userDirs = { @@ -142,6 +142,8 @@ in }; + useGlobalPkgs = true; + useUserPackages = true; backupFileExtension = "backup"; sharedModules = [ nixvim.homeManagerModules.nixvim ]; } diff --git a/common/services/default.nix b/common/services/default.nix index d8a2a4d..bc1c9ec 100644 --- a/common/services/default.nix +++ b/common/services/default.nix @@ -1,6 +1,9 @@ { pkgs, ... }: let - services = [ "pipewire" ]; + services = [ + "pipewire" + "greetd" + ]; in builtins.listToAttrs ( map (n: { diff --git a/flake.lock b/flake.lock index 90eb691..4cef719 100644 --- a/flake.lock +++ b/flake.lock @@ -191,11 +191,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1726688310, - "narHash": "sha256-Xc9lEtentPCEtxc/F1e6jIZsd4MPDYv4Kugl9WtXlz0=", + "lastModified": 1726838390, + "narHash": "sha256-NmcVhGElxDbmEWzgXsyAjlRhUus/nEqPC5So7BOJLUM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "dbebdd67a6006bb145d98c8debf9140ac7e651d0", + "rev": "944b2aea7f0a2d7c79f72468106bc5510cbf5101", "type": "github" }, "original": { @@ -324,11 +324,11 @@ ] }, "locked": { - "lastModified": 1726901476, - "narHash": "sha256-6Mdb+x9dQgMVipHTmVqGdKdkLzWgarHV4IHoHlZE+AE=", + "lastModified": 1726916137, + "narHash": "sha256-isknI2AkrBdV6Bkbm/ytbBYbm0motJvB9wPqT1sSO1k=", "ref": "refs/heads/master", - "rev": "121297159b40b9cd8d5016893e83e9f01d0795ec", - "revCount": 32, + "rev": "21afec7d459855808444ef8157a2249b2fb2782c", + "revCount": 33, "type": "git", "url": "https://git.nathanreiner.xyz/webtray" }, -- cgit v1.2.3-70-g09d2