diff --git a/configuration-nix-bitcoin.nix b/configuration-nix-bitcoin.nix
new file mode 100644
index 0000000..911cfce
--- /dev/null
+++ b/configuration-nix-bitcoin.nix
@@ -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?
+}
diff --git a/configuration.nix b/configuration.nix
index 3a362f0..fa782c0 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -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:
 }