diff --git a/configs/docker.nix b/configs/docker.nix new file mode 100644 index 0000000..8e56881 --- /dev/null +++ b/configs/docker.nix @@ -0,0 +1,7 @@ +{ config, pkgs, lib, ... }: + +{ + virtualisation = { + docker.enable = true; + }; +} diff --git a/configs/virtualisation.nix b/configs/libvirt.nix similarity index 87% rename from configs/virtualisation.nix rename to configs/libvirt.nix index dd846c8..016918e 100644 --- a/configs/virtualisation.nix +++ b/configs/libvirt.nix @@ -2,7 +2,6 @@ { virtualisation = { - docker.enable = true; libvirtd = { enable = true; qemuPackage = pkgs.qemu_kvm; diff --git a/machine/desktop.nix b/machine/desktop.nix index 6058d81..3e6695e 100644 --- a/machine/desktop.nix +++ b/machine/desktop.nix @@ -8,7 +8,8 @@ in [ # Include the results of the hardware scan. /etc/nixos/hardware-configuration.nix ../configs/gui.nix - ../configs/virtualisation.nix + ../configs/docker.nix + ../configs/libvirt.nix ../configs/common.nix ../configs/user-gui.nix ../configs/user.nix diff --git a/machine/homeserver.nix b/machine/homeserver.nix index 68db217..5965bcf 100644 --- a/machine/homeserver.nix +++ b/machine/homeserver.nix @@ -5,7 +5,8 @@ [ # Include the results of the hardware scan. /etc/nixos/hardware-configuration.nix ../configs/common.nix - ../configs/virtualisation.nix + ../configs/docker.nix + ../configs/libvirt.nix ../configs/user.nix ]; diff --git a/machine/mini.nix b/machine/mini.nix index 4cf477e..587d07a 100644 --- a/machine/mini.nix +++ b/machine/mini.nix @@ -4,7 +4,7 @@ imports = [ # Include the results of the hardware scan. /etc/nixos/hardware-configuration.nix - ../configs/virtualisation.nix + ../configs/docker.nix ../configs/common.nix ../configs/user.nix ]; diff --git a/machine/thinkpad.nix b/machine/thinkpad.nix index c19c574..25d0417 100644 --- a/machine/thinkpad.nix +++ b/machine/thinkpad.nix @@ -18,7 +18,8 @@ in /etc/nixos/hardware-configuration.nix ../configs/gui.nix - ../configs/virtualisation.nix + ../configs/docker.nix + ../configs/libvirt.nix ../configs/common.nix ../configs/user.nix ../configs/user-gui.nix diff --git a/machine/vps.nix b/machine/vps.nix index f878fd4..f22c507 100644 --- a/machine/vps.nix +++ b/machine/vps.nix @@ -5,7 +5,7 @@ [ # Include the results of the hardware scan. /etc/nixos/hardware-configuration.nix ../configs/common.nix - ../configs/virtualisation.nix + ../configs/docker.nix ../configs/user.nix ];