add changes for jarvis

auto-flake-update
Yorick van Pelt 2016-12-08 02:34:20 +01:00
parent 38d5848fe8
commit 12aa87c340
3 changed files with 10 additions and 9 deletions

View File

@ -8,7 +8,7 @@
E_NOARGS=75 E_NOARGS=75
backlight_path=/sys/class/backlight/nv_backlight backlight_path=`echo /sys/class/backlight/*_backlight`
usage() { usage() {
echo "Usage: brightne.sh [set|fix|up|down] arg between 0 and 1000" echo "Usage: brightne.sh [set|fix|up|down] arg between 0 and 1000"

View File

@ -1,6 +1,6 @@
{writeTextDir, writeScript, lib, {writeTextDir, writeScript, lib,
rofi, xss-lock, nitrogen, compton-git, i3status, i3-gaps rofi, xss-lock, nitrogen, compton-git, i3status, i3-gaps
, i3lock-fancy, xset, alsaUtils, brightness, screenshot_public, , i3lock-fancy, xset, alsaUtils, brightness, screenshot_public, xorg,
with_lock ? true}: with_lock ? true}:
let let
@ -26,7 +26,7 @@ set $mod Mod4
gaps inner 5 gaps inner 5
gaps outer 5 gaps outer 5
font pango:Source Code Pro 9 font pango:Source Code Pro 10
# Before i3 v4.8, we used to recommend this one as the default: # Before i3 v4.8, we used to recommend this one as the default:
# font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1 # font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
@ -171,12 +171,13 @@ exec --no-startup-id ${compton-git}/bin/compton --config /home/yorick/dotfiles/x
'' + (lib.optionalString with_lock '' '' + (lib.optionalString with_lock ''
exec --no-startup-id ${xorg.xf86inputsynaptics}/bin/syndaemon -i 0.5 -k -t
exec --no-startup-id ${xss-lock}/bin/xss-lock -l -- ${locker} exec --no-startup-id ${xss-lock}/bin/xss-lock -l -- ${locker}
'') + '' '') + ''
bindsym XF86MonBrightnessUp exec ${brightness}/bin/brightness up 10 bindsym XF86MonBrightnessUp exec ${brightness}/bin/brightness up 20
bindsym XF86MonBrightnessDown exec ${brightness}/bin/brightness down 10 bindsym XF86MonBrightnessDown exec ${brightness}/bin/brightness down 20
bindsym XF86AudioLowerVolume exec ${alsaUtils}/bin/amixer set Master 1%- bindsym XF86AudioLowerVolume exec ${alsaUtils}/bin/amixer set Master 1%-
bindsym XF86AudioRaiseVolume exec ${alsaUtils}/bin/amixer set Master 1%+ bindsym XF86AudioRaiseVolume exec ${alsaUtils}/bin/amixer set Master 1%+
bindsym XF86AudioMute exec ${alsaUtils}/bin/amixer set Master toggle bindsym XF86AudioMute exec ${alsaUtils}/bin/amixer set Master toggle

View File

@ -77,7 +77,7 @@
doCheck = false; doCheck = false;
}; };
yscripts = pkgs.callPackage ../../bin {}; yscripts = pkgs.callPackage ../dotfiles/bin {};
envs = recurseIntoAttrs { envs = recurseIntoAttrs {
@ -85,7 +85,7 @@
de = mkEnv "y-de-deps" [ de = mkEnv "y-de-deps" [
gtk-engine-murrine gtk-engine-murrine
hicolor_icon_theme hicolor_icon_theme
arc-theme #arc-theme
libnotify libnotify
rxvt_unicode rxvt_unicode
arandr arandr
@ -110,7 +110,7 @@
keepassx keepassx
# libreoffice # libreoffice
skype skype
(builtins.storePath /nix/store/7kbr1k40v56q8qr65dbrm0yz42nz20qv-spotify-1.0.37.152.gc83ea995-42 ) spotify
kde4.quasselClientWithoutKDE kde4.quasselClientWithoutKDE
sublime3 sublime3
leafpad leafpad
@ -179,7 +179,7 @@
games = mkEnv "y-games" [ games = mkEnv "y-games" [
# steam openttd wine winetricks minecraft # steam openttd wine winetricks minecraft
openttd # steam steam
]; ];
js = mkEnv "y-jsdev" [ js = mkEnv "y-jsdev" [