Merge remote-tracking branch 'ni/master'

4 files changed, 34 insertions, 32 deletions

diff --git a/tv/1systems/alnus/config.nix b/tv/1systems/alnus/config.nix
index 54f845ec2..c09e7f9b1 100644
--- a/tv/1systems/alnus/config.nix
+++ b/tv/1systems/alnus/config.nix
@@ -15,9 +15,9 @@ with import <stockholm/lib>;
     };
   };
 
-  environment.systemPackages = with pkgs; [
-    firefoxWrapper
-    networkmanagerapplet
+  environment.systemPackages = [
+    pkgs.firefox
+    pkgs.networkmanagerapplet
     (pkgs.pidgin-with-plugins.override {
       plugins = [ pkgs.pidginotr ];
     })
diff --git a/tv/1systems/mu/config.nix b/tv/1systems/mu/config.nix
index 7c3f8cfdb..21be25766 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
+  environment.systemPackages = [
+    pkgs.chromium
+    pkgs.firefox
+    pkgs.gimp
+    pkgs.iptables
+    pkgs.libreoffice
+    pkgs.plasma-pa
     (pkgs.pidgin-with-plugins.override {
       plugins = [ pkgs.pidginotr ];
     })
-    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;
diff --git a/tv/1systems/querel/config.nix b/tv/1systems/querel/config.nix
index 41253cfb3..ad82915f4 100644
--- a/tv/1systems/querel/config.nix
+++ b/tv/1systems/querel/config.nix
@@ -21,19 +21,19 @@ with import <stockholm/lib>;
     systemd-boot.enable = true;
   };
 
-  environment.systemPackages = with pkgs; [
-    firefoxWrapper
-    gimp
-    kate
-    libreoffice
+  environment.systemPackages = [
+    pkgs.firefox
+    pkgs.gimp
+    pkgs.kate
+    pkgs.libreoffice
     (pkgs.pidgin-with-plugins.override {
       plugins = [ pkgs.pidginotr ];
     })
-    sxiv
-    texlive.combined.scheme-full
-    vim
-    xsane
-    zathura
+    pkgs.sxiv
+    pkgs.texlive.combined.scheme-full
+    pkgs.vim
+    pkgs.xsane
+    pkgs.zathura
   ];
 
   fileSystems = {
diff --git a/tv/1systems/xu/config.nix b/tv/1systems/xu/config.nix
index 05c5c11b0..8a86e209b 100644
--- a/tv/1systems/xu/config.nix
+++ b/tv/1systems/xu/config.nix
@@ -45,7 +45,9 @@ with import <stockholm/lib>;
         netcup
         nmap
         p7zip
-        pass-otp
+        (pkgs.pass.withExtensions (ext: [
+          ext.pass-otp
+        ]))
         q
         qrencode
         texlive.combined.scheme-full