From e1e8b63fc3fee5db003feb2cde926e85076d34a3 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Mon, 24 Aug 2015 11:04:17 +0200
Subject: [PATCH 1/2] makefu/x200: fix issue broken vlc, wheel on middle click
---
makefu/2configs/tp-x200.nix | 7 +++++++
makefu/2configs/tp-x220.nix | 3 +++
makefu/2configs/tp-x2x0.nix | 7 +------
3 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/makefu/2configs/tp-x200.nix b/makefu/2configs/tp-x200.nix
index aed6d6448..ed46875d8 100644
--- a/makefu/2configs/tp-x200.nix
+++ b/makefu/2configs/tp-x200.nix
@@ -11,4 +11,11 @@ with lib;
};
services.thinkfan.enable = true;
+
+ # only works on tp-x200 , not x220
+ services.xserver.displayManager.sessionCommands = ''
+ xinput set-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation" 1
+ xinput set-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation Button" 2
+ xinput set-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation Timeout" 200
+ '';
}
diff --git a/makefu/2configs/tp-x220.nix b/makefu/2configs/tp-x220.nix
index d079d5b37..1aacb07cd 100644
--- a/makefu/2configs/tp-x220.nix
+++ b/makefu/2configs/tp-x220.nix
@@ -6,6 +6,9 @@ with lib;
imports = [ ./tp-x2x0.nix ];
boot.kernelModules = [ "kvm-intel" ];
+
+ services.xserver.vaapiDrivers = [pkgs.vaapiIntel pkgs.vaapiVdpau ];
+
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 Button" 8 2
diff --git a/makefu/2configs/tp-x2x0.nix b/makefu/2configs/tp-x2x0.nix
index e65563014..b79d94b4a 100644
--- a/makefu/2configs/tp-x2x0.nix
+++ b/makefu/2configs/tp-x2x0.nix
@@ -2,7 +2,7 @@
with lib;
{
- # TODO: pot this somewhere else
+ # TODO: put this somewhere else
networking.wireless.enable = true;
hardware.enableAllFirmware = true;
@@ -14,11 +14,6 @@ with lib;
hardware.trackpoint.enable = true;
hardware.trackpoint.sensitivity = 220;
hardware.trackpoint.speed = 220;
- services.xserver.displayManager.sessionCommands = ''
- xinput set-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation" 1
- xinput set-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation Button" 2
- xinput set-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation Timeout" 200
- '';
services.tlp.enable = true;
services.tlp.extraConfig = ''
From a0f6ac66e1420d9e3efa0443e05aee13b313b6d3 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Mon, 24 Aug 2015 11:06:10 +0200
Subject: [PATCH 2/2] makefu: add virtualization
---
makefu/1systems/pornocauster.nix | 8 +++++++-
makefu/2configs/virtualization.nix | 8 ++++++++
makefu/2configs/wwan.nix | 2 ++
3 files changed, 17 insertions(+), 1 deletion(-)
create mode 100644 makefu/2configs/virtualization.nix
diff --git a/makefu/1systems/pornocauster.nix b/makefu/1systems/pornocauster.nix
index 218594533..40aa5bb1f 100644
--- a/makefu/1systems/pornocauster.nix
+++ b/makefu/1systems/pornocauster.nix
@@ -9,13 +9,19 @@
../2configs/base.nix
../2configs/main-laptop.nix #< base-gui
+ # Krebs
../2configs/tinc-basic-retiolum.nix
+ #../2configs/disable_v6.nix
+
#../2configs/sda-crypto-root.nix
../2configs/sda-crypto-root-home.nix
../2configs/zsh-user.nix
+
+ # applications
../2configs/exim-retiolum.nix
- #../2configs/disable_v6.nix
+ ../2configs/virtualization.nix
+ ../2configs/wwan.nix
# hardware specifics are in here
../2configs/tp-x220.nix
diff --git a/makefu/2configs/virtualization.nix b/makefu/2configs/virtualization.nix
new file mode 100644
index 000000000..b3f8c8284
--- /dev/null
+++ b/makefu/2configs/virtualization.nix
@@ -0,0 +1,8 @@
+{ config, lib, pkgs, ... }:
+
+let
+ mainUser = config.krebs.build.user;
+in {
+ virtualisation.libvirtd.enable = true;
+ users.extraUsers.${mainUser.name}.extraGroups = [ "libvirtd" ];
+}
diff --git a/makefu/2configs/wwan.nix b/makefu/2configs/wwan.nix
index 1492213bb..dd1c63090 100644
--- a/makefu/2configs/wwan.nix
+++ b/makefu/2configs/wwan.nix
@@ -1,5 +1,7 @@
{ config, lib, pkgs, ... }:
+#usage: $ wvdial
+
let
mainUser = config.krebs.build.user;
in {