diff options
-rw-r--r-- | modules/nm-mullvad/default.nix | 1 | ||||
-rw-r--r-- | nixos/alpha/configuration.nix | 27 | ||||
-rw-r--r-- | nixos/default.nix | 2 | ||||
-rw-r--r-- | nixos/haruka/configuration.nix | 27 |
4 files changed, 1 insertions, 56 deletions
diff --git a/modules/nm-mullvad/default.nix b/modules/nm-mullvad/default.nix index 1473b79..d948f12 100644 --- a/modules/nm-mullvad/default.nix +++ b/modules/nm-mullvad/default.nix @@ -1,5 +1,6 @@ { config, pkgs, lib, ... }: +# WARN(DEPRECATED): This module is deprecated and is superseded by tailscale. let cfg = config.networking.networkmanager.nm-mullvad; diff --git a/nixos/alpha/configuration.nix b/nixos/alpha/configuration.nix index e1f0793..0005390 100644 --- a/nixos/alpha/configuration.nix +++ b/nixos/alpha/configuration.nix @@ -60,33 +60,6 @@ networking.useDHCP = false; networking.firewall.enable = true; - sops.secrets.mullvad-private-key = { }; - sops.secrets.mullvad-ipv4-address = { }; - sops.secrets.mullvad-ipv6-address = { }; - - networking.networkmanager.nm-mullvad = { - enable = true; - - listenPort = 51820; - openFirewall = true; - - autoConnect = { - enable = true; - profile = "jp-tyo-wg-001"; - }; - - availableServers = [ - "jp-tyo-wg-001" - "jp-osa-wg-002" - "se-mma-wg-001" - "se-sto-wg-002" - ]; - - privateKeyPath = config.sops.secrets.mullvad-private-key.path; - ipv4AddressPath = config.sops.secrets.mullvad-ipv4-address.path; - ipv6AddressPath = config.sops.secrets.mullvad-ipv6-address.path; - }; - programs.nm-applet.enable = true; i18n.defaultLocale = "en_US.UTF-8"; diff --git a/nixos/default.nix b/nixos/default.nix index df3bbf6..e19ae58 100644 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -10,7 +10,6 @@ ../modules/keyd-qol.nix ../modules/devkit.nix ../modules/trayscale.nix - ../modules/nm-mullvad inputs.sops-nix.nixosModules.sops inputs.impermanence.nixosModules.impermanence ]; @@ -35,7 +34,6 @@ ../modules/keyd-qol.nix ../modules/devkit.nix ../modules/trayscale.nix - ../modules/nm-mullvad inputs.sops-nix.nixosModules.sops inputs.impermanence.nixosModules.impermanence ]; diff --git a/nixos/haruka/configuration.nix b/nixos/haruka/configuration.nix index 2cdba6b..20c7e36 100644 --- a/nixos/haruka/configuration.nix +++ b/nixos/haruka/configuration.nix @@ -64,33 +64,6 @@ networking.networkmanager.enable = true; networking.firewall.enable = true; - sops.secrets.mullvad-private-key = { }; - sops.secrets.mullvad-ipv4-address = { }; - sops.secrets.mullvad-ipv6-address = { }; - - networking.networkmanager.nm-mullvad = { - enable = true; - - listenPort = 51820; - openFirewall = true; - - autoConnect = { - enable = true; - profile = "jp-tyo-wg-001"; - }; - - availableServers = [ - "jp-tyo-wg-001" - "jp-osa-wg-002" - "se-mma-wg-001" - "se-sto-wg-002" - ]; - - privateKeyPath = config.sops.secrets.mullvad-private-key.path; - ipv4AddressPath = config.sops.secrets.mullvad-ipv4-address.path; - ipv6AddressPath = config.sops.secrets.mullvad-ipv6-address.path; - }; - programs.nm-applet.enable = true; i18n.defaultLocale = "en_US.UTF-8"; |