9 files changed, 25 insertions, 22 deletions
diff --git a/lass/2configs/base.nix b/lass/2configs/base.nix
index 46435649..43c4f4e3 100644
--- a/lass/2configs/base.nix
+++ b/lass/2configs/base.nix
@@ -3,14 +3,13 @@
 with lib;
 {
   imports = [
-    ../3modules/iptables.nix
     ../2configs/vim.nix
     ../2configs/zsh.nix
     ../2configs/mc.nix
     {
       users.extraUsers =
         mapAttrs (_: h: { hashedPassword = h; })
-                 (import /root/src/secrets/hashedPasswords.nix);
+                 (import /root/secrets/hashedPasswords.nix);
     }
     {
       users.extraUsers = {
@@ -45,7 +44,7 @@ with lib;
     build.source = {
       git.nixpkgs = {
         url = https://github.com/Lassulus/nixpkgs;
-        rev = "68bd8e4a9dc247726ae89cc8739574261718e328";
+        rev = "e916273209560b302ab231606babf5ce1c481f08";
       };
     };
   };
@@ -71,7 +70,12 @@ with lib;
   '';
 
   environment.systemPackages = with pkgs; [
+  #stockholm
     git
+    jq
+    parallel
+
+  #style
     most
     rxvt_unicode.terminfo
 
@@ -137,7 +141,7 @@ with lib;
     RuntimeMaxUse=128M
   '';
 
-  lass.iptables = {
+  krebs.iptables = {
     enable = true;
     tables = {
       filter.INPUT.policy = "DROP";
diff --git a/lass/2configs/browsers.nix b/lass/2configs/browsers.nix
index f37dace2..47275af6 100644
--- a/lass/2configs/browsers.nix
+++ b/lass/2configs/browsers.nix
@@ -66,16 +66,16 @@ in {
     ( createChromiumUser "cr" [ "audio" ] [ pkgs.chromium ] )
     ( createChromiumUser "fb" [ ] [ pkgs.chromium ] )
     ( createChromiumUser "gm" [ ] [ pkgs.chromium ] )
-    ( createChromiumUser "flash" [ ] [ pkgs.flash ] )
+   # ( createChromiumUser "flash" [ ] [ pkgs.flash ] )
   ];
 
   nixpkgs.config.packageOverrides = pkgs : {
     flash = pkgs.chromium.override {
-      pulseSupport = true;
+    #  pulseSupport = true;
       enablePepperFlash = true;
     };
-    chromium = pkgs.chromium.override {
-      pulseSupport = true;
-    };
+    #chromium = pkgs.chromium.override {
+    #  pulseSupport = true;
+    #};
   };
 }
diff --git a/lass/2configs/downloading.nix b/lass/2configs/downloading.nix
index e6d31a6c..5052da5c 100644
--- a/lass/2configs/downloading.nix
+++ b/lass/2configs/downloading.nix
@@ -2,7 +2,6 @@
 
 {
   imports = [
-    ../3modules/iptables.nix
     ../3modules/folderPerms.nix
   ];
 
@@ -47,7 +46,7 @@
     };
   };
 
-  lass.iptables = {
+  krebs.iptables = {
     enable = true;
     tables.filter.INPUT.rules = [
       { predicate = "-p tcp --dport 9091"; target = "ACCEPT"; }
diff --git a/lass/2configs/fastpoke-pages.nix b/lass/2configs/fastpoke-pages.nix
index 1c8106a8..0470865b 100644
--- a/lass/2configs/fastpoke-pages.nix
+++ b/lass/2configs/fastpoke-pages.nix
@@ -29,9 +29,7 @@ let
     };
 
 in {
-  imports = [
-    ../3modules/iptables.nix
-  ] ++ map createStaticPage [
+  imports = map createStaticPage [
     "habsys.de"
     "pixelpocket.de"
     "karlaskop.de"
@@ -39,7 +37,7 @@ in {
     "apanowicz.de"
   ];
 
-  lass.iptables = {
+  krebs.iptables = {
     tables = {
       filter.INPUT.rules = [
         { predicate = "-p tcp --dport http"; target = "ACCEPT"; }
diff --git a/lass/2configs/new-repos.nix b/lass/2configs/new-repos.nix
index 026f9a66..3d293d65 100644
--- a/lass/2configs/new-repos.nix
+++ b/lass/2configs/new-repos.nix
@@ -47,6 +47,7 @@ let
         nick = config.krebs.build.host.name;
         channel = "#retiolum";
         server = "cd.retiolum";
+        verbose = config.krebs.build.host.name == "cloudkrebs";
       };
     };
   };
diff --git a/lass/2configs/retiolum.nix b/lass/2configs/retiolum.nix
index d7df1502..7f0bcc5e 100644
--- a/lass/2configs/retiolum.nix
+++ b/lass/2configs/retiolum.nix
@@ -1,11 +1,8 @@
 { ... }:
 
 {
-  imports = [
-    ../3modules/iptables.nix
-  ];
 
-  lass.iptables = {
+  krebs.iptables = {
     tables = {
       filter.INPUT.rules = [
         { predicate = "-p tcp --dport smtp"; target = "ACCEPT"; }
diff --git a/lass/2configs/steam.nix b/lass/2configs/steam.nix
index bd895e15..225ddd30 100644
--- a/lass/2configs/steam.nix
+++ b/lass/2configs/steam.nix
@@ -16,7 +16,9 @@
   environment.systemPackages = with pkgs; [
     steam
   ];
-  lass.iptables = {
+
+  #ports for inhome streaming
+  krebs.iptables = {
     tables = {
       filter.INPUT.rules = [
         { predicate = "-p tcp --dport 27031"; target = "ACCEPT"; }
diff --git a/lass/2configs/virtualbox.nix b/lass/2configs/virtualbox.nix
index 9769cd68..f7d19605 100644
--- a/lass/2configs/virtualbox.nix
+++ b/lass/2configs/virtualbox.nix
@@ -4,6 +4,8 @@ let
   mainUser = config.users.extraUsers.mainUser;
 
 in {
+  #services.virtualboxHost.enable = true;
+  virtualisation.virtualbox.host.enable = true;
 
   users.extraUsers = {
     virtual = {
diff --git a/lass/2configs/wordpress.nix b/lass/2configs/wordpress.nix
index 9458deb3..bd59080d 100644
--- a/lass/2configs/wordpress.nix
+++ b/lass/2configs/wordpress.nix
@@ -8,10 +8,10 @@
 
     config = {
       imports = [
-        ../3modules/iptables.nix
+        ../../krebs/3modules/iptables.nix
       ];
 
-      lass.iptables = {
+      krebs.iptables = {
         enable = true;
         tables = {
           filter.INPUT.policy = "DROP";