browserpass: use attribute set to define files

To avoid warning message concerning deprecation of the `loaOf` type.
This commit is contained in:
Robert Helgesson 2020-01-11 19:26:32 +01:00
parent 00e26ceffe
commit 8ace1ab1b0
No known key found for this signature in database
GPG key ID: 36BDAA14C2797E89

View file

@ -24,57 +24,58 @@ in {
}; };
config = mkIf config.programs.browserpass.enable { config = mkIf config.programs.browserpass.enable {
home.file = builtins.concatLists (with pkgs.stdenv; map (x: home.file =
if x == "chrome" then foldl' (a: b: a // b) {}
let dir = if isDarwin (concatMap (x: with pkgs.stdenv;
then "Library/Application Support/Google/Chrome/NativeMessagingHosts" if x == "chrome" then
else ".config/google-chrome/NativeMessagingHosts"; let dir = if isDarwin
in [ then "Library/Application Support/Google/Chrome/NativeMessagingHosts"
{ else ".config/google-chrome/NativeMessagingHosts";
target = "${dir}/com.github.browserpass.native.json"; in [
source = "${pkgs.browserpass}/lib/browserpass/hosts/chromium/com.github.browserpass.native.json"; {
} "${dir}/com.github.browserpass.native.json".source =
{ "${pkgs.browserpass}/lib/browserpass/hosts/chromium/com.github.browserpass.native.json";
target = "${dir}/../policies/managed/com.github.browserpass.native.json"; "${dir}/../policies/managed/com.github.browserpass.native.json".source =
source = "${pkgs.browserpass}/lib/browserpass/policies/chromium/com.github.browserpass.native.json"; "${pkgs.browserpass}/lib/browserpass/policies/chromium/com.github.browserpass.native.json";
} }
] ]
else if x == "chromium" then else if x == "chromium" then
let dir = if isDarwin let dir = if isDarwin
then "Library/Application Support/Chromium/NativeMessagingHosts" then "Library/Application Support/Chromium/NativeMessagingHosts"
else ".config/chromium/NativeMessagingHosts"; else ".config/chromium/NativeMessagingHosts";
in [ in [
{ {
target = "${dir}/com.github.browserpass.native.json"; "${dir}/com.github.browserpass.native.json".source =
source = "${pkgs.browserpass}/lib/browserpass/hosts/chromium/com.github.browserpass.native.json"; "${pkgs.browserpass}/lib/browserpass/hosts/chromium/com.github.browserpass.native.json";
} }
{ {
target = "${dir}/../policies/managed/com.github.browserpass.native.json"; "${dir}/../policies/managed/com.github.browserpass.native.json".source =
source = "${pkgs.browserpass}/lib/browserpass/policies/chromium/com.github.browserpass.native.json"; "${pkgs.browserpass}/lib/browserpass/policies/chromium/com.github.browserpass.native.json";
} }
] ]
else if x == "firefox" then else if x == "firefox" then
[ { let dir = if isDarwin
target = (if isDarwin
then "Library/Application Support/Mozilla/NativeMessagingHosts" then "Library/Application Support/Mozilla/NativeMessagingHosts"
else ".mozilla/native-messaging-hosts") else ".mozilla/native-messaging-hosts";
+ "/com.github.browserpass.native.json"; in [
source = "${pkgs.browserpass}/lib/browserpass/hosts/firefox/com.github.browserpass.native.json"; {
} ] "${dir}/com.github.browserpass.native.json".source =
else if x == "vivaldi" then "${pkgs.browserpass}/lib/browserpass/hosts/firefox/com.github.browserpass.native.json";
let dir = if isDarwin }
then "Library/Application Support/Vivaldi/NativeMessagingHosts" ]
else ".config/vivaldi/NativeMessagingHosts"; else if x == "vivaldi" then
in [ let dir = if isDarwin
{ then "Library/Application Support/Vivaldi/NativeMessagingHosts"
target = "${dir}/com.github.browserpass.native.json"; else ".config/vivaldi/NativeMessagingHosts";
source = "${pkgs.browserpass}/lib/browserpass/hosts/chromium/com.github.browserpass.native.json"; in [
} {
{ "${dir}/com.github.browserpass.native.json".source =
target = "${dir}/../policies/managed/com.github.browserpass.native.json"; "${pkgs.browserpass}/lib/browserpass/hosts/chromium/com.github.browserpass.native.json";
source = "${pkgs.browserpass}/lib/browserpass/policies/chromium/com.github.browserpass.native.json"; "${dir}/../policies/managed/com.github.browserpass.native.json".source =
} "${pkgs.browserpass}/lib/browserpass/policies/chromium/com.github.browserpass.native.json";
] }
else throw "unknown browser ${x}") config.programs.browserpass.browsers); ]
else throw "unknown browser ${x}") config.programs.browserpass.browsers
);
}; };
} }