From 978e7c822679945be58887f4bc2ec6772d59942d Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Wed, 22 Nov 2017 15:02:46 +0100 Subject: machines/katara: add jq, remove openvpn, fix gutenprint --- machines/profpatsch/katara.nix | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'machines/profpatsch') diff --git a/machines/profpatsch/katara.nix b/machines/profpatsch/katara.nix index 44c50eb7..286103aa 100644 --- a/machines/profpatsch/katara.nix +++ b/machines/profpatsch/katara.nix @@ -125,6 +125,7 @@ in { gitAndTools.git-dit # decentral issue tracking for git httpie # nice http CLI + jq # json filter # jid # interactive/incremental JSON digger # mercurial # the other version control system telnet # tcp debugging @@ -219,20 +220,20 @@ in { ########### # Services - services.openvpn.servers.hakuclient = { - config = '' - client - remote haku.profpatsch.de - dev tun - proto tcp-client - ifconfig 10.20.30.41 10.20.30.40 - secret /root/static-vpn.key - ''; - }; + # services.openvpn.servers.hakuclient = { + # config = '' + # client + # remote haku.profpatsch.de + # dev tun + # proto tcp-client + # ifconfig 10.20.30.41 10.20.30.40 + # secret /root/static-vpn.key + # ''; + # }; services.printing = { enable = true; - gutenprint = true; + drivers = [ pkgs.gutenprint ]; # TODO # drivers = [ pkgs.cups-pdf ]; # TODO -- cgit 1.4.1