summaryrefslogtreecommitdiffstats
path: root/makefu/2configs
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2016-10-27 14:59:47 +0200
committerlassulus <lass@aidsballs.de>2016-10-27 14:59:47 +0200
commit98659a68c7c40bee92e851afcf5a9bebeb3e2a06 (patch)
treeef9ed3bce885ad39eccc35a79b069bf269ae939a /makefu/2configs
parent3306e32498fc0c784ec6975a7911bf84d5ff1091 (diff)
parent2e22fa7234c95cccb1680fb47954f339e6e0b326 (diff)
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/2configs')
-rw-r--r--makefu/2configs/deployment/mycube.connector.one.nix6
-rw-r--r--makefu/2configs/hw/tp-x230.nix (renamed from makefu/2configs/hw/tp-x220.nix)18
2 files changed, 19 insertions, 5 deletions
diff --git a/makefu/2configs/deployment/mycube.connector.one.nix b/makefu/2configs/deployment/mycube.connector.one.nix
index 2877d2227..091b7f21b 100644
--- a/makefu/2configs/deployment/mycube.connector.one.nix
+++ b/makefu/2configs/deployment/mycube.connector.one.nix
@@ -6,7 +6,11 @@ let
external-ip = config.krebs.build.host.nets.internet.ip4.addr;
wsgi-sock = "${config.services.uwsgi.runDir}/uwsgi.sock";
in {
- services.redis.enable = true;
+ services.redis = {
+ enable = true;
+ };
+ systemd.services.redis.serviceConfig.LimitNOFILE=10032;
+
services.uwsgi = {
enable = true;
user = "nginx";
diff --git a/makefu/2configs/hw/tp-x220.nix b/makefu/2configs/hw/tp-x230.nix
index ce3e34ad3..99563a771 100644
--- a/makefu/2configs/hw/tp-x220.nix
+++ b/makefu/2configs/hw/tp-x230.nix
@@ -5,9 +5,19 @@ with import <stockholm/lib>;
imports = [ ./tp-x2x0.nix ];
boot = {
- kernelModules = [ "kvm-intel" "acpi_call" "tpm-rng" "tp_smapi" ];
- extraModulePackages = [ config.boot.kernelPackages.tp_smapi ];
+ # tp-smapi is not supported bt x230 anymore
+ kernelModules = [
+ "kvm-intel"
+ "thinkpad_ec"
+ # "acpi_call"
+ # "thinkpad_acpi"
+ # "tpm-rng"
+ ];
+ extraModulePackages = [
+ # config.boot.kernelPackages.acpi_call
+ ];
};
+ services.acpid.enable = true;
hardware.opengl.extraPackages = [ pkgs.vaapiIntel pkgs.vaapiVdpau ];
services.xserver = {
videoDriver = "intel";
@@ -15,8 +25,8 @@ with import <stockholm/lib>;
Option "AccelMethod" "sna"
'';
};
-
- security.rngd.enable = true;
+ # no entropy source working
+ # security.rngd.enable = true;
services.xserver.displayManager.sessionCommands =''
xinput set-int-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation" 8 1