6 files changed, 36 insertions, 9 deletions
diff --git a/lass/1systems/helios/config.nix b/lass/1systems/helios/config.nix
index 5657742a6..40150b80e 100644
--- a/lass/1systems/helios/config.nix
+++ b/lass/1systems/helios/config.nix
@@ -98,7 +98,7 @@ with import <stockholm/lib>;
   ];
 
   programs.adb.enable = true;
-  users.users.mainUser.extraGroups = [ "adbusers" "docker" ];
+  users.users.mainUser.extraGroups = [ "adbusers" ];
 
   services.printing.drivers = [ pkgs.postscript-lexmark ];
 
@@ -106,5 +106,4 @@ with import <stockholm/lib>;
     HandleLidSwitch=ignore
   '';
 
-  virtualisation.docker.enable = true;
 }
diff --git a/lass/2configs/blue.nix b/lass/2configs/blue.nix
index 363705edc..16c63ff38 100644
--- a/lass/2configs/blue.nix
+++ b/lass/2configs/blue.nix
@@ -12,6 +12,7 @@ with (import <stockholm/lib>);
   environment.systemPackages = with pkgs; [
     ag
     nmap
+    git-preview
   ];
 
   services.tor.enable = true;
diff --git a/lass/2configs/dcso-dev.nix b/lass/2configs/dcso-dev.nix
index 4d8d308fb..830acb2e1 100644
--- a/lass/2configs/dcso-dev.nix
+++ b/lass/2configs/dcso-dev.nix
@@ -9,7 +9,7 @@ in {
     dev = {
       name = "dev";
       uid = genid "dev";
-      extraGroups = [ "docker" "vboxusers" ];
+      extraGroups = [ "vboxusers" ];
       description = "user for collaborative development";
       home = "/home/dev";
       useDefaultShell = true;
@@ -52,6 +52,10 @@ in {
     { predicate = "-p tcp --dport 9000"; target = "ACCEPT";}
   ];
 
+  krebs.iptables.tables.filter.OUTPUT.rules = [
+    { predicate = "-p tcp --dport 21"; target = "REJECT";}
+  ];
+
   krebs.per-user.dev.packages = [
     pkgs.go
   ];
@@ -64,12 +68,6 @@ in {
   networking.interfaces.et0.ipv4.addresses = [
     { address = "10.99.23.1"; prefixLength = 24; }
   ];
-  virtualisation.docker.enable = true;
-  environment.etc."docker/daemon.json".source = pkgs.writeText "daemon.json" ''
-    {
-      "bip": "172.25.0.1/16"
-    }
-  '';
   services.rabbitmq.enable = true;
   services.postgresql.enable = true;
 }
diff --git a/lass/2configs/exim-smarthost.nix b/lass/2configs/exim-smarthost.nix
index db6bda005..30757964c 100644
--- a/lass/2configs/exim-smarthost.nix
+++ b/lass/2configs/exim-smarthost.nix
@@ -84,6 +84,7 @@ with import <stockholm/lib>;
       { from = "boardgamegeek@lassul.us"; to = lass.mail; }
       { from = "qwertee@lassul.us"; to = lass.mail; }
       { from = "zazzle@lassul.us"; to = lass.mail; }
+      { from = "hackbeach@lassul.us"; to = lass.mail; }
     ];
     system-aliases = [
       { from = "mailer-daemon"; to = "postmaster"; }
diff --git a/lass/5pkgs/custom/xmonad-lass/default.nix b/lass/5pkgs/custom/xmonad-lass/default.nix
index 694f3c033..8b508ae6a 100644
--- a/lass/5pkgs/custom/xmonad-lass/default.nix
+++ b/lass/5pkgs/custom/xmonad-lass/default.nix
@@ -160,6 +160,8 @@ myKeyMap =
 
     , ("<Pause>", spawn "${pkgs.xcalib}/bin/xcalib -invert -alter")
 
+    , ("M4-s", spawn "${pkgs.knav}/bin/knav")
+
     --, ("M4-w", screenWorkspace 0 >>= (windows . W.greedyView))
     --, ("M4-e", screenWorkspace 1 >>= (windows . W.greedyView))
     --, ("M4-r", screenWorkspace 2 >>= (windows . W.greedyView))
diff --git a/lass/5pkgs/knav/default.nix b/lass/5pkgs/knav/default.nix
new file mode 100644
index 000000000..30d49a1b3
--- /dev/null
+++ b/lass/5pkgs/knav/default.nix
@@ -0,0 +1,26 @@
+{ pkgs, ... }: let
+
+  keynavrc = pkgs.writeText "keynavrc" ''
+    clear
+    Escape quit
+    q record ~/.keynav_macros
+    shift+at playback
+    u history-back
+    a cut-left
+    s cut-down
+    w cut-up
+    d cut-right
+    shift+a move-left
+    shift+s move-down
+    shift+w move-up
+    shift+d move-right
+    t windowzoom
+    c cursorzoom 300 300
+    e warp
+    1 click 1
+    2 click 2
+    3 click 3
+  '';
+in pkgs.writeScriptBin "knav" ''
+  ${pkgs.keynav}/bin/keynav "loadconfig ${keynavrc}, start"
+''