diff options
| -rw-r--r-- | krebs/5pkgs/logf/default.nix | 3 | ||||
| -rw-r--r-- | krebs/5pkgs/vncdotool/default.nix | 20 | ||||
| -rw-r--r-- | lass/1systems/prism.nix | 2 | ||||
| -rw-r--r-- | lass/2configs/buildbot-standalone.nix | 1 | ||||
| -rw-r--r-- | mv/1systems/stro.nix | 1 | ||||
| -rw-r--r-- | tv/2configs/urlwatch.nix | 6 | ||||
| -rw-r--r-- | tv/2configs/xserver/Xresources.nix | 4 | ||||
| -rw-r--r-- | tv/2configs/xu-qemu0.nix | 1 |
8 files changed, 6 insertions, 32 deletions
diff --git a/krebs/5pkgs/logf/default.nix b/krebs/5pkgs/logf/default.nix index d9eae0a4..ac95acb3 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/krebs/5pkgs/vncdotool/default.nix b/krebs/5pkgs/vncdotool/default.nix deleted file mode 100644 index 95e2ca70..00000000 --- a/krebs/5pkgs/vncdotool/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ lib, pythonPackages, fetchurl, ... }: -with pythonPackages; buildPythonPackage rec { - name = lib.removeSuffix ".tar.gz" (builtins.baseNameOf src.name); - - src = fetchurl { - url = https://pypi.python.org/packages/source/v/vncdotool/vncdotool-0.9.0.tar.gz; - sha256 = "1hl44w4x9c8air0g6kp9h1af2vj4lmc50vnsxmca9g080740iyvi"; - }; - - propagatedBuildInputs = [ - twisted - pillow - ]; - - meta = { - homepage = https://github.com/sibson/vncdotool; - description = "A command line VNC client and python library"; - license = lib.licenses.mit; - }; -} diff --git a/lass/1systems/prism.nix b/lass/1systems/prism.nix index 9da261ed..812cdb84 100644 --- a/lass/1systems/prism.nix +++ b/lass/1systems/prism.nix @@ -155,7 +155,7 @@ in { } { users.users.chat.openssh.authorizedKeys.keys = [ - "ecdsa-sha2-nistp384 AAAAE2VjZHNhLXNoYTItbmlzdHAzODQAAAAIbmlzdHAzODQAAABhBBQjn/3n283RZkBs2CFqbpukyQ3zkLIjewRpKttPa5d4PUiT7/vOlutWH5EP4BxXQSoeZStx8D2alGjxfK+nfDvRJGGofpm23cN4j4i24Fcam1y1H7wqRXO1qbz5AB3qPg== JuiceSSH" + "ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBAHF9tijlMoEevRZCG1AggukxWggfxPHUwg6Ye113ODG6PZ2m98oSmnsjixDy4GfIJjy+8HBbkwS6iH+fsNk86QtAgFNMjBl+9YvEzNRBzcyCqdOkZFvvZvV2oYA7I15il4ln62PDPKjEIS3YPhZPSwc6GhrlsFTnIG56NF/93IhF7R/FA== JuiceSSH" config.krebs.users.lass-uriel.pubkey ]; } diff --git a/lass/2configs/buildbot-standalone.nix b/lass/2configs/buildbot-standalone.nix index 12a5a736..2fc3d373 100644 --- a/lass/2configs/buildbot-standalone.nix +++ b/lass/2configs/buildbot-standalone.nix @@ -195,7 +195,6 @@ in { "tinc_graphs", "translate-shell", "urlwatch", - "vncdotool", "with-tmpdir", "youtube-tools", ]: diff --git a/mv/1systems/stro.nix b/mv/1systems/stro.nix index c948754d..08e6ce2c 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/urlwatch.nix b/tv/2configs/urlwatch.nix index 51b53230..c81723b2 100644 --- a/tv/2configs/urlwatch.nix +++ b/tv/2configs/urlwatch.nix @@ -51,12 +51,6 @@ with config.krebs.lib; # <stockholm/tv/2configs/xserver/xserver.conf.nix> # is derived from `configFile` in: https://raw.githubusercontent.com/NixOS/nixpkgs/master/nixos/modules/services/x11/xserver.nix - - { - url = https://pypi.python.org/pypi/vncdotool/json; - filter = "system:${pkgs.jq}/bin/jq -r '.releases|keys[]'"; - } - https://api.github.com/repos/kanaka/noVNC/tags ]; hooksFile = toFile "hooks.py" '' import subprocess diff --git a/tv/2configs/xserver/Xresources.nix b/tv/2configs/xserver/Xresources.nix index 92357272..f9af89c7 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 diff --git a/tv/2configs/xu-qemu0.nix b/tv/2configs/xu-qemu0.nix index 5be4899c..0e4a91c9 100644 --- a/tv/2configs/xu-qemu0.nix +++ b/tv/2configs/xu-qemu0.nix @@ -63,7 +63,6 @@ with config.krebs.lib; ''; krebs.per-user.tv.packages = [ - pkgs.vncdotool ]; users.users.xu-qemu0 = { |