summaryrefslogtreecommitdiffstats
path: root/tv/2configs
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2016-08-21 13:16:51 +0200
committerlassulus <lass@aidsballs.de>2016-08-21 13:16:51 +0200
commit3eb5f58a0ee9778006d4e37fee17e0b3e096a52a (patch)
tree6e4edc6f0029fcf3f6d3d34a972c05e14d3951cd /tv/2configs
parent037cefc30ab756e6aea19ba096fe18e6e38ffffe (diff)
parent66f5efe0f5819a3c6dacd33b547921e8379fcb3d (diff)
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'tv/2configs')
-rw-r--r--tv/2configs/urlwatch.nix6
-rw-r--r--tv/2configs/xserver/Xresources.nix4
-rw-r--r--tv/2configs/xu-qemu0.nix1
3 files changed, 2 insertions, 9 deletions
diff --git a/tv/2configs/urlwatch.nix b/tv/2configs/urlwatch.nix
index 51b53230b..c81723b20 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 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
diff --git a/tv/2configs/xu-qemu0.nix b/tv/2configs/xu-qemu0.nix
index 5be4899c8..0e4a91c90 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 = {