move mullvad-vpn to options/

This commit is contained in:
jacekpoz 2024-02-29 01:49:37 +01:00
parent 09bd2013ee
commit f186913663
No known key found for this signature in database
GPG key ID: 94E812A8B12AAE3C
7 changed files with 11 additions and 35 deletions

View file

@ -73,11 +73,6 @@
};
services = {
mullvad-vpn = {
enable = true;
package = pkgs.mullvad-vpn;
};
pcscd.enable = true;
udisks2.enable = true;

View file

@ -10,6 +10,7 @@ _: {
../../options/desktop/bluetooth.nix
../../options/desktop/dev/malloc-perturb.nix
../../options/desktop/fonts.nix
../../options/desktop/mullvad-vpn.nix
../../options/desktop/opentabletdriver.nix
../../options/desktop/power-supply.nix
../../options/desktop/suspend.nix

View file

@ -52,11 +52,6 @@
};
services = {
mullvad-vpn = {
enable = true;
package = pkgs.mullvad-vpn;
};
pcscd.enable = true;
udisks2.enable = true;

View file

@ -3,7 +3,6 @@ _: {
./configuration.nix
./fcitx5.nix
./hardware-configuration.nix
#./mullvad.nix
./profile.nix
./programs.nix
#./restic.nix

View file

@ -1,24 +0,0 @@
{
config,
pkgs,
...
}: {
environment.systemPackages = with pkgs; [ mullvad-vpn mullvad ];
networking.wireguard.enable = true;
networking.iproute2.enable = true;
services.mullvad-vpn = {
enable = true;
package = pkgs.mullvad-vpn;
};
systemd.services."mullvad-daemon".postStart = let
mullvad = config.services.mullvad-vpn.package;
in ''
while ! ${mullvad}/bin/mullvad status > /dev/null; do sleep 1; done
${mullvad}/bin/mullvad auto-connect set on
${mullvad}/bin/mullvad tunnel ipv6 set on
${mullvad}/bin/mullvad set default --block-ads --block-trackers --block-malware
'';
}

View file

@ -13,6 +13,7 @@ _: {
../../options/desktop/bluetooth.nix
../../options/desktop/dev/malloc-perturb.nix
../../options/desktop/fonts.nix
../../options/desktop/mullvad-vpn.nix
../../options/desktop/opentabletdriver.nix
../../options/desktop/power-supply.nix
../../options/desktop/suspend.nix

View file

@ -0,0 +1,9 @@
{
pkgs,
...
}: {
services.mullvad-vpn = {
enable = true;
package = pkgs.mullvad-vpn;
};
}