diff options
| author | tv <tv@krebsco.de> | 2018-01-02 20:58:59 +0100 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2018-01-02 20:58:59 +0100 |
| commit | 493984d97e6deaee3d7b358724e83c59bccb212d (patch) | |
| tree | 691e019ae0b55d48a9681d9c26ae65e6c83d1d0f /lass/1systems | |
| parent | 84fdbeba2ceee152a128f5e9013043c172c07ecf (diff) | |
| parent | e48b4eb4606f6d0ec0b930016a53e7e7cfcbfb64 (diff) | |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'lass/1systems')
| -rw-r--r-- | lass/1systems/helios/config.nix | 2 | ||||
| -rw-r--r-- | lass/1systems/prism/config.nix | 3 |
2 files changed, 1 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/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> |