Merge remote-tracking branch 'gum/master'

2 files changed, 29 insertions, 33 deletions

diff --git a/makefu/1systems/vbob.nix b/makefu/1systems/vbob.nix
index 7421125e4..b79ec64c0 100644
--- a/makefu/1systems/vbob.nix
+++ b/makefu/1systems/vbob.nix
@@ -9,13 +9,21 @@
       (toString <nixpkgs/nixos/modules/virtualisation/virtualbox-guest.nix>)
       ../2configs/main-laptop.nix #< base-gui
 
+      # Tools
+      ../2configs/tools/core.nix
+      ../2configs/tools/core-gui.nix
+      ../2configs/tools/dev.nix
+      ../2configs/tools/extra-gui.nix
+      ../2configs/tools/sec.nix
+
       # environment
       ../2configs/tinc/retiolum.nix
 
+      ../2configs/audio/jack-on-pulse.nix
+      ../2configs/audio/realtime-audio.nix
+
     ];
   networking.extraHosts = import (toString <secrets/extra-hosts.nix>);
-  # workaround for https://github.com/NixOS/nixpkgs/issues/16641
-  services.xserver.videoDrivers = lib.mkOverride 45 [ "virtualbox" "modesetting" ];
 
   nixpkgs.config.allowUnfree = true;
   fileSystems."/nix" = {
diff --git a/makefu/1systems/x.nix b/makefu/1systems/x.nix
index ee3a7bb1b..b37c32944 100644
--- a/makefu/1systems/x.nix
+++ b/makefu/1systems/x.nix
@@ -13,59 +13,49 @@ with import <stockholm/lib>;
       ../2configs/tools/all.nix
       ../2configs/laptop-backup.nix
       ../2configs/dnscrypt.nix
+      ../2configs/avahi.nix
 
-      # testing
-      # ../2configs/openvpn/vpngate.nix
-      #../2configs/temp/share-samba.nix
-      # ../2configs/mediawiki.nix
-      # ../2configs/wordpress.nix
-      # ../2configs/nginx/public_html.nix
-      # ../2configs/nginx/icecult.nix
-
-      # ../2configs/elchos/irc-token.nix
-      # ../2configs/elchos/log.nix
-
-      #../2configs/elchos/search.nix
-      #../2configs/elchos/stats.nix
-      #../2configs/elchos/test/ftpservers.nix
-
-      # ../2configs/tinc/siem.nix
-      #../2configs/torrent.nix
-      # temporary modules
-
-      # ../2configs/torrent.nix
-      #../2configs/temp/elkstack.nix
-      # ../2configs/temp/sabnzbd.nix
+      # Debugging
+      # ../2configs/disable_v6.nix
 
+      # Testing
+      # ../2configs/deployment/dirctator.nix
+      # ../2configs/vncserver.nix
+      # ../2configs/deployment/led-fader
+      # ../2configs/deployment/hound
 
       # development
       ../2configs/sources
 
       # Krebs
-      # ../2configs/disable_v6.nix
       ../2configs/tinc/retiolum.nix
 
       # applications
       ../2configs/exim-retiolum.nix
       ../2configs/mail-client.nix
       ../2configs/printer.nix
+      ../2configs/task-client.nix
+
+      # Virtualization
       ../2configs/virtualization.nix
+      ../2configs/docker.nix
       ../2configs/virtualization-virtualbox.nix
-      ../2configs/wwan.nix
-      ../2configs/rad1o.nix
 
-      # services
+      # Services
       ../2configs/git/brain-retiolum.nix
       ../2configs/tor.nix
       ../2configs/steam.nix
       # ../2configs/buildbot-standalone.nix
 
-      # hardware specifics are in here
+      # Hardware
       ../2configs/hw/tp-x230.nix
       ../2configs/hw/rtl8812au.nix
-      ../2configs/hw/stk1160.nix
+      ../2configs/hw/exfat-nofuse.nix
+      ../2configs/hw/wwan.nix
+      # ../2configs/hw/stk1160.nix
+      # ../2configs/rad1o.nix
 
-      # mount points
+      # Filesystem
       ../2configs/fs/sda-crypto-root-home.nix
 
     ];
@@ -76,10 +66,8 @@ with import <stockholm/lib>;
 
   nixpkgs.config.allowUnfree = true;
 
-  boot.extraModulePackages = [ config.boot.kernelPackages.exfat-nofuse ];
   environment.systemPackages = [ pkgs.passwdqc-utils ];
 
-  virtualisation.docker.enable = true;
 
   # configure pulseAudio to provide a HDMI sink as well
   networking.firewall.enable = true;