summaryrefslogtreecommitdiffstats
path: root/lass/1systems
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2017-09-05 23:00:23 +0200
committertv <tv@krebsco.de>2017-09-05 23:00:23 +0200
commit1436781119f92cbf431db5e817fba765b24d922a (patch)
treef8ee298cdddd02beab384b047cc1a76bd1bd26c1 /lass/1systems
parent77e9bd83e2208d1d732ef505e0e996a2440d5d7c (diff)
parent71d3f53f2bf767cfbb6e941438431d6083f304b9 (diff)
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'lass/1systems')
-rw-r--r--lass/1systems/daedalus/config.nix11
-rw-r--r--lass/1systems/echelon/config.nix4
-rw-r--r--lass/1systems/mors/config.nix8
-rw-r--r--lass/1systems/prism/config.nix7
4 files changed, 15 insertions, 15 deletions
diff --git a/lass/1systems/daedalus/config.nix b/lass/1systems/daedalus/config.nix
index 36daea1d5..e1bce5da8 100644
--- a/lass/1systems/daedalus/config.nix
+++ b/lass/1systems/daedalus/config.nix
@@ -33,10 +33,12 @@ with import <stockholm/lib>;
firefox
hexchat
networkmanagerapplet
+ libreoffice
];
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 = [
@@ -55,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";
diff --git a/lass/1systems/echelon/config.nix b/lass/1systems/echelon/config.nix
index 77958267d..6f96883bf 100644
--- a/lass/1systems/echelon/config.nix
+++ b/lass/1systems/echelon/config.nix
@@ -9,12 +9,8 @@ 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>
- <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 58f55ce68..4d2f8b0f8 100644
--- a/lass/1systems/mors/config.nix
+++ b/lass/1systems/mors/config.nix
@@ -24,10 +24,11 @@ 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>
+ <stockholm/lass/2configs/c-base.nix>
{
#risk of rain port
krebs.iptables.tables.filter.INPUT.rules = [
@@ -35,11 +36,6 @@ with import <stockholm/lib>;
];
}
{
- services.elasticsearch = {
- enable = true;
- };
- }
- {
lass.umts = {
enable = true;
modem = "/dev/serial/by-id/usb-Lenovo_F5521gw_C12AD95CB7B78F90-if09";
diff --git a/lass/1systems/prism/config.nix b/lass/1systems/prism/config.nix
index 744bae551..b3f547452 100644
--- a/lass/1systems/prism/config.nix
+++ b/lass/1systems/prism/config.nix
@@ -39,9 +39,10 @@ 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>
{
lass.pyload.enable = true;
}
@@ -244,10 +245,6 @@ in {
OnUnitInactiveSec = "2min";
RandomizedDelaySec = "2min";
};
- krebs.repo-sync.repos.nixpkgs.timerConfig = {
- OnBootSec = "90min";
- OnUnitInactiveSec = "24h";
- };
}
{
lass.usershadow = {