summaryrefslogtreecommitdiffstats
path: root/tv
diff options
context:
space:
mode:
authorlassulus <lass@blue.r>2018-09-17 10:10:53 +0200
committerlassulus <lass@blue.r>2018-09-17 10:10:53 +0200
commit9155ef1caa5e06dfa284d39ab7d9b21d67dcd2ce (patch)
treefdcd9d1139498a7241e8ab4f22af0ce0c4e42dec /tv
parent1662e21c330506f17bf37c08cf50ad594637be94 (diff)
parent3b15b226ffa808a04790e6ac24a2f7c128b0347d (diff)
Merge remote-tracking branch 'ni/master'
Diffstat (limited to 'tv')
-rw-r--r--tv/1systems/mu/config.nix5
1 files changed, 2 insertions, 3 deletions
diff --git a/tv/1systems/mu/config.nix b/tv/1systems/mu/config.nix
index 6c22971bf..f51366546 100644
--- a/tv/1systems/mu/config.nix
+++ b/tv/1systems/mu/config.nix
@@ -2,9 +2,7 @@ with import <stockholm/lib>;
{ config, pkgs, ... }: {
imports = [
- <stockholm/krebs>
- <stockholm/tv/2configs>
- <stockholm/tv/3modules>
+ <stockholm/tv>
<stockholm/tv/2configs/exim-retiolum.nix>
<stockholm/tv/2configs/retiolum.nix>
];
@@ -57,6 +55,7 @@ with import <stockholm/lib>;
gimp
iptables
libreoffice
+ plasma-pa
(pkgs.pidgin-with-plugins.override {
plugins = [ pkgs.pidginotr ];
})