diff options
| author | tv <tv@krebsco.de> | 2016-12-01 21:59:25 +0100 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2016-12-01 21:59:25 +0100 |
| commit | 1e599969524d9772ad9c891a383048d9fef843e5 (patch) | |
| tree | 6ae4edef0df43dcd82a7dedfa1aa5e45741cd233 /makefu/1systems/x.nix | |
| parent | 32c59103f5315fb6160b1dd38df2c27647aaffdd (diff) | |
| parent | f4ce5ea248c6dcb965f9367a4569a39f4be747af (diff) | |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'makefu/1systems/x.nix')
| -rw-r--r-- | makefu/1systems/x.nix | 37 |
1 files changed, 20 insertions, 17 deletions
diff --git a/makefu/1systems/x.nix b/makefu/1systems/x.nix index e1aec360d..6fe3883a1 100644 --- a/makefu/1systems/x.nix +++ b/makefu/1systems/x.nix @@ -5,25 +5,39 @@ { imports = - [ # Include the results of the hardware scan. + [ # base ../. - ../2configs/main-laptop.nix #< base-gui + zsh + ../2configs/main-laptop.nix ../2configs/laptop-utils.nix ../2configs/laptop-backup.nix - # Krebs - #../2configs/disable_v6.nix - ../2configs/rad1o.nix + # testing + #../2configs/elchos/search.nix + #../2configs/temp/share-samba.nix + # ../2configs/mediawiki.nix + # ../2configs/wordpress.nix + # ../2configs/nginx/public_html.nix + # ../2configs/nginx/icecult.nix + ../2configs/laptop-backup.nix + #../2configs/temp/elkstack.nix + # ../2configs/temp/sabnzbd.nix + ../2configs/tinc/siem.nix + #../2configs/torrent.nix - # applications + # Krebs + ../2configs/disable_v6.nix + ../2configs/tinc/retiolum.nix + + # applications ../2configs/exim-retiolum.nix ../2configs/mail-client.nix ../2configs/printer.nix ../2configs/virtualization.nix ../2configs/virtualization-virtualbox.nix ../2configs/wwan.nix + ../2configs/rad1o.nix # services ../2configs/git/brain-retiolum.nix @@ -37,19 +51,8 @@ ../2configs/hw/bcm4352.nix # mount points ../2configs/fs/sda-crypto-root-home.nix - # ../2configs/mediawiki.nix - #../2configs/wordpress.nix - #../2configs/nginx/public_html.nix - ../2configs/nginx/icecult.nix - ../2configs/tinc/retiolum.nix # temporary modules - ../2configs/temp/share-samba.nix - ../2configs/laptop-backup.nix - #../2configs/temp/elkstack.nix - # ../2configs/temp/sabnzbd.nix - ../2configs/tinc/siem.nix - #../2configs/torrent.nix ]; makefu.full-populate = true; |