diff --git a/flake.nix b/flake.nix index 318350b..3d3bf15 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "BTCPay server, NBXplorer, Bitcoin Core, etc. as a NixOS system/container image"; inputs = { - nix-bitcoin.url = "github:fort-nix/nix-bitcoin/release-0.0.85"; # Pin to a stable release + nix-bitcoin.url = "github:fort-nix/nix-bitcoin/release"; nixpkgs.follows = "nix-bitcoin/nixpkgs"; nixos-generators.url = "github:nix-community/nixos-generators"; flake-utils.url = "github:numtide/flake-utils"; diff --git a/justfile b/justfile index 1bce4a2..74eac1d 100644 --- a/justfile +++ b/justfile @@ -1,5 +1,5 @@ # Default command: lists all available just commands -default: +_default: just --list # Rebuild the local NixOS system using a flake configuration @@ -16,22 +16,11 @@ deploy host: nixos-rebuild switch --fast --flake .#btc-pay-server --target-host {{host}} --build-host {{host}} --use-remote-sudo # Check the status of bitcoind and btcpayserver services on the remote host -# Usage: just status root@10.1.1.163 status host: ssh {{host}} "systemctl status bitcoind btcpayserver" -# Encrypt the secrets.yaml file in place using sops -encrypt-secrets: - sops -e -i secrets.yaml - -# Open the secrets.yaml file for editing with sops -edit-secrets: - sops secrets.yaml - -# Open a developer shell with the nix flake's environment -shell: - nix develop - -# Open a PostgreSQL client to the local nbxplorer database -psql: - psql -h localhost -U nbxplorer -d nbxplorer +# Forcefully overwrite local with remote branch +force-git-pull: + git fetch origin + git reset --hard origin/main + git clean -fd \ No newline at end of file