From c6ed05c10d9b5b11e623e3bb36b3f40b824691bb Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Fri, 1 Sep 2017 22:05:21 +0200
Subject: l: add Reaktor|krebs

---
 lass/1systems/prism/config.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lass/1systems')

diff --git a/lass/1systems/prism/config.nix b/lass/1systems/prism/config.nix
index 744bae551..c50100181 100644
--- a/lass/1systems/prism/config.nix
+++ b/lass/1systems/prism/config.nix
@@ -42,6 +42,7 @@ in {
     <stockholm/lass/2configs/coders-irc.nix>
     <stockholm/lass/2configs/ciko.nix>
     <stockholm/lass/2configs/container-networking.nix>
+    <stockholm/lass/2configs/reaktor-krebs.nix>
     {
       lass.pyload.enable = true;
     }
-- 
cgit v1.2.3


From 78ea2c5b1a8e483edecff58b5cfe06425a2ba7b9 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Fri, 1 Sep 2017 22:06:09 +0200
Subject: l: coders-irc -> reaktor-coders

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

(limited to 'lass/1systems')

diff --git a/lass/1systems/prism/config.nix b/lass/1systems/prism/config.nix
index c50100181..91f9956f1 100644
--- a/lass/1systems/prism/config.nix
+++ b/lass/1systems/prism/config.nix
@@ -39,7 +39,7 @@ in {
     <stockholm/lass/2configs/monitoring/monit-alarms.nix>
     <stockholm/lass/2configs/paste.nix>
     <stockholm/lass/2configs/syncthing.nix>
-    <stockholm/lass/2configs/coders-irc.nix>
+    <stockholm/lass/2configs/reaktor-coders.nix>
     <stockholm/lass/2configs/ciko.nix>
     <stockholm/lass/2configs/container-networking.nix>
     <stockholm/lass/2configs/reaktor-krebs.nix>
-- 
cgit v1.2.3


From 66f76c34b72f295a341cebe5e80a7574960592e6 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Fri, 1 Sep 2017 22:31:54 +0200
Subject: l: no longer sync nixpkgs

---
 lass/1systems/prism/config.nix | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'lass/1systems')

diff --git a/lass/1systems/prism/config.nix b/lass/1systems/prism/config.nix
index 91f9956f1..b3f547452 100644
--- a/lass/1systems/prism/config.nix
+++ b/lass/1systems/prism/config.nix
@@ -245,10 +245,6 @@ in {
         OnUnitInactiveSec = "2min";
         RandomizedDelaySec = "2min";
       };
-      krebs.repo-sync.repos.nixpkgs.timerConfig = {
-        OnBootSec = "90min";
-        OnUnitInactiveSec = "24h";
-      };
     }
     {
       lass.usershadow = {
-- 
cgit v1.2.3


From 28aadfeb357ed1c57c8af0d79045406c8f1ef0cd Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sat, 2 Sep 2017 16:13:30 +0200
Subject: l daedalus.r: add de keyboard layout

---
 lass/1systems/daedalus/config.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lass/1systems')

diff --git a/lass/1systems/daedalus/config.nix b/lass/1systems/daedalus/config.nix
index 36daea1d5..a3db0f1b4 100644
--- a/lass/1systems/daedalus/config.nix
+++ b/lass/1systems/daedalus/config.nix
@@ -37,6 +37,7 @@ with import <stockholm/lib>;
       services.xserver.enable = true;
       services.xserver.displayManager.lightdm.enable = true;
       services.xserver.desktopManager.plasma5.enable = true;
+      services.xserver.layout = "de";
     }
     {
       krebs.per-user.bitcoin.packages = [
-- 
cgit v1.2.3


From 8c131beb3ab6011276e3f123b8fea50fe8c7d91c Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sat, 2 Sep 2017 21:41:00 +0200
Subject: l mors.r: remove elasticsearch

---
 lass/1systems/mors/config.nix | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'lass/1systems')

diff --git a/lass/1systems/mors/config.nix b/lass/1systems/mors/config.nix
index 58f55ce68..a0e0f90a2 100644
--- a/lass/1systems/mors/config.nix
+++ b/lass/1systems/mors/config.nix
@@ -34,11 +34,6 @@ with import <stockholm/lib>;
         { predicate = "-p tcp --dport 11100"; target = "ACCEPT"; }
       ];
     }
-    {
-      services.elasticsearch = {
-        enable = true;
-      };
-    }
     {
       lass.umts = {
         enable = true;
-- 
cgit v1.2.3


From 495d8cddb0b59351f08ee6154b483f1826b3d70c Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sat, 2 Sep 2017 22:16:46 +0200
Subject: l daedalus.r: add pkgs.libreoffice

---
 lass/1systems/daedalus/config.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lass/1systems')

diff --git a/lass/1systems/daedalus/config.nix b/lass/1systems/daedalus/config.nix
index a3db0f1b4..db1bb5d3a 100644
--- a/lass/1systems/daedalus/config.nix
+++ b/lass/1systems/daedalus/config.nix
@@ -33,6 +33,7 @@ with import <stockholm/lib>;
         firefox
         hexchat
         networkmanagerapplet
+        libreoffice
       ];
       services.xserver.enable = true;
       services.xserver.displayManager.lightdm.enable = true;
-- 
cgit v1.2.3


From 5184d19651f9319d63fd812601f3df635b1416b8 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sat, 2 Sep 2017 22:17:31 +0200
Subject: l daedalus.r: add remote control

---
 lass/1systems/daedalus/config.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'lass/1systems')

