Merge remote-tracking branch 'lass/master'

1 files changed, 20 insertions, 20 deletions

diff --git a/tv/1systems/mu/config.nix b/tv/1systems/mu/config.nix
index 7c3f8cf..00bd5da 100644
--- a/tv/1systems/mu/config.nix
+++ b/tv/1systems/mu/config.nix
@@ -56,26 +56,26 @@ with import <stockholm/lib>;
     ${pkgs.kmod}/bin/modprobe -v iwlwifi
   '';
 
-  environment.systemPackages = with pkgs; [
-    chromium
-    firefoxWrapper
-    gimp
-    iptables
-    libreoffice
-    plasma-pa
-    (pkgs.pidgin-with-plugins.override {
-      plugins = [ pkgs.pidginotr ];
+  environment.systemPackages = [
+    pkgs.chromium
+    pkgs.firefox
+    pkgs.gimp
+    pkgs.iptables
+    pkgs.libreoffice
+    pkgs.plasma-pa
+    (pkgs.pidgin.override {
+      plugins = [ pkgs.pidgin-otr ];
     })
-    skype
-    slock
-    tinc_pre
-    vim
-    xsane
-
-    #foomatic_filters
-    #gutenprint
-    #cups_pdf_filter
-    #ghostscript
+    pkgs.skypeforlinux
+    pkgs.slock
+    pkgs.tinc_pre
+    pkgs.vim
+    pkgs.xsane
+
+    #pkgs.foomatic_filters
+    #pkgs.gutenprint
+    #pkgs.cups_pdf_filter
+    #pkgs.ghostscript
   ];
 
 
@@ -97,7 +97,7 @@ with import <stockholm/lib>;
   ];
 
   fonts.fonts = [
-    pkgs.xlibs.fontschumachermisc
+    pkgs.xorg.fontschumachermisc
   ];
 
   services.xserver.enable = true;