Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'gum/master'

Browse Source
This commit is contained in:
lassulus 2016-10-27 14:59:47 +02:00
commit 98659a68c7
3 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
makefu/1systems/x.nix
View File

@ -32,7 +32,7 @@
# ../2configs/buildbot-standalone.nix # ../2configs/buildbot-standalone.nix
# hardware specifics are in here # hardware specifics are in here
../2configs/hw/tp-x220.nix ../2configs/hw/tp-x230.nix
../2configs/hw/rtl8812au.nix ../2configs/hw/rtl8812au.nix
../2configs/hw/bcm4352.nix ../2configs/hw/bcm4352.nix
# mount points # mount points
@ -46,7 +46,7 @@
# temporary modules # temporary modules
../2configs/temp/share-samba.nix ../2configs/temp/share-samba.nix
../2configs/laptop-backup.nix ../2configs/laptop-backup.nix
../2configs/temp/elkstack.nix #../2configs/temp/elkstack.nix
# ../2configs/temp/sabnzbd.nix # ../2configs/temp/sabnzbd.nix
../2configs/tinc/siem.nix ../2configs/tinc/siem.nix
#../2configs/torrent.nix #../2configs/torrent.nix
@ -62,7 +62,7 @@
environment.systemPackages = [ pkgs.passwdqc-utils pkgs.bintray-upload ]; environment.systemPackages = [ pkgs.passwdqc-utils pkgs.bintray-upload ];
# virtualisation.docker.enable = true; virtualisation.docker.enable = true;
# configure pulseAudio to provide a HDMI sink as well # configure pulseAudio to provide a HDMI sink as well
networking.firewall.enable = true; networking.firewall.enable = true;

6
makefu/2configs/deployment/mycube.connector.one.nix
View File

@ -6,7 +6,11 @@ let
external-ip = config.krebs.build.host.nets.internet.ip4.addr; external-ip = config.krebs.build.host.nets.internet.ip4.addr;
wsgi-sock = "${config.services.uwsgi.runDir}/uwsgi.sock"; wsgi-sock = "${config.services.uwsgi.runDir}/uwsgi.sock";
in { in {
services.redis.enable = true; services.redis = {
enable = true;
};
systemd.services.redis.serviceConfig.LimitNOFILE=10032;
services.uwsgi = { services.uwsgi = {
enable = true; enable = true;
user = "nginx"; user = "nginx";

18
makefu/2configs/hw/tp-x220.nix → makefu/2configs/hw/tp-x230.nix
View File

@ -5,9 +5,19 @@ with import <stockholm/lib>;
imports = [ ./tp-x2x0.nix ]; imports = [ ./tp-x2x0.nix ];
boot = { boot = {
kernelModules = [ "kvm-intel" "acpi_call" "tpm-rng" "tp_smapi" ]; # tp-smapi is not supported bt x230 anymore
extraModulePackages = [ config.boot.kernelPackages.tp_smapi ]; 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 ]; hardware.opengl.extraPackages = [ pkgs.vaapiIntel pkgs.vaapiVdpau ];
services.xserver = { services.xserver = {
videoDriver = "intel"; videoDriver = "intel";
@ -15,8 +25,8 @@ with import <stockholm/lib>;
Option "AccelMethod" "sna" Option "AccelMethod" "sna"
''; '';
}; };
# no entropy source working
security.rngd.enable = true; # security.rngd.enable = true;
services.xserver.displayManager.sessionCommands ='' services.xserver.displayManager.sessionCommands =''
xinput set-int-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation" 8 1 xinput set-int-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation" 8 1