From 35596f7aed2f2b43064c5d41121c0d3d17503641 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Thu, 20 Oct 2016 21:05:56 +0200
Subject: l 1 mors: activate redis

---
 lass/1systems/mors.nix | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'lass/1systems')

diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix
index 1028ca652..b9373313c 100644
--- a/lass/1systems/mors.nix
+++ b/lass/1systems/mors.nix
@@ -77,6 +77,9 @@ with config.krebs.lib;
         ];
       };
     }
+    {
+      services.redis.enable = true;
+    }
   ];
 
   krebs.build.host = config.krebs.hosts.mors;
-- 
cgit v1.2.3


From 51a9fb2dccf6996e1f4fe6f795076ebc6bc71d25 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Thu, 20 Oct 2016 21:10:59 +0200
Subject: l 1 shodan: add sokratess user

---
 lass/1systems/shodan.nix | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

(limited to 'lass/1systems')

diff --git a/lass/1systems/shodan.nix b/lass/1systems/shodan.nix
index 5140591af..7c44807a6 100644
--- a/lass/1systems/shodan.nix
+++ b/lass/1systems/shodan.nix
@@ -22,6 +22,26 @@ with builtins;
     #    };
     #  };
     #}
+    {
+      users.users.sokratess = {
+        uid = genid "sokratess";
+        home = "/home/sokratess";
+        group = "users";
+        createHome = true;
+        extraGroups = [
+         "audio"
+          "networkmanager"
+        ];
+        useDefaultShell = true;
+        password = "aidsballs";
+      };
+      krebs.per-user.sokratess.packages = [
+        pkgs.firefox
+        pkgs.python27Packages.virtualenv
+        pkgs.python27Packages.ipython
+        pkgs.python27Packages.python
+      ];
+    }
   ];
 
   krebs.build.host = config.krebs.hosts.shodan;
-- 
cgit v1.2.3


From 0f38de96e8749e49af333028435edb37f7b4ae60 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Thu, 20 Oct 2016 21:40:11 +0200
Subject: l: import <stockholm/lib>

---
 lass/1systems/shodan.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lass/1systems')

diff --git a/lass/1systems/shodan.nix b/lass/1systems/shodan.nix
index 7c44807a6..9d1df1d72 100644
--- a/lass/1systems/shodan.nix
+++ b/lass/1systems/shodan.nix
@@ -1,6 +1,6 @@
 { config, pkgs, ... }:
 
-with builtins;
+with import <stockholm/lib>;
 {
   imports = [
     ../.
-- 
cgit v1.2.3


From 75a3c4029db60013066b0850ed4df359fe2be3cd Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Sat, 22 Oct 2016 14:25:52 +0200
Subject: l 1 helios: oraclejre -> jre

---
 lass/1systems/helios.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lass/1systems')

diff --git a/lass/1systems/helios.nix b/lass/1systems/helios.nix
index c16080762..4e0b40906 100644
--- a/lass/1systems/helios.nix
+++ b/lass/1systems/helios.nix
@@ -41,7 +41,7 @@ with import <stockholm/lib>;
       environment.systemPackages = with pkgs; [
         firefox
         chromium
-        oraclejre8
+        jre
         maven
         arandr
         libreoffice
-- 
cgit v1.2.3


From 384c96efd288c44b285d20ca8f5390b9d03af6d6 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Sun, 23 Oct 2016 05:53:41 +0200
Subject: l 1 helios: remove jre from pkgs

---
 lass/1systems/helios.nix | 1 -
 1 file changed, 1 deletion(-)

(limited to 'lass/1systems')

diff --git a/lass/1systems/helios.nix b/lass/1systems/helios.nix
index 4e0b40906..82db8ef7b 100644
--- a/lass/1systems/helios.nix
+++ b/lass/1systems/helios.nix
@@ -41,7 +41,6 @@ with import <stockholm/lib>;
       environment.systemPackages = with pkgs; [
         firefox
         chromium
-        jre
         maven
         arandr
         libreoffice
-- 
cgit v1.2.3