diff options
| author | jeschli <jeschli@gmail.com> | 2018-09-25 19:56:06 +0200 |
|---|---|---|
| committer | jeschli <jeschli@gmail.com> | 2018-09-25 19:56:06 +0200 |
| commit | f4a049121efb704844e7b5d50eee9d8adca353c1 (patch) | |
| tree | be1a32c6aa7e0b418a4549935c22302f2dc39e98 /tv/1systems/mu | |
| parent | f15179cb6d4f8216af459aa331b047937e59a7e9 (diff) | |
| parent | 5596dcc76837d3f36a946ea6c54d3a95daa6da69 (diff) | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'tv/1systems/mu')
| -rw-r--r-- | tv/1systems/mu/config.nix | 5 | ||||
| -rw-r--r-- | tv/1systems/mu/source.nix | 3 |
2 files changed, 2 insertions, 6 deletions
diff --git a/tv/1systems/mu/config.nix b/tv/1systems/mu/config.nix index 6c22971..f513665 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 ]; }) diff --git a/tv/1systems/mu/source.nix b/tv/1systems/mu/source.nix deleted file mode 100644 index 7e148cf..0000000 --- a/tv/1systems/mu/source.nix +++ /dev/null @@ -1,3 +0,0 @@ -import <stockholm/tv/source.nix> { - name = "mu"; -} |