summaryrefslogtreecommitdiffstats
path: root/nin/1systems/hiawatha
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2017-10-26 18:43:33 +0200
committertv <tv@krebsco.de>2017-10-26 18:43:33 +0200
commitd5fd5107e6cd8e4d1cd0e63420d35a9df5279e7f (patch)
tree05731b063ed6243632b6c3a61a329618da6a6951 /nin/1systems/hiawatha
parent1993cbc42114c759a47fed8de1e73980d3df57d9 (diff)
parent458bd5f6bda5b5718959613ceb989862a530ed7b (diff)
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'nin/1systems/hiawatha')
-rw-r--r--nin/1systems/hiawatha/config.nix5
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";