diff --git a/flake.nix b/flake.nix index 89858a2..1001f56 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,9 @@ inputs = { disko.url = "github:nix-community/disko"; - nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; + # nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; + # Waiting on https://github.com/NixOS/nixpkgs/pull/500538 + nixpkgs.url = "github:msyds/nixpkgs/fix-bepasty"; impermanence.url = "github:nix-community/impermanence"; home-manager.url = "github:nix-community/home-manager"; sops-nix.url = "github:Mic92/sops-nix"; diff --git a/modules/nixos/deertopia/bepasty.nix b/modules/nixos/deertopia/bepasty.nix index 9a62e3a..b796e9c 100644 --- a/modules/nixos/deertopia/bepasty.nix +++ b/modules/nixos/deertopia/bepasty.nix @@ -1,12 +1,10 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.sydnix.deertopia.bepasty; in { options = { sydnix.deertopia.bepasty = { - enable = mkEnableOption "Bepasty"; + enable = lib.mkEnableOption "Bepasty"; port = lib.mkOption { default = 22018; @@ -19,7 +17,7 @@ in { }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { sydnix.sops.secrets.bepasty-secret-key = {}; sydnix.sops.secrets.bepasty-secret-config = {};