diff options
| -rw-r--r-- | krebs/5pkgs/logf/default.nix | 3 | ||||
| -rw-r--r-- | mv/1systems/stro.nix | 1 | ||||
| -rw-r--r-- | tv/2configs/xserver/Xresources.nix | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/krebs/5pkgs/logf/default.nix b/krebs/5pkgs/logf/default.nix index d9eae0a4a..ac95acb33 100644 --- a/krebs/5pkgs/logf/default.nix +++ b/krebs/5pkgs/logf/default.nix @@ -54,7 +54,8 @@ pkgs.writeDashBin "logf" '' # anaphoric gsub def agsub(re; f): - gsub("(?<it>\(re))"; .it | f); + # Don't try empty regex: https://github.com/stedolan/jq/issues/1206 + when(re != ""; gsub("(?<it>\(re))"; .it | f)); # :: [int] -> sgr def sgr: "\u001b[\(map(tostring) | join(";"))m"; diff --git a/mv/1systems/stro.nix b/mv/1systems/stro.nix index c948754df..08e6ce2ce 100644 --- a/mv/1systems/stro.nix +++ b/mv/1systems/stro.nix @@ -32,6 +32,7 @@ with config.krebs.lib; <stockholm/tv/2configs/hw/x220.nix> <stockholm/tv/2configs/im.nix> <stockholm/tv/2configs/mail-client.nix> + <stockholm/tv/2configs/nginx/public_html.nix> <stockholm/tv/2configs/retiolum.nix> <stockholm/tv/2configs/ssh.nix> <stockholm/tv/2configs/sshd.nix> diff --git a/tv/2configs/xserver/Xresources.nix b/tv/2configs/xserver/Xresources.nix index 923572721..f9af89c7e 100644 --- a/tv/2configs/xserver/Xresources.nix +++ b/tv/2configs/xserver/Xresources.nix @@ -2,7 +2,7 @@ with config.krebs.lib; -pkgs.writeText "Xresources" '' +pkgs.writeText "Xresources" /* xdefaults */ '' !URxvt*background: #050505 ! 2013-02-25 \e was reas escape before @@ -203,7 +203,7 @@ pkgs.writeText "Xresources" '' ! ref https://github.com/muennich/urxvt-perls URxvt*perl-ext: default,url-select URxvt*keysym.M-u: perl:url-select:select_next - URxvt*url-select.launcher: ${pkgs.ff}/bin/ff -new-tab + URxvt*url-select.launcher: /etc/per-user/${config.krebs.build.user.name}/bin/ff -new-tab URxvt*url-select.underline: true URxvt*colorUL: #4682B4 URxvt.perl-lib: ${pkgs.urxvt_perls}/lib/urxvt/perl |