From 168492c26bf762be4412249b9f22e85e7c71b44c Mon Sep 17 00:00:00 2001 From: smayzy Date: Thu, 10 Jul 2025 16:20:06 +0200 Subject: [PATCH] mv mullvad to module --- hosts/common/common.nix | 1 - modules/nix/default.nix | 1 + modules/nix/groups/desktop.nix | 1 + modules/nix/groups/laptop.nix | 1 + modules/nix/vpn/default.nix | 6 ++++++ modules/nix/vpn/mullvad.nix | 18 ++++++++++++++++++ 6 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 modules/nix/vpn/default.nix create mode 100644 modules/nix/vpn/mullvad.nix diff --git a/hosts/common/common.nix b/hosts/common/common.nix index f70f4fe..15c66e1 100644 --- a/hosts/common/common.nix +++ b/hosts/common/common.nix @@ -27,7 +27,6 @@ calibre loupe gimp3 - mullvad-vpn base16-schemes tor wireshark diff --git a/modules/nix/default.nix b/modules/nix/default.nix index f37f763..c0b81a3 100644 --- a/modules/nix/default.nix +++ b/modules/nix/default.nix @@ -15,6 +15,7 @@ ./office ./comm ./displaymanager + ./vpn ]; # Timzone and locales (same for all machines so I put it here) diff --git a/modules/nix/groups/desktop.nix b/modules/nix/groups/desktop.nix index 1f4472e..1a154c1 100644 --- a/modules/nix/groups/desktop.nix +++ b/modules/nix/groups/desktop.nix @@ -23,6 +23,7 @@ in element.enable = true; webcord.enable = true; sddm.enable = true; + mullvad.enable = true; }; }; } diff --git a/modules/nix/groups/laptop.nix b/modules/nix/groups/laptop.nix index 6d513e3..d56ee83 100644 --- a/modules/nix/groups/laptop.nix +++ b/modules/nix/groups/laptop.nix @@ -23,6 +23,7 @@ in webcord.enable = true; element.enable = true; sddm.enable = true; + mullvad.enable = true; }; services.logind.lidSwitch = "ignore"; }; diff --git a/modules/nix/vpn/default.nix b/modules/nix/vpn/default.nix new file mode 100644 index 0000000..d3576a2 --- /dev/null +++ b/modules/nix/vpn/default.nix @@ -0,0 +1,6 @@ +{ lib, config, pkgs, ... }: +{ + imports = [ + ./mullvad.nix + ]; +} diff --git a/modules/nix/vpn/mullvad.nix b/modules/nix/vpn/mullvad.nix new file mode 100644 index 0000000..4fff483 --- /dev/null +++ b/modules/nix/vpn/mullvad.nix @@ -0,0 +1,18 @@ +{ lib, config, pkgs, ... }: +let + inherit (lib) mkIf mkOption types; +in +{ + options.smayzy.mullvad.enable = mkOption { + type = types.bool; + default = false; + description = "mullvad's software"; + }; + + config = mkIf config.smayzy.mullvad.enable { + environment.systemPackages = with pkgs; [ + mullvad-vpn + mullvad-browser + ]; + }; +}