diff options
| author | lassulus <lass@aidsballs.de> | 2016-02-16 17:15:00 +0100 |
|---|---|---|
| committer | lassulus <lass@aidsballs.de> | 2016-02-16 17:15:00 +0100 |
| commit | 0b0b0d65ee05583529df831985580e392713d29a (patch) | |
| tree | 7eb6799a996924d8e895c54633a47ea3d7a92a4c /tv/2configs/hw | |
| parent | 3d30e9cc9014ec6189410944015d3cd7d5ca95a6 (diff) | |
| parent | b7a92f63884af00eb0243ec9328be689a6c9b845 (diff) | |
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'tv/2configs/hw')
| -rw-r--r-- | tv/2configs/hw/AO753.nix | 4 | ||||
| -rw-r--r-- | tv/2configs/hw/x220.nix | 16 |
2 files changed, 2 insertions, 18 deletions
diff --git a/tv/2configs/hw/AO753.nix b/tv/2configs/hw/AO753.nix index 72a40819f..b81b773be 100644 --- a/tv/2configs/hw/AO753.nix +++ b/tv/2configs/hw/AO753.nix @@ -1,6 +1,6 @@ { config, lib, pkgs, ... }: -with lib; +with config.krebs.lib; { imports = [ @@ -41,5 +41,5 @@ with lib; HandleSuspendKey=ignore ''; - nixpkgs.config.allowUnfreePredicate = pkg: hasPrefix "broadcom-sta-" pkg.name; + krebs.nixpkgs.allowUnfreePredicate = pkg: hasPrefix "broadcom-sta-" pkg.name; } diff --git a/tv/2configs/hw/x220.nix b/tv/2configs/hw/x220.nix index 7cec670fa..9b3dd122a 100644 --- a/tv/2configs/hw/x220.nix +++ b/tv/2configs/hw/x220.nix @@ -5,18 +5,11 @@ ../smartd.nix ]; - boot.initrd.availableKernelModules = [ "ahci" ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.loader.gummiboot.enable = true; boot.loader.efi.canTouchEfiVariables = true; networking.wireless.enable = true; - #hardware.enableAllFirmware = true; - #zramSwap.enable = true; - #zramSwap.numDevices = 2; - hardware.trackpoint = { enable = true; sensitivity = 220; @@ -46,14 +39,5 @@ services.xserver = { videoDriver = "intel"; vaapiDrivers = [ pkgs.vaapiIntel pkgs.vaapiVdpau ]; - deviceSection = '' - Option "AccelMethod" "sna" - ''; }; - - #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 - # xinput set-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation Axes" 6 7 4 5 - #''; } |