diff options
| author | makefu <github@syntax-fehler.de> | 2018-01-04 00:21:13 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2018-01-04 00:21:13 +0100 |
| commit | 8c6bd7431c8620fa65466e880fbd38e2c555367d (patch) | |
| tree | 9d73f67cf751a6f3f99b6a5a0c3dd0ddaee16382 /lass/1systems | |
| parent | 6ad170e7621668fdcf03aab37d1f9843e446d2da (diff) | |
| parent | a9f803207243425d5c06ce82820c27a4de8af5ad (diff) | |
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'lass/1systems')
| -rw-r--r-- | lass/1systems/helios/config.nix | 2 | ||||
| -rw-r--r-- | lass/1systems/mors/config.nix | 1 | ||||
| -rw-r--r-- | lass/1systems/prism/config.nix | 3 |
3 files changed, 2 insertions, 4 deletions
diff --git a/lass/1systems/helios/config.nix b/lass/1systems/helios/config.nix index 8bd9735a9..fc30a3478 100644 --- a/lass/1systems/helios/config.nix +++ b/lass/1systems/helios/config.nix @@ -120,8 +120,6 @@ with import <stockholm/lib>; ]; }; - programs.ssh.startAgent = lib.mkForce true; - services.tlp.enable = true; services.xserver.videoDrivers = [ "nvidia" ]; diff --git a/lass/1systems/mors/config.nix b/lass/1systems/mors/config.nix index ad133802f..8c7c39a6f 100644 --- a/lass/1systems/mors/config.nix +++ b/lass/1systems/mors/config.nix @@ -30,6 +30,7 @@ with import <stockholm/lib>; <stockholm/lass/2configs/otp-ssh.nix> <stockholm/lass/2configs/c-base.nix> <stockholm/lass/2configs/br.nix> + <stockholm/lass/2configs/ableton.nix> { #risk of rain port krebs.iptables.tables.filter.INPUT.rules = [ diff --git a/lass/1systems/prism/config.nix b/lass/1systems/prism/config.nix index 1cca76331..593a1fc9c 100644 --- a/lass/1systems/prism/config.nix +++ b/lass/1systems/prism/config.nix @@ -234,8 +234,7 @@ in { } <stockholm/lass/2configs/exim-smarthost.nix> <stockholm/lass/2configs/ts3.nix> - <stockholm/lass/2configs/bitlbee.nix> - <stockholm/lass/2configs/weechat.nix> + <stockholm/lass/2configs/IM.nix> <stockholm/lass/2configs/privoxy-retiolum.nix> <stockholm/lass/2configs/radio.nix> <stockholm/lass/2configs/repo-sync.nix> |