diff options
| author | tv <tv@krebsco.de> | 2021-01-25 11:28:26 +0100 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2021-01-25 11:28:26 +0100 |
| commit | a0ca091cbf4e9ca41390ad9d54844c9eb2660406 (patch) | |
| tree | aae89f223f953a81da400d6f7deac1d5ae5d240e /lass/1systems/mors/config.nix | |
| parent | 1cd73df0c8694f491d40f93a796ea58f150e88dc (diff) | |
| parent | 71206dc6a2852dd69664e85aa6dcb49676ec1f6e (diff) | |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'lass/1systems/mors/config.nix')
| -rw-r--r-- | lass/1systems/mors/config.nix | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lass/1systems/mors/config.nix b/lass/1systems/mors/config.nix index b03d95c4..95b68859 100644 --- a/lass/1systems/mors/config.nix +++ b/lass/1systems/mors/config.nix @@ -18,28 +18,28 @@ with import <stockholm/lib>; <stockholm/lass/2configs/steam.nix> <stockholm/lass/2configs/wine.nix> <stockholm/lass/2configs/git.nix> - <stockholm/lass/2configs/virtualbox.nix> <stockholm/lass/2configs/fetchWallpaper.nix> <stockholm/lass/2configs/mail.nix> <stockholm/krebs/2configs/ircd.nix> <stockholm/lass/2configs/logf.nix> <stockholm/lass/2configs/syncthing.nix> - <stockholm/lass/2configs/otp-ssh.nix> - <stockholm/lass/2configs/c-base.nix> + <stockholm/lass/2configs/sync/sync.nix> <stockholm/lass/2configs/sync/decsync.nix> <stockholm/lass/2configs/sync/weechat.nix> + #<stockholm/lass/2configs/c-base.nix> <stockholm/lass/2configs/br.nix> <stockholm/lass/2configs/ableton.nix> - <stockholm/lass/2configs/starcraft.nix> <stockholm/lass/2configs/dunst.nix> <stockholm/lass/2configs/rtl-sdr.nix> - <stockholm/lass/2configs/backup.nix> <stockholm/lass/2configs/print.nix> - <stockholm/lass/2configs/blue-host.nix> <stockholm/lass/2configs/network-manager.nix> <stockholm/lass/2configs/nfs-dl.nix> - #<stockholm/lass/2configs/hardening.nix> - <stockholm/lass/2configs/ppp.nix> + <stockholm/lass/2configs/green-host.nix> + <stockholm/krebs/2configs/news-host.nix> + <stockholm/lass/2configs/ppp/x220-modem.nix> + <stockholm/lass/2configs/ppp/umts-stick.nix> + # <stockholm/lass/2configs/remote-builder/morpheus.nix> + # <stockholm/lass/2configs/remote-builder/prism.nix> { krebs.iptables.tables.filter.INPUT.rules = [ #risk of rain |