diff options
| author | tv <tv@krebsco.de> | 2017-09-07 22:51:48 +0200 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2017-09-07 22:51:48 +0200 |
| commit | e4969bf3e77a5d3bc39625ad784227438640d126 (patch) | |
| tree | f6fbc14e2b675a512ec698cbdae33fa3fd8d25ca /makefu/1systems/x/config.nix | |
| parent | 66738262eeb30e29f2743d0e0424d10722f5e2af (diff) | |
| parent | 46a3f4c24315836c1d82711d98f4d69be67d883d (diff) | |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'makefu/1systems/x/config.nix')
| -rw-r--r-- | makefu/1systems/x/config.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/makefu/1systems/x/config.nix b/makefu/1systems/x/config.nix index 8e8c8a736..faa29f3db 100644 --- a/makefu/1systems/x/config.nix +++ b/makefu/1systems/x/config.nix @@ -12,7 +12,7 @@ with import <stockholm/lib>; <stockholm/makefu/2configs/extra-fonts.nix> <stockholm/makefu/2configs/tools/all.nix> <stockholm/makefu/2configs/laptop-backup.nix> - <stockholm/makefu/2configs/dnscrypt.nix> + <stockholm/makefu/2configs/dnscrypt/client.nix> <stockholm/makefu/2configs/avahi.nix> # Debugging @@ -20,6 +20,7 @@ with import <stockholm/lib>; # Testing # <stockholm/makefu/2configs/deployment/gitlab.nix> + # <stockholm/makefu/2configs/deployment/wiki-irc-bot> # <stockholm/makefu/2configs/torrent.nix> # <stockholm/makefu/2configs/lanparty/lancache.nix> @@ -54,6 +55,7 @@ with import <stockholm/lib>; # Services <stockholm/makefu/2configs/git/brain-retiolum.nix> <stockholm/makefu/2configs/tor.nix> + <stockholm/makefu/2configs/vpn/vpngate.nix> <stockholm/makefu/2configs/steam.nix> # <stockholm/makefu/2configs/buildbot-standalone.nix> |