Merge remote-tracking branch 'ni/master'

5 files changed, 13 insertions, 8 deletions

diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix
index 8add07ff6..f3ce2da40 100644
--- a/tv/2configs/default.nix
+++ b/tv/2configs/default.nix
@@ -15,6 +15,7 @@ with import <stockholm/lib>;
     ./bash
     ./htop.nix
     ./nets/hkw.nix
+    ./networkd.nix
     ./nginx
     ./pki
     ./ssh.nix
@@ -46,7 +47,7 @@ with import <stockholm/lib>;
 
     {
       # TODO check if both are required:
-      nix.sandboxPaths = [ "/etc/protocols" pkgs.iana_etc.outPath ];
+      nix.sandboxPaths = [ "/etc/protocols" pkgs.iana-etc.outPath ];
 
       nix.requireSignedBinaryCaches = true;
 
diff --git a/tv/2configs/man.nix b/tv/2configs/man.nix
index 0a72dce2a..c723138f1 100644
--- a/tv/2configs/man.nix
+++ b/tv/2configs/man.nix
@@ -5,9 +5,9 @@
   #    s:^NROFF\t.*:& -Wbreak:
   #  '
   #'';
-  environment.systemPackages = with pkgs; [
-    manpages
-    posix_man_pages
-    xorg.xorgdocs
+  environment.systemPackages = [
+    pkgs.man-pages
+    pkgs.posix_man_pages
+    pkgs.xorg.xorgdocs
   ];
 }
diff --git a/tv/2configs/networkd.nix b/tv/2configs/networkd.nix
new file mode 100644
index 000000000..da0d9ce43
--- /dev/null
+++ b/tv/2configs/networkd.nix
@@ -0,0 +1,4 @@
+{
+  # often hangs
+  systemd.services.systemd-networkd-wait-online.enable = false;
+}
diff --git a/tv/2configs/pulse.nix b/tv/2configs/pulse.nix
index f720ad473..513a0eb17 100644
--- a/tv/2configs/pulse.nix
+++ b/tv/2configs/pulse.nix
@@ -2,7 +2,7 @@
 
 with import <stockholm/lib>;
 let
-  pkg = pkgs.pulseaudioLight;
+  pkg = pkgs.pulseaudio;
   runDir = "/run/pulse";
 
   pkgs_i686 = pkgs.pkgsi686Linux;
diff --git a/tv/2configs/xserver/default.nix b/tv/2configs/xserver/default.nix
index be155af53..8bedb0e81 100644
--- a/tv/2configs/xserver/default.nix
+++ b/tv/2configs/xserver/default.nix
@@ -38,7 +38,7 @@ in {
   ];
 
   fonts.fonts = [
-    pkgs.xlibs.fontschumachermisc
+    pkgs.xorg.fontschumachermisc
   ];
 
   services.xserver = {
@@ -128,7 +128,7 @@ in {
         config.imgur.xdg-open.browser = "/etc/profiles/per-user/tv/bin/cr";
         config.timeout = 200;
       })
-      pkgs.pulseaudioLight.out
+      pkgs.pulseaudio.out
       pkgs.rxvt_unicode
       pkgs.xcalib
       "/run/wrappers" # for su