diff --git a/lass/1systems/daedalus/config.nix b/lass/1systems/daedalus/config.nix
index db1bb5d3a..e1bce5da8 100644
--- a/lass/1systems/daedalus/config.nix
+++ b/lass/1systems/daedalus/config.nix
@@ -57,6 +57,15 @@ with import <stockholm/lib>;
         bubsy ALL=(bitcoin) NOPASSWD: ALL
       '';
     }
+    {
+      #remote control
+      environment.systemPackages = with pkgs; [
+        x11vnc
+      ];
+      krebs.iptables.tables.filter.INPUT.rules = [
+        { predicate = "-p tcp -i retiolum --dport 5900"; target = "ACCEPT"; }
+      ];
+    }
   ];
 
   time.timeZone = "Europe/Berlin";
-- 
cgit v1.2.3


From 6ab81a2797d5bc58dbe3acfb0a3c268baf159220 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sun, 3 Sep 2017 10:36:14 +0200
Subject: l mors.r: add c-base config

---
 lass/1systems/mors/config.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lass/1systems')

diff --git a/lass/1systems/mors/config.nix b/lass/1systems/mors/config.nix
index a0e0f90a2..53854d3be 100644
--- a/lass/1systems/mors/config.nix
+++ b/lass/1systems/mors/config.nix
@@ -28,6 +28,7 @@ with import <stockholm/lib>;
     <stockholm/lass/2configs/logf.nix>
     <stockholm/lass/2configs/syncthing.nix>
     <stockholm/lass/2configs/otp-ssh.nix>
+    <stockholm/lass/2configs/c-base.nix>
     {
       #risk of rain port
       krebs.iptables.tables.filter.INPUT.rules = [
-- 
cgit v1.2.3


From 2855881c732c041d9b6cd9c830d6ac4b84157b17 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Mon, 4 Sep 2017 00:16:54 +0200
Subject: move news & deps: echelon.r -> puyak.r

---
 lass/1systems/echelon/config.nix | 3 ---
 lass/1systems/mors/config.nix    | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

(limited to 'lass/1systems')

diff --git a/lass/1systems/echelon/config.nix b/lass/1systems/echelon/config.nix
index 77958267d..127819379 100644
--- a/lass/1systems/echelon/config.nix
+++ b/lass/1systems/echelon/config.nix
@@ -12,9 +12,6 @@ in {
     <stockholm/lass/2configs/realwallpaper.nix>
     <stockholm/lass/2configs/privoxy-retiolum.nix>
     <stockholm/lass/2configs/git.nix>
-    <stockholm/lass/2configs/go.nix>
-    <stockholm/lass/2configs/ircd.nix>
-    <stockholm/lass/2configs/newsbot-js.nix>
     {
       networking.interfaces.enp2s1.ip4 = [
         {
diff --git a/lass/1systems/mors/config.nix b/lass/1systems/mors/config.nix
index 53854d3be..4d2f8b0f8 100644
--- a/lass/1systems/mors/config.nix
+++ b/lass/1systems/mors/config.nix
@@ -24,7 +24,7 @@ with import <stockholm/lib>;
     <stockholm/lass/2configs/fetchWallpaper.nix>
     <stockholm/lass/2configs/mail.nix>
     <stockholm/lass/2configs/repo-sync.nix>
-    <stockholm/lass/2configs/ircd.nix>
+    <stockholm/krebs/2configs/ircd.nix>
     <stockholm/lass/2configs/logf.nix>
     <stockholm/lass/2configs/syncthing.nix>
     <stockholm/lass/2configs/otp-ssh.nix>
-- 
cgit v1.2.3


From adc185b629a5fa6b64c5a99e182730e53fc814bf Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Mon, 4 Sep 2017 00:17:48 +0200
Subject: l echelon.r: deactivate realwallpaper

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

(limited to 'lass/1systems')

diff --git a/lass/1systems/echelon/config.nix b/lass/1systems/echelon/config.nix
index 127819379..6f96883bf 100644
--- a/lass/1systems/echelon/config.nix
+++ b/lass/1systems/echelon/config.nix
@@ -9,7 +9,6 @@ in {
     <stockholm/lass/2configs/retiolum.nix>
     <stockholm/lass/2configs/os-templates/CAC-CentOS-7-64bit.nix>
     <stockholm/lass/2configs/exim-retiolum.nix>
-    <stockholm/lass/2configs/realwallpaper.nix>
     <stockholm/lass/2configs/privoxy-retiolum.nix>
     <stockholm/lass/2configs/git.nix>
     {
-- 
cgit v1.2.3