diff options
| author | lassulus <lass@lassul.us> | 2017-02-12 21:41:48 +0100 |
|---|---|---|
| committer | lassulus <lass@lassul.us> | 2017-02-12 21:41:48 +0100 |
| commit | c4d70a28b421217c2a5ec252fea36e650f19a452 (patch) | |
| tree | 291515339894b386fa28801c38786b3d7c3aee3a /makefu/1systems/x.nix | |
| parent | bf8a886c20887d39d856854b1e9186657543c400 (diff) | |
| parent | a3e7e4f2baa1cc8d8180c50fd530ff0ea2cc0086 (diff) | |
Merge remote-tracking branch 'prism/makefu'
Diffstat (limited to 'makefu/1systems/x.nix')
| -rw-r--r-- | makefu/1systems/x.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/makefu/1systems/x.nix b/makefu/1systems/x.nix index adbf372a..08da9206 100644 --- a/makefu/1systems/x.nix +++ b/makefu/1systems/x.nix @@ -10,9 +10,10 @@ ../2configs/main-laptop.nix ../2configs/laptop-utils.nix ../2configs/laptop-backup.nix + ../2configs/dnscrypt.nix # testing - ../2configs/openvpn/vpngate.nix + # ../2configs/openvpn/vpngate.nix #../2configs/temp/share-samba.nix # ../2configs/mediawiki.nix # ../2configs/wordpress.nix @@ -26,7 +27,6 @@ #../2configs/elchos/stats.nix #../2configs/elchos/test/ftpservers.nix - ../2configs/laptop-backup.nix # ../2configs/tinc/siem.nix #../2configs/torrent.nix # temporary modules @@ -59,7 +59,7 @@ # hardware specifics are in here ../2configs/hw/tp-x230.nix ../2configs/hw/rtl8812au.nix - ../2configs/hw/bcm4352.nix + # mount points ../2configs/fs/sda-crypto-root-home.nix |