diff options
| author | makefu <github@syntax-fehler.de> | 2016-10-27 14:55:50 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2016-10-27 14:55:50 +0200 |
| commit | 2e22fa7234c95cccb1680fb47954f339e6e0b326 (patch) | |
| tree | a2ef52330bd7cc303df4665bd1f94e0077debc63 /makefu | |
| parent | 32fff8c80eb49a0b8a121e487915f808ddbd7ea8 (diff) | |
m 2 hw: Plot twist - x220 was an x230 ALL ALONG!
Diffstat (limited to 'makefu')
| -rw-r--r-- | makefu/1systems/x.nix | 6 | ||||
| -rw-r--r-- | makefu/2configs/hw/tp-x230.nix (renamed from makefu/2configs/hw/tp-x220.nix) | 18 |
2 files changed, 17 insertions, 7 deletions
diff --git a/makefu/1systems/x.nix b/makefu/1systems/x.nix index e7f5d0dae..e1aec360d 100644 --- a/makefu/1systems/x.nix +++ b/makefu/1systems/x.nix @@ -32,7 +32,7 @@ # ../2configs/buildbot-standalone.nix # hardware specifics are in here - ../2configs/hw/tp-x220.nix + ../2configs/hw/tp-x230.nix ../2configs/hw/rtl8812au.nix ../2configs/hw/bcm4352.nix # mount points @@ -46,7 +46,7 @@ # temporary modules ../2configs/temp/share-samba.nix ../2configs/laptop-backup.nix - ../2configs/temp/elkstack.nix + #../2configs/temp/elkstack.nix # ../2configs/temp/sabnzbd.nix ../2configs/tinc/siem.nix #../2configs/torrent.nix @@ -62,7 +62,7 @@ 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 networking.firewall.enable = true; 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 |