summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2019-10-16 11:40:22 +0200
committerlassulus <lassulus@lassul.us>2019-10-16 11:40:22 +0200
commite5ffd26362202ad762e15e3f402ba84a559e6873 (patch)
tree71e0cfccf60252a50813dbc7b1e0b4d6a03b29ab
parent1cfe17faa0b5b2d062da0b3cdbda34b1241dac02 (diff)
parent2727ce115349ca65c5728acf846a537cb539a4c7 (diff)
Merge remote-tracking branch 'ni/master'
-rw-r--r--krebs/2configs/exim-smarthost.nix5
-rw-r--r--tv/1systems/alnus/config.nix3
-rw-r--r--tv/1systems/mu/config.nix1
-rw-r--r--tv/1systems/querel/config.nix1
4 files changed, 7 insertions, 3 deletions
diff --git a/krebs/2configs/exim-smarthost.nix b/krebs/2configs/exim-smarthost.nix
index 5dc24f1de..698e20da1 100644
--- a/krebs/2configs/exim-smarthost.nix
+++ b/krebs/2configs/exim-smarthost.nix
@@ -25,12 +25,11 @@ in {
in {
"anmeldung@eloop.org" = eloop-ml;
"brain@krebsco.de" = brain-ml;
- "cfp@eloop.org" = eloop-ml;
+ "cfp2019@eloop.org" = eloop-ml;
+ "eloop2019@krebsco.de" = eloop-ml;
"kontakt@eloop.org" = eloop-ml;
"root@eloop.org" = eloop-ml;
"youtube@eloop.org" = eloop-ml;
- "eloop2016@krebsco.de" = eloop-ml;
- "eloop2017@krebsco.de" = eloop-ml;
"postmaster@krebsco.de" = spam-ml; # RFC 822
"lass@krebsco.de" = lass;
"makefu@krebsco.de" = makefu;
diff --git a/tv/1systems/alnus/config.nix b/tv/1systems/alnus/config.nix
index 949a98b2a..d54d5fc2f 100644
--- a/tv/1systems/alnus/config.nix
+++ b/tv/1systems/alnus/config.nix
@@ -65,10 +65,13 @@ with import <stockholm/lib>;
enable = true;
layout = "de";
xkbOptions = "eurosign:e";
+
+ libinput.enable = false;
synaptics = {
enable = true;
twoFingerScroll = true;
};
+
desktopManager.xfce.enable = true;
displayManager.auto = {
enable = true;
diff --git a/tv/1systems/mu/config.nix b/tv/1systems/mu/config.nix
index 98332b2d6..145c73c06 100644
--- a/tv/1systems/mu/config.nix
+++ b/tv/1systems/mu/config.nix
@@ -102,6 +102,7 @@ with import <stockholm/lib>;
services.xserver.xkbOptions = "eurosign:e";
# TODO this is host specific
+ services.xserver.libinput.enable = false;
services.xserver.synaptics = {
enable = true;
twoFingerScroll = true;
diff --git a/tv/1systems/querel/config.nix b/tv/1systems/querel/config.nix
index 6e7944cdf..ac51f54e6 100644
--- a/tv/1systems/querel/config.nix
+++ b/tv/1systems/querel/config.nix
@@ -68,6 +68,7 @@ with import <stockholm/lib>;
services.xserver.layout = "de";
services.xserver.xkbOptions = "eurosign:e";
+ services.xserver.libinput.enable = false;
services.xserver.synaptics = {
enable = true;
twoFingerScroll = true;