diff options
| author | lassulus <lass@aidsballs.de> | 2016-11-29 13:58:11 +0100 |
|---|---|---|
| committer | lassulus <lass@aidsballs.de> | 2016-11-29 13:58:11 +0100 |
| commit | cc9faa901b6ddb79c4d5e87f6039eaebd3418143 (patch) | |
| tree | 679da7dcfe38a0cad670d73717a83b4a8aec8a26 | |
| parent | dbc68c5e1bc0ff9ee2b5674098a6221255a03f61 (diff) | |
| parent | ab5b81b0b4a6396ca3b53fbe414a7aad2845d8bc (diff) | |
Merge remote-tracking branch 'gum/master'
| -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; |