summaryrefslogtreecommitdiffstats
path: root/makefu/1systems
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2016-10-27 14:59:47 +0200
committerlassulus <lass@aidsballs.de>2016-10-27 14:59:47 +0200
commit98659a68c7c40bee92e851afcf5a9bebeb3e2a06 (patch)
treeef9ed3bce885ad39eccc35a79b069bf269ae939a /makefu/1systems
parent3306e32498fc0c784ec6975a7911bf84d5ff1091 (diff)
parent2e22fa7234c95cccb1680fb47954f339e6e0b326 (diff)
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/1systems')
-rw-r--r--makefu/1systems/x.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/makefu/1systems/x.nix b/makefu/1systems/x.nix
index e7f5d0dae..e1aec360d 100644
--- a/makefu/1systems/x.nix
+++ b/makefu/1systems/x.nix
@@ -32,7 +32,7 @@
# ../2configs/buildbot-standalone.nix
# hardware specifics are in here
- ../2configs/hw/tp-x220.nix
+ ../2configs/hw/tp-x230.nix
../2configs/hw/rtl8812au.nix
../2configs/hw/bcm4352.nix
# mount points
@@ -46,7 +46,7 @@
# temporary modules
../2configs/temp/share-samba.nix
../2configs/laptop-backup.nix
- ../2configs/temp/elkstack.nix
+ #../2configs/temp/elkstack.nix
# ../2configs/temp/sabnzbd.nix
../2configs/tinc/siem.nix
#../2configs/torrent.nix
@@ -62,7 +62,7 @@
environment.systemPackages = [ pkgs.passwdqc-utils pkgs.bintray-upload ];
- # virtualisation.docker.enable = true;
+ virtualisation.docker.enable = true;
# configure pulseAudio to provide a HDMI sink as well
networking.firewall.enable = true;