diff options
-rw-r--r-- | makefu/1systems/darth/config.nix | 2 | ||||
-rw-r--r-- | makefu/1systems/wbob/config.nix | 11 | ||||
-rw-r--r-- | makefu/1systems/x/config.nix | 8 | ||||
-rw-r--r-- | makefu/2configs/virtualisation/docker.nix (renamed from makefu/2configs/docker.nix) | 0 | ||||
-rw-r--r-- | makefu/2configs/virtualisation/libvirt.nix (renamed from makefu/2configs/virtualization.nix) | 0 | ||||
-rw-r--r-- | makefu/2configs/virtualisation/virtualbox.nix (renamed from makefu/2configs/virtualization-virtualbox.nix) | 2 |
6 files changed, 13 insertions, 10 deletions
diff --git a/makefu/1systems/darth/config.nix b/makefu/1systems/darth/config.nix index e0f90b8dd..9dbe67429 100644 --- a/makefu/1systems/darth/config.nix +++ b/makefu/1systems/darth/config.nix @@ -15,7 +15,7 @@ in { <stockholm/makefu/2configs/zsh-user.nix> <stockholm/makefu/2configs/smart-monitor.nix> <stockholm/makefu/2configs/exim-retiolum.nix> - <stockholm/makefu/2configs/virtualization.nix> + <stockholm/makefu/2configs/virtualisation/libvirt.nix> <stockholm/makefu/2configs/tinc/retiolum.nix> <stockholm/makefu/2configs/share/temp-share-samba.nix> diff --git a/makefu/1systems/wbob/config.nix b/makefu/1systems/wbob/config.nix index d7f642360..b776b49d6 100644 --- a/makefu/1systems/wbob/config.nix +++ b/makefu/1systems/wbob/config.nix @@ -13,17 +13,18 @@ in { <stockholm/makefu/2configs/tools/core-gui.nix> <stockholm/makefu/2configs/tools/extra-gui.nix> <stockholm/makefu/2configs/tools/media.nix> - <stockholm/makefu/2configs/virtualization.nix> + <stockholm/makefu/2configs/virtualisation/libvirt.nix> <stockholm/makefu/2configs/tinc/retiolum.nix> <stockholm/makefu/2configs/mqtt.nix> <stockholm/makefu/2configs/deployment/led-fader.nix> # <stockholm/makefu/2configs/gui/wbob-kiosk.nix> <stockholm/makefu/2configs/stats/client.nix> - <stockholm/makefu/2configs/gui/studio-virtual.nix> - <stockholm/makefu/2configs/audio/jack-on-pulse.nix> - <stockholm/makefu/2configs/audio/realtime-audio.nix> - <stockholm/makefu/2configs/vncserver.nix> + # <stockholm/makefu/2configs/gui/studio-virtual.nix> + # <stockholm/makefu/2configs/audio/jack-on-pulse.nix> + # <stockholm/makefu/2configs/audio/realtime-audio.nix> + # <stockholm/makefu/2configs/vncserver.nix> + <stockholm/makefu/2configs/temp/rst-issue.nix> ]; krebs = { diff --git a/makefu/1systems/x/config.nix b/makefu/1systems/x/config.nix index 80c09df1c..969e78bee 100644 --- a/makefu/1systems/x/config.nix +++ b/makefu/1systems/x/config.nix @@ -19,6 +19,8 @@ with import <stockholm/lib>; # <stockholm/makefu/2configs/disable_v6.nix> # Testing + # <stockholm/makefu/2configs/deployment/gitlab.nix> + # <stockholm/makefu/2configs/torrent.nix> # <stockholm/makefu/2configs/lanparty/lancache.nix> # <stockholm/makefu/2configs/lanparty/lancache-dns.nix> @@ -37,9 +39,9 @@ with import <stockholm/lib>; <stockholm/makefu/2configs/task-client.nix> # Virtualization - <stockholm/makefu/2configs/virtualization.nix> - <stockholm/makefu/2configs/docker.nix> - <stockholm/makefu/2configs/virtualization-virtualbox.nix> + <stockholm/makefu/2configs/virtualisation/libvirt.nix> + <stockholm/makefu/2configs/virtualisation/docker.nix> + <stockholm/makefu/2configs/virtualisation/virtualbox.nix> # Services <stockholm/makefu/2configs/git/brain-retiolum.nix> diff --git a/makefu/2configs/docker.nix b/makefu/2configs/virtualisation/docker.nix index 98fd980cc..98fd980cc 100644 --- a/makefu/2configs/docker.nix +++ b/makefu/2configs/virtualisation/docker.nix diff --git a/makefu/2configs/virtualization.nix b/makefu/2configs/virtualisation/libvirt.nix index b90467ab8..b90467ab8 100644 --- a/makefu/2configs/virtualization.nix +++ b/makefu/2configs/virtualisation/libvirt.nix diff --git a/makefu/2configs/virtualization-virtualbox.nix b/makefu/2configs/virtualisation/virtualbox.nix index cde176bf3..30de6e44a 100644 --- a/makefu/2configs/virtualization-virtualbox.nix +++ b/makefu/2configs/virtualisation/virtualbox.nix @@ -14,7 +14,7 @@ let in { virtualisation.virtualbox.host.enable = true; nixpkgs.config.virtualbox.enableExtensionPack = true; - virtualization.virtualbox.host.enableHardening = false; + virtualisation.virtualbox.host.enableHardening = false; users.extraGroups.vboxusers.members = [ "${mainUser.name}" ]; nixpkgs.config.packageOverrides = super: { |