6 files changed, 19 insertions, 18 deletions
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/browsers.nix b/lass/2configs/browsers.nix
index 272169e92..425e0ee13 100644
--- a/lass/2configs/browsers.nix
+++ b/lass/2configs/browsers.nix
@@ -29,7 +29,7 @@ let
       environment.systemPackages = [
         config.lass.xjail-bins.${name}
         (pkgs.writeDashBin "cx-${name}" ''
-          DISPLAY=:${toString (genid_signed name)} ${pkgs.xclip}/bin/xclip -o | DISPLAY=:0 ${pkgs.xclip}/bin/xclip
+          DISPLAY=:${toString (genid_uint31 name)} ${pkgs.xclip}/bin/xclip -o | DISPLAY=:0 ${pkgs.xclip}/bin/xclip
         '')
       ];
       lass.browser.paths.${name} = {
@@ -66,6 +66,7 @@ in {
     extensions = [
       "cjpalhdlnbpafiamejdnhcphjbkeiagm" # ublock origin
       "dbepggeogbaibhgnhhndojpepiihcmeb" # vimium
+      "liloimnbhkghhdhlamdjipkmadhpcjmn" # krebsgold
     ];
   };
 
diff --git a/lass/2configs/ciko.nix b/lass/2configs/ciko.nix
index 56c9a286c..b08cf9307 100644
--- a/lass/2configs/ciko.nix
+++ b/lass/2configs/ciko.nix
@@ -2,7 +2,7 @@
 with import <stockholm/lib>;
 {
   users.users.ciko = {
-    uid = genid_signed "ciko";
+    uid = genid_uint31 "ciko";
     description = "acc for ciko";
     home = "/home/ciko";
     useDefaultShell = 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/2configs/websites/domsen.nix b/lass/2configs/websites/domsen.nix
index d19f534fe..e1c1313ea 100644
--- a/lass/2configs/websites/domsen.nix
+++ b/lass/2configs/websites/domsen.nix
@@ -4,7 +4,7 @@ let
 
   inherit (import <stockholm/lib>)
     genid
-    genid_signed
+    genid_uint31
   ;
   inherit (import <stockholm/lass/2configs/websites/util.nix> {inherit lib pkgs;})
     servePage
@@ -134,7 +134,7 @@ in {
   };
 
   users.users.domsen = {
-    uid = genid_signed "domsen";
+    uid = genid_uint31 "domsen";
     description = "maintenance acc for domsen";
     home = "/home/domsen";
     useDefaultShell = true;
@@ -143,49 +143,49 @@ in {
   };
 
   users.users.bruno = {
-    uid = genid_signed "bruno";
+    uid = genid_uint31 "bruno";
     home = "/home/bruno";
     useDefaultShell = true;
     createHome = true;
   };
 
   users.users.jla-trading = {
-    uid = genid_signed "jla-trading";
+    uid = genid_uint31 "jla-trading";
     home = "/home/jla-trading";
     useDefaultShell = true;
     createHome = true;
   };
 
   users.users.jms = {
-    uid = genid_signed "jms";
+    uid = genid_uint31 "jms";
     home = "/home/jms";
     useDefaultShell = true;
     createHome = true;
   };
 
   users.users.ms = {
-    uid = genid_signed "ms";
+    uid = genid_uint31 "ms";
     home = "/home/ms";
     useDefaultShell = true;
     createHome = true;
   };
 
   users.users.testuser = {
-    uid = genid_signed "testuser";
+    uid = genid_uint31 "testuser";
     home = "/home/testuser";
     useDefaultShell = true;
     createHome = true;
   };
 
   users.users.akayguen = {
-    uid = genid_signed "akayguen";
+    uid = genid_uint31 "akayguen";
     home = "/home/akayguen";
     useDefaultShell = true;
     createHome = true;
   };
 
   users.users.bui = {
-    uid = genid_signed "bui";
+    uid = genid_uint31 "bui";
     home = "/home/bui";
     useDefaultShell = true;
     createHome = true;