diff options
author | makefu <github@syntax-fehler.de> | 2022-08-02 14:34:22 +0200 |
---|---|---|
committer | makefu <github@syntax-fehler.de> | 2022-08-02 14:34:22 +0200 |
commit | bb8be44848a549eeed9613714521855c836523e5 (patch) | |
tree | b3c2531817e0943406260470f59c435e2ba0dcb5 /tv/2configs | |
parent | 276718b73696f43728f4b2dda9dcedc05e226aba (diff) | |
parent | c7ef3495b847e44ec0642bd7af0f8cbae6ae9c98 (diff) |
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'tv/2configs')
-rw-r--r-- | tv/2configs/default.nix | 3 | ||||
-rw-r--r-- | tv/2configs/man.nix | 8 | ||||
-rw-r--r-- | tv/2configs/networkd.nix | 4 | ||||
-rw-r--r-- | tv/2configs/pulse.nix | 2 | ||||
-rw-r--r-- | tv/2configs/xserver/default.nix | 4 |
5 files changed, 13 insertions, 8 deletions
diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix index 8add07f..f3ce2da 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 0a72dce..c723138 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 0000000..da0d9ce --- /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 f720ad4..513a0eb 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 be155af..8bedb0e 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 |