diff options
| -rw-r--r-- | flake.nix | 8 | ||||
| -rw-r--r-- | flake/default.nix | 6 | ||||
| -rw-r--r-- | sys/svcs/xdg/default.nix | 15 |
3 files changed, 22 insertions, 7 deletions
@@ -3,8 +3,8 @@ inputs = { # base - # nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - nixpkgs.url = "github:soispha/nixpkgs/tfc-unstable"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs-tfc.url = "github:soispha/nixpkgs/add-termfilechooser"; nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-23.05"; # inputs for following @@ -237,6 +237,7 @@ # core self, nixpkgs, + nixpkgs-tfc, # modules home-manager, nixos-generators, @@ -268,8 +269,10 @@ config = self.nixosConfigurations.tiamat.config.home-manager.users.soispha; overlays = []; }); + # FIXME: this `nixpkgs` misses the configs applied to the other one nixpkgs_as_input = nixpkgs; + nixpkgs_tfc = nixpkgs-tfc; outputs = import ./flake { inherit # core @@ -278,6 +281,7 @@ system sysLib nixpkgs_as_input + nixpkgs_tfc # modules home-manager diff --git a/flake/default.nix b/flake/default.nix index 709b457b..d9643559 100644 --- a/flake/default.nix +++ b/flake/default.nix @@ -5,6 +5,7 @@ system, sysLib, nixpkgs_as_input, + nixpkgs_tfc, # modules home-manager, nixVim, @@ -50,6 +51,8 @@ ; }; defaultModules = [ + "${nixpkgs_tfc}/nixos/modules/config/xdg/portals/termfilechooser.nix" + agenix.nixosModules.default disko.nixosModules.default @@ -73,6 +76,9 @@ nixpkgs_as_input self + # extra package sources + + nixpkgs_tfc ; }; treefmtEval = treefmt-nix.lib.evalModule pkgs ( diff --git a/sys/svcs/xdg/default.nix b/sys/svcs/xdg/default.nix index 3229b97c..c3df9f60 100644 --- a/sys/svcs/xdg/default.nix +++ b/sys/svcs/xdg/default.nix @@ -1,8 +1,12 @@ { pkgs, + nixpkgs_tfc, sysLib, + system, ... -}: { +}: let + pkgs_tfc = nixpkgs_tfc.legacyPackages."${system}"; +in { services.dbus.enable = true; xdg = { portal = { @@ -10,6 +14,7 @@ termfilechooser = { enable = true; logLevel = "TRACE"; + package = pkgs_tfc.xdg-desktop-portal-termfilechooser; settings = { filechooser = { default_dir = "/tmp"; @@ -42,10 +47,10 @@ "org.freedesktop.impl.portal.FileChooser" = ["termfilechooser"]; }; }; - extraPortals = with pkgs; [ - xdg-desktop-portal-gtk - xdg-desktop-portal-wlr - xdg-desktop-portal-termfilechooser + extraPortals = [ + pkgs.xdg-desktop-portal-gtk + pkgs.xdg-desktop-portal-wlr + pkgs_tfc.xdg-desktop-portal-termfilechooser ]; }; }; |