Merge branch 'master' of github.com:jonasnick/nix-bitcoin

This commit is contained in:
Jonas Nick 2018-12-10 23:25:08 +00:00
commit 93b1ad2fc9
2 changed files with 44 additions and 35 deletions

View File

@ -0,0 +1,38 @@
{ config, pkgs, ... }:
let
# Custom packages
nodeinfo = (import pkgs/nodeinfo.nix);
lightning-charge = import pkgs/lightning-charge.nix { inherit pkgs; };
nanopos = import pkgs/nanopos.nix { inherit pkgs; };
spark-wallet = import pkgs/spark-wallet.nix { inherit pkgs; };
liquidd = import pkgs/liquidd.nix;
in {
imports =
[
./modules/nixbitcoin.nix
];
# Turn off binary cache by setting binaryCaches to empty list
# nix.binaryCaches = [];
nixpkgs.config.packageOverrides = pkgs: {
inherit nodeinfo;
inherit lightning-charge;
inherit nanopos;
inherit spark-wallet;
liquidd = (pkgs.callPackage liquidd { });
};
time.timeZone = "UTC";
services.openssh.enable = true;
networking.firewall.enable = true;
environment.systemPackages = with pkgs; [
vim tmux
htop
];
# This value determines the NixOS release with which your system is to be
# compatible, in order to avoid breaking some software such as database
# servers. You should change this only after NixOS release notes say you
# should.
system.stateVersion = "18.09"; # Did you read the comment?
}

View File

@ -3,46 +3,17 @@
# and in the NixOS manual (accessible by running nixos-help).
{ config, pkgs, ... }:
let
# Custom packages
nodeinfo = (import pkgs/nodeinfo.nix);
lightning-charge = import pkgs/lightning-charge.nix { inherit pkgs; };
nanopos = import pkgs/nanopos.nix { inherit pkgs; };
spark-wallet = import pkgs/spark-wallet.nix { inherit pkgs; };
liquidd = import pkgs/liquidd.nix;
in {
imports =
[
./modules/nixbitcoin.nix
];
# Turn off binary cache by setting binaryCaches to empty list
# nix.binaryCaches = [];
nixpkgs.config.packageOverrides = pkgs: {
inherit nodeinfo;
inherit lightning-charge;
inherit nanopos;
inherit spark-wallet;
liquidd = (pkgs.callPackage liquidd { });
};
{
services.nixbitcoin.enable = true;
# Install and use minimal or all modules
services.nixbitcoin.modules = "all";
# Regular nixos configuration
networking.hostName = "nix-bitcoin"; # Define your hostname.
time.timeZone = "UTC";
services.openssh.enable = true;
networking.firewall.enable = true;
environment.systemPackages = with pkgs; [
vim tmux
htop
imports = [
./configuration-nix-bitcoin.nix
#./hardware-configuration.nix
];
# This value determines the NixOS release with which your system is to be
# compatible, in order to avoid breaking some software such as database
# servers. You should change this only after NixOS release notes say you
# should.
system.stateVersion = "18.09"; # Did you read the comment?
# Add custom options options (like boot options) here:
}