diff --git a/configuration.nix b/configuration.nix index 8198f02..af2e13e 100755 --- a/configuration.nix +++ b/configuration.nix @@ -228,7 +228,7 @@ in ####### CADDY ####### services.caddy = { enable = true; - package = pkgs.caddy; + package = pkgs.stable.caddy; user = "caddy"; group = "root"; email = "${personalization.caddy_email_for_acme}"; diff --git a/flake.nix b/flake.nix index aff394e..442cb8a 100755 --- a/flake.nix +++ b/flake.nix @@ -15,18 +15,50 @@ bisq1.url = "github:emmanuelrosa/bisq-for-nixos"; + nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11"; + + btcpayserver-new.url = "github:Dreaming-Codes/nixpkgs/update-btcpayser"; + + + }; - outputs = { self, nixpkgs, nix-bitcoin, nixvim, agenix, bisq1, ... }: { + outputs = { self, nixpkgs, nix-bitcoin, nixvim, agenix, bisq1, nixpkgs-stable, btcpayserver-new, ... }: + + let + system = "x86_64-linux"; + + overlay-stable = final: prev: { + + stable = import nixpkgs-stable { + inherit system; + config.allowunfree = true; + + }; + + }; + + overlay-btcpaynew = final: prev: { + new-btcpaynew = import btcpayserver-new { + inhert system; + config.allowunfree = true; + }; + }; + in + + { - nixosConfigurations.nixos = nixpkgs.lib.nixosSystem { + nixosConfigurations.nixos = nixpkgs.lib.nixosSystem { - system ="x86_64-linux"; - + inherit systems; + + }; nixosModules.Sovran_SystemsOS = { pkgs, ... }: { + ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-stable overlay-btcpaynew ]; }) + imports = [ ./configuration.nix diff --git a/modules/bitcoinecosystem.nix b/modules/bitcoinecosystem.nix index 040f277..919c205 100755 --- a/modules/bitcoinecosystem.nix +++ b/modules/bitcoinecosystem.nix @@ -132,6 +132,7 @@ experimental-offers services.btcpayserver = { enable = true; + package = pkgs.new-btcpaynew.btcpayserver; }; services.btcpayserver.lightningBackend = "lnd";