diff options
| author | makefu <github@syntax-fehler.de> | 2021-01-27 22:57:15 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2021-01-27 22:57:15 +0100 |
| commit | 144edeee1030d647bcc64083efc5834d1628341d (patch) | |
| tree | 92f32df8dbc09b1bc36061267967b605628409b7 /lass/1systems/mors/config.nix | |
| parent | 9c6c20f69e7b76e4231ffeae715d2ee5d453bb4d (diff) | |
| parent | a2ca5f2e214be259fdb0f9ea92b79d74e6216a51 (diff) | |
Merge remote-tracking branch 'lass/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 b03d95c49..95b688590 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 |