diff options
| author | makefu <github@syntax-fehler.de> | 2017-11-02 14:24:48 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2017-11-02 14:24:48 +0100 |
| commit | 4baad9d4226f15ff1ff326ebcb36fc1bd83a98c5 (patch) | |
| tree | 4c68d68d78903f12a681e57051ba2b420099a00c /nin/1systems/hiawatha | |
| parent | 2e39f7b3d1805346e067bdc7236bd7dfe87381a2 (diff) | |
| parent | 6934b5d83f245b723cf7d685d7ab0a758947bdc8 (diff) | |
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'nin/1systems/hiawatha')
| -rw-r--r-- | nin/1systems/hiawatha/config.nix | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/nin/1systems/hiawatha/config.nix b/nin/1systems/hiawatha/config.nix index 0e48b41c2..fdae354ff 100644 --- a/nin/1systems/hiawatha/config.nix +++ b/nin/1systems/hiawatha/config.nix @@ -15,6 +15,7 @@ with lib; <stockholm/nin/2configs/git.nix> <stockholm/nin/2configs/retiolum.nix> <stockholm/nin/2configs/termite.nix> + <stockholm/nin/2configs/skype.nix> ]; krebs.build.host = config.krebs.hosts.hiawatha; @@ -98,10 +99,6 @@ with lib; allowUnfree = true; - firefox = { - enableGoogleTalkPlugin = true; - enableAdobeFlash = true; - }; }; #services.logind.extraConfig = "HandleLidSwitch=ignore"; |