Merge remote-tracking branch 'gum/master'

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