diff --git a/hmModules/firefox/default.nix b/hmModules/firefox/default.nix index c8a7da4..5e7ac8a 100644 --- a/hmModules/firefox/default.nix +++ b/hmModules/firefox/default.nix @@ -11,11 +11,10 @@ cfg = { enableTridactylNative = true; enableBrowserpass = true; - enableFXCastBridge = true; + enableFXCastBridge = pkgs.system == "x86_64-linux"; }; }; extensions = with pkgs.nur.repos.rycee.firefox-addons; [ - https-everywhere privacy-badger ublock-origin tridactyl diff --git a/modules/nix/default.nix b/modules/nix/default.nix index e0408f1..5b093ba 100644 --- a/modules/nix/default.nix +++ b/modules/nix/default.nix @@ -39,11 +39,11 @@ optimise.automatic = true; }; - age.secrets.mlabs-cachix.file = ../../secrets/mlabs-cachix.age; + age.secrets.cachix.file = ../../secrets/cachix.age; system.activationScripts = { populate-netrc.text = '' cat < /etc/nix/netrc - machine mlabs.cachix.org login x password "$(cat ${config.age.secrets.mlabs-cachix.path})" + machine mlabs.cachix.org login x password "$(cat ${config.age.secrets.cachix.path})" EOF ''; }; diff --git a/secrets/cachix.age b/secrets/cachix.age new file mode 100644 index 0000000..e09ae5d Binary files /dev/null and b/secrets/cachix.age differ diff --git a/secrets/default.nix b/secrets/default.nix index 803273d..1e637d2 100644 --- a/secrets/default.nix +++ b/secrets/default.nix @@ -3,7 +3,7 @@ let agenix = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC5cEUx25pnZiH3eBrE2xNbJ92gJiKSznDUNRzcEL4ti6FlJm+75p4q0hgdqHwStR8+uCWBL6viVFCGutOVMFE5MX1Oc3A8fJdR6H9Rrwvk/1UQzqzc9tWxw1qPLKz+fnPDomjOvNofghCWQRwX3Xf1HnIqvRwELpNbR9i+/cHkDGzLJxkstbt4gol8ywMPkw02QdKk8s5MEd1vawxc+7Chs0JPW57RDqDYFErYys52JLeAViCBB9bofF+KT42LuRXKSjWlvCV9kR5TL49vUeBgzMQWMh++WQdN4m9lpqFqYyc75I49/E0HGf8LChDSS+hvRnb5MbtnVGjEA4WDHyldmJCvUNob5CUo4FjoSPRi+S/J3Ads8D4JVwaJOJEVqmMKEhiQ0Hzk4hwe3eV/VumlZj4U/QjaCrqqi4TW/iP0gNRfzcfiM+G/z5R7w1NMUpTX7oilyKjMQmGnXB857D3SSptS7dwh5OiKhVmrQMRCduooUsj236abqLU28K//RnxhOgh8kDGgoUHApnTiMZNKhgLiR42lKrubNcW1tAAqoNyFLMwwXeMLjh0iP1b5y8ntfNPNIcGb7vcwpS24z/aIjW7rQ4J7x5EBphHGhys6ne+irdhOM8c7kFr+c8+Q2oU0YAtFuMYztAFOHm1e20X00Zvys2nuee+hT9F1NungAQ=="; }; in { - "secrets/mlabs-cachix.age".publicKeys = [keys.agenix]; + "secrets/cachix.age".publicKeys = [keys.agenix]; "secrets/autistici-password.age".publicKeys = [keys.agenix]; "secrets/magit-forge-github-token.age".publicKeys = [keys.agenix]; } diff --git a/secrets/mlabs-cachix.age b/secrets/mlabs-cachix.age deleted file mode 100644 index 5f3f048..0000000 Binary files a/secrets/mlabs-cachix.age and /dev/null differ