about summary refs log tree commit diff
path: root/machines
diff options
context:
space:
mode:
authorProfpatsch <mail@profpatsch.de>2017-11-22 15:02:46 +0100
committerProfpatsch <mail@profpatsch.de>2017-11-22 15:11:07 +0100
commit978e7c822679945be58887f4bc2ec6772d59942d (patch)
tree76b6bcd0cb1c529e1b594aac8987d321c39df848 /machines
parentd36693704bca3556c1f957741e26d6029b30cf56 (diff)
machines/katara: add jq, remove openvpn, fix gutenprint
Diffstat (limited to 'machines')
-rw-r--r--machines/profpatsch/katara.nix23
1 files changed, 12 insertions, 11 deletions
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