8 files changed, 20 insertions, 15 deletions
diff --git a/lass/1systems/cloudkrebs.nix b/lass/1systems/cloudkrebs.nix
index 5aa35f5a7..e65b13d00 100644
--- a/lass/1systems/cloudkrebs.nix
+++ b/lass/1systems/cloudkrebs.nix
@@ -7,10 +7,9 @@ let
 in {
   imports = [
     ../.
+    ../2configs/retiolum.nix
     ../2configs/os-templates/CAC-CentOS-7-64bit.nix
-    ../2configs/default.nix
     ../2configs/exim-retiolum.nix
-    ../2configs/retiolum.nix
     ../2configs/git.nix
     ../2configs/realwallpaper.nix
     ../2configs/privoxy-retiolum.nix
diff --git a/lass/1systems/dishfire.nix b/lass/1systems/dishfire.nix
index ec9f53694..9c77f909d 100644
--- a/lass/1systems/dishfire.nix
+++ b/lass/1systems/dishfire.nix
@@ -3,8 +3,8 @@
 {
   imports = [
     ../.
+    ../2configs/retiolum.nix
     <nixpkgs/nixos/modules/profiles/qemu-guest.nix>
-    ../2configs/default.nix
     #../2configs/exim-retiolum.nix
     ../2configs/git.nix
     {
diff --git a/lass/1systems/echelon.nix b/lass/1systems/echelon.nix
index 8d944ed40..da8864011 100644
--- a/lass/1systems/echelon.nix
+++ b/lass/1systems/echelon.nix
@@ -7,10 +7,9 @@ let
 in {
   imports = [
     ../.
+    ../2configs/retiolum.nix
     ../2configs/os-templates/CAC-CentOS-7-64bit.nix
-    ../2configs/default.nix
     ../2configs/exim-retiolum.nix
-    ../2configs/retiolum.nix
     ../2configs/realwallpaper.nix
     ../2configs/privoxy-retiolum.nix
     ../2configs/git.nix
diff --git a/lass/1systems/helios.nix b/lass/1systems/helios.nix
index 53026a6fb..26ad316ce 100644
--- a/lass/1systems/helios.nix
+++ b/lass/1systems/helios.nix
@@ -6,6 +6,7 @@ with config.krebs.lib;
 {
   imports = [
     ../.
+    ../2configs/retiolum.nix
     ../2configs/exim-retiolum.nix
     ../2configs/browsers.nix
     ../2configs/programs.nix
@@ -20,27 +21,30 @@ with config.krebs.lib;
     #  imports = [
     #    ../2configs/baseX.nix
     #  ];
-    #  networking.wireless.enable = true;
     #}
     {
       # gnome3 for suja
-      imports = [
-        ../2configs/default.nix
-      ];
+      time.timeZone = "Europe/Berlin";
       services.xserver.enable = true;
-      services.xserver.desktopManager.gnome3.enable = true;
-      users.users.suja = {
-        uid = genid "suja";
-        home = "/home/suja";
+      services.xserver.desktopManager.xfce.enable = true;
+      networking.wireless.enable = true;
+      users.users.ferret = {
+        uid = genid "ferret";
+        home = "/home/ferret";
         group = "users";
         createHome = true;
         useDefaultShell = true;
         extraGroups = [
         ];
+        hashedPassword = "$6$SaneLuyep90p8BPn$0IDbvLgNbRGZL96obWavanTmY6IkBG84vs2b/2oqlpbmTZH3retOYbQKF1uVqu6dD0ZGF4eBq9tqPbwUjRyY00";
       };
       environment.systemPackages = with pkgs; [
         firefox
         chromium
+        oraclejre8
+        maven
+        arandr
+        libreoffice
       ];
     }
     #{
diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix
index 92a1b51e9..d3878d305 100644
--- a/lass/1systems/mors.nix
+++ b/lass/1systems/mors.nix
@@ -3,6 +3,7 @@
 {
   imports = [
     ../.
+    ../2configs/retiolum.nix
     ../2configs/hw/tp-x220.nix
     ../2configs/baseX.nix
     ../2configs/exim-retiolum.nix
diff --git a/lass/1systems/prism.nix b/lass/1systems/prism.nix
index 812cdb844..47e8a68b4 100644
--- a/lass/1systems/prism.nix
+++ b/lass/1systems/prism.nix
@@ -12,7 +12,7 @@ let
 in {
   imports = [
     ../.
-    ../2configs/default.nix
+    ../2configs/retiolum.nix
     ../2configs/exim-smarthost.nix
     ../2configs/downloading.nix
     ../2configs/ts3.nix
@@ -157,6 +157,7 @@ in {
       users.users.chat.openssh.authorizedKeys.keys = [
         "ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBAHF9tijlMoEevRZCG1AggukxWggfxPHUwg6Ye113ODG6PZ2m98oSmnsjixDy4GfIJjy+8HBbkwS6iH+fsNk86QtAgFNMjBl+9YvEzNRBzcyCqdOkZFvvZvV2oYA7I15il4ln62PDPKjEIS3YPhZPSwc6GhrlsFTnIG56NF/93IhF7R/FA== JuiceSSH"
         config.krebs.users.lass-uriel.pubkey
+        "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDQ8DJhHAqmdrB2+qkV/OuKjR4QDXUww2TWItyDrs+/6F58WacMozgaZr2goA5JQJ5d19nC3LzYb4yLGguADsp987I6cAu5iXPT5PHKc0eRWDN+AGlpTgUtN1BvVrnJZaUJrR9WlHhFYlkOkzAsB15fKYciVWsyxBCVZ+3oiTEjs2L/sfbrgailWqHIUWDftUnJx8EFmSUVZ2GZWklMcgBo0FJD1i0x5u2dQGguNY+28DzQmKgUMS+xD/uUZvrFIWr9I6CBqhsuHJo8n85BT3B3QdG8ARLt5FKPr5L3My6UjlxOkKrDNLjJFjERFCsuIxnrO3tQhvKXQYlOyskHokocYSdcIq8svghJLA3kmRYIjHjZ4y1BNENsk79WyYNMAi5y+A0Evmu+g3ks/DiW3vI/Sw/D3Uc7ilbImpaoL5qUC4+WZM3J2b3Z1AU5D1QiojpKkB9Qt1bokCm8hrRCG9ZDKqAD6IqmI1ARRjfgA4zKwKUhmMqG4p55YGGVf9OeK0rXgX0Z2InyFXeBaU2aBcDfdKD/65w5MnC9CsJnjELdd4r9u2ugTPExzOo3WUlNuOTB1WoZ8CiY2OVGle/E/MzKUDfGuIFhUsFeX0YcLHPbo+mesISNUPaeadSuMuHE8W4FOeEq51toBo/gkxgjtqqWMOd9SxnDQTMBKq3L/w7nEQ== lass@mors"
       ];
     }
     {
diff --git a/lass/1systems/shodan.nix b/lass/1systems/shodan.nix
index 96d64bda3..af98c6968 100644
--- a/lass/1systems/shodan.nix
+++ b/lass/1systems/shodan.nix
@@ -4,6 +4,7 @@ with builtins;
 {
   imports = [
     ../.
+    ../2configs/retiolum.nix
     ../2configs/hw/tp-x220.nix
     ../2configs/baseX.nix
     ../2configs/git.nix
diff --git a/lass/1systems/uriel.nix b/lass/1systems/uriel.nix
index 6b56419d7..16c39280d 100644
--- a/lass/1systems/uriel.nix
+++ b/lass/1systems/uriel.nix
@@ -4,6 +4,7 @@ with builtins;
 {
   imports = [
     ../.
+    ../2configs/retiolum.nix
     ../2configs/baseX.nix
     ../2configs/exim-retiolum.nix
     ../2configs/browsers.nix
@@ -12,7 +13,6 @@ with builtins;
     ../2configs/bird.nix
     ../2configs/git.nix
     ../2configs/chromium-patched.nix
-    ../2configs/retiolum.nix
     ../2configs/bitlbee.nix
     ../2configs/weechat.nix
     ../2configs/skype.nix