From c534a49d67dc084939af99d78e8dd501b44bf4c4 Mon Sep 17 00:00:00 2001 From: Fuwn Date: Sun, 13 Oct 2024 08:54:53 +0000 Subject: refactor(flake): use system-specific nixpkgs everywhere --- flake.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/flake.nix b/flake.nix index 734ea11..b1f2940 100644 --- a/flake.nix +++ b/flake.nix @@ -48,25 +48,25 @@ { config, ... }: { options.services.pia = { - enable = nixpkgs.lib.mkOption { + enable = lib.mkOption { default = false; - type = nixpkgs.lib.types.bool; + type = lib.types.bool; }; authUserPass = { - username = nixpkgs.lib.mkOption { + username = lib.mkOption { default = false; - type = nixpkgs.lib.types.str; + type = lib.types.str; }; - password = nixpkgs.lib.mkOption { + password = lib.mkOption { default = false; - type = nixpkgs.lib.types.str; + type = lib.types.str; }; }; }; - config = nixpkgs.lib.mkIf config.services.pia.enable { + config = lib.mkIf config.services.pia.enable { environment.systemPackages = let piaPackages = self.packages.${system}; @@ -80,7 +80,7 @@ services.openvpn.servers = let - resources = nixpkgs.legacyPackages.${system}.fetchzip { + resources = pkgs.fetchzip { name = "pia-vpn-config"; url = "https://www.privateinternetaccess.com/openvpn/openvpn.zip"; sha256 = "ZA8RS6eIjMVQfBt+9hYyhaq8LByy5oJaO9Ed+x8KtW8="; -- cgit v1.2.3