diff options
| author | KJ Ørbekk <orbekk@google.com> | 2016-11-10 10:04:14 -0500 |
|---|---|---|
| committer | KJ Ørbekk <orbekk@google.com> | 2016-11-10 10:04:14 -0500 |
| commit | 0058e6a374e7322ee692647b0940694cd66dbfa3 (patch) | |
| tree | 5bc2c4b3cab3875ced1948dd7d22f7e5b375ab6c | |
| parent | 2ac6aaa9f9f82fc5643c513465cb7de92d82bc8d (diff) | |
| parent | 5629c2aecfb50d0787150ae9065eb2d55a3e94a5 (diff) | |
Merge branch 'master' of sabaki.orbekk.com:/storage/projects/dotfiles
| -rw-r--r-- | nixos/configuration.nix | 2 | ||||
| -rw-r--r-- | nixos/pincer.nix | 7 | ||||
| -rwxr-xr-x | xsession | 4 |
3 files changed, 12 insertions, 1 deletions
diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 89a8277..80570d0 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -75,8 +75,8 @@ geeqie gnupg myWine - minecraft mumble + wdfs # fonts source-code-pro diff --git a/nixos/pincer.nix b/nixos/pincer.nix index ee5f7ee..8d83954 100644 --- a/nixos/pincer.nix +++ b/nixos/pincer.nix @@ -48,6 +48,13 @@ }; }; + environment.systemPackages = with pkgs; + let + myMinecraft = minecraft.override { + jre = oraclejre8; + }; + in [ myMinecraft ]; + services.tlp.enable = true; services.tlp.extraConfig = '' # Needed for either SSD or btrfs. @@ -17,6 +17,10 @@ xsetroot -solid "#2A3462" trayer --edge top --align right --SetDockType true --SetPartialStrut true --expand true --width 100 --widthtype pixel --transparent true --alpha 0 --tint 0x000000 --height 18 & [[ $(hostname) == kikashi ]] && \ xinput set-prop "TPPS/2 IBM TrackPoint" "Device Accel Constant Deceleration" 0.5 +if [[ $(hostname) == pincer ]]; then + xinput set-prop "TPPS/2 IBM TrackPoint" "Device Accel Constant Deceleration" 0.5 + xinput set-prop "SynPS/2 Synaptics TouchPad" "Device Accel Constant Deceleration" 0.5 +fi [[ -f /etc/nixos/configuration.nix ]] || \ redshift -l 40:-70 -r -t 5500:3700 & exec xmonad |