2 files changed, 15 insertions, 12 deletions
diff --git a/machines/profpatsch/katara.nix b/machines/profpatsch/katara.nix
index 336c31ad..98842ecd 100644
--- a/machines/profpatsch/katara.nix
+++ b/machines/profpatsch/katara.nix
@@ -151,7 +151,6 @@ in {
         gnome3.gnome_themes_standard
         pavucontrol
       ];
-      hp = haskellPackages;
       programmingTools = [
         cabal2nix                    # convert cabal files to nixexprs
         # myPkgs.fast-init             # fast-init of haskell projects
@@ -160,6 +159,7 @@ in {
 
         # TODO: move to user config
         go
+        direnv
         httpie                       # nice http CLI
         jq                           # json filter
         telnet                       # tcp debugging
@@ -170,6 +170,7 @@ in {
         pkgs.vuizvui.profpatsch.watch-server # restart server on code change
         pkgs.vuizvui.profpatsch.until        # restart until cmd succeeds
         myPkgs.execlineb-with-builtins
+        dhall
       ];
       documentation = [
         # mustache-spec NOT IN 16.09
@@ -222,7 +223,7 @@ in {
         # TODO needs user service
         redshift   # increases screen warmth at night (so i don’t have to feel cold)
         # pdfjam is the best CLI pdf modification suite
-        (texlive.combine { inherit (texlive) scheme-minimal pdfjam; })
+        (texlive.combine { inherit (texlive) scheme-small pdfjam; })
       ];
     in systemPkgs ++ xPkgs ++ guiPkgs
     ++ programmingTools ++ documentation
@@ -311,10 +312,10 @@ in {
       symbola # emoji
     ];
 
-    # services.printing = {
-    #   enable = true;
-    #   drivers = [ pkgs.gutenprint pkgs.gutenprintBin pkgs.hplip ];
-    # };
+    services.printing = {
+      enable = true;
+      drivers = [ pkgs.gutenprint pkgs.gutenprintBin pkgs.hplip ];
+    };
 
     ###########
     # Programs
@@ -332,11 +333,14 @@ in {
 
     vuizvui.user.profpatsch.programs.scanning = {
       enable = true;
-      remoteScanners = ''
-        hannswurscht.openlab.lan
-      '';
+      #remoteScanners = ''
+      #  hannswurscht.lab
+      #  hippie.lab
+      #'';
     };
 
+    # virtualisation.docker.enable = true;
+
     #######
     # Misc
 
diff --git a/machines/profpatsch/pkgs.nix b/machines/profpatsch/pkgs.nix
index 20dd18d7..2f95f678 100644
--- a/machines/profpatsch/pkgs.nix
+++ b/machines/profpatsch/pkgs.nix
@@ -1,6 +1,5 @@
 { pkgs, lib, myLib }:
 
-with pkgs;
 let
 
   nix = pkgs.nix.overrideAttrs (old: {
@@ -60,7 +59,7 @@ let
 
   poezio = pkgs.python34Packages.poezio;
 
-  vim = vim_configurable;
+  vim = pkgs.vim_configurable;
 
   fast-init = pkgs.haskellPackages.callPackage (import "${(pkgs.fetchFromGitHub {
     owner = "Profpatsch";
@@ -86,7 +85,7 @@ let
   # });
 
   # A ghci with some sane default packages in scope, & hoogle
-  saneGhci = haskellPackages.ghcWithHoogle (h: with h; [ protolude pretty-show ]);
+  saneGhci = pkgs.haskellPackages.ghcWithHoogle (h: with h; [ protolude pretty-show ]);
 
   pyrnotify =
     let src = pkgs.fetchFromGitHub {