diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/default.nix | 27 | ||||
| -rw-r--r-- | lib/files.nix | 6 |
2 files changed, 29 insertions, 4 deletions
diff --git a/lib/default.nix b/lib/default.nix index 62efd3f..7fa783b 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -1,9 +1,11 @@ -{...} @ inputs: let +{lib, ...} @ inputs: let callLibs = file: import file inputs; files = callLibs ./files.nix; in { inherit (files) getFiles certs sshKeys gpgKeys; + # set of options we want to copy from a system + # config to home manager homeConfig = config: { inherit @@ -40,6 +42,29 @@ in { # Packages extraPackages ; + # fix xdg + xdg.portal = { + inherit + (config.xdg.portal) + enable + xdgOpenUsePortal + extraPortals + config + ; + }; + # bring over nix options + nix = lib.mkForce { + inherit + (config.nix) + buildMachines + checkConfig + distributedBuilds + gc + package + registry + settings + ; + }; } // config.extraHome; } diff --git a/lib/files.nix b/lib/files.nix index 156ec7c..960d1d0 100644 --- a/lib/files.nix +++ b/lib/files.nix @@ -1,7 +1,7 @@ {lib, ...}: let # gets list of files from a directory getFiles = folder: - lib.attrsets.mapAttrsToList (name: type: "${folder}/${name}") (builtins.readDir folder); + lib.attrsets.mapAttrsToList (name: _: "${folder}/${name}") (builtins.readDir folder); # gets custom set of root certs certs = getFiles ../files/certs; @@ -9,12 +9,12 @@ # set of ssh keys sshKeys = builtins.filter - (path: lib.strings.hasSuffix "pub" path) (getFiles ../files/keys); + (filePath: lib.strings.hasSuffix "pub" filePath) (getFiles ../files/keys); # set of gpg keys gpgKeys = builtins.filter - (path: lib.strings.hasSuffix "asc" path) (getFiles ../files/keys); + (filePath: lib.strings.hasSuffix "asc" filePath) (getFiles ../files/keys); in { inherit getFiles; inherit certs; |