diff options
| author | tv <tv@krebsco.de> | 2016-11-11 08:49:37 +0100 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2016-11-11 08:49:37 +0100 |
| commit | 0e13a4e2373d891e6a895e4b6ad2b42da028ba12 (patch) | |
| tree | 1d8ca040ab86b462d6e3fd283997d56177fa4b33 /makefu/1systems | |
| parent | b837dec290e54f532cd5539c93a663ba11f68c54 (diff) | |
| parent | e6c7b13f5990d96e269ee12b9bf6b15bfa7d5b82 (diff) | |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'makefu/1systems')
| -rw-r--r-- | makefu/1systems/gum.nix | 1 | ||||
| -rw-r--r-- | makefu/1systems/x.nix | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/makefu/1systems/gum.nix b/makefu/1systems/gum.nix index 868825549..e8a368fa2 100644 --- a/makefu/1systems/gum.nix +++ b/makefu/1systems/gum.nix @@ -24,6 +24,7 @@ in { ../2configs/torrent.nix ../2configs/graphite-standalone.nix ../2configs/sabnzbd.nix + ../2configs/gum-share.nix ../2configs/opentracker.nix 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; |