Merge branch 'makefu'

This commit is contained in:
lassulus 2015-08-24 13:07:25 +02:00
commit c2714ce8ce
6 changed files with 28 additions and 7 deletions

View File

@ -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

View File

@ -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
'';
}

View File

@ -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

View File

@ -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 = ''

View File

@ -0,0 +1,8 @@
{ config, lib, pkgs, ... }:
let
mainUser = config.krebs.build.user;
in {
virtualisation.libvirtd.enable = true;
users.extraUsers.${mainUser.name}.extraGroups = [ "libvirtd" ];
}

View File

@ -1,5 +1,7 @@
{ config, lib, pkgs, ... }:
#usage: $ wvdial
let
mainUser = config.krebs.build.user;
in {