diff options
author | Kjetil Orbekk <kjetil.orbekk@gmail.com> | 2016-07-07 23:33:06 -0400 |
---|---|---|
committer | Kjetil Orbekk <kjetil.orbekk@gmail.com> | 2016-07-07 23:33:06 -0400 |
commit | dea69c9115e0ebca6ab3485561e2ee5bf3208411 (patch) | |
tree | 97835e965b5571f02442e4010afba61f774a0e19 | |
parent | e0e55c426e206f3765943fe7384e2cccdc1e58ff (diff) | |
parent | fdb77ecac4ee431a9d06909add24a80dbaf426a2 (diff) |
Merge branch 'master' of sabaki.kk.orbekk.com:/storage/projects/dotfiles
-rw-r--r-- | i3/config | 9 | ||||
-rw-r--r-- | i3status.conf | 8 | ||||
-rw-r--r-- | spacemacs | 2 | ||||
-rwxr-xr-x | xsession | 3 |
4 files changed, 20 insertions, 2 deletions
@@ -73,6 +73,11 @@ bindsym $mod+7 workspace 7 bindsym $mod+8 workspace 8 bindsym $mod+9 workspace 9 bindsym $mod+0 workspace 10 +bindsym $mod+apostrophe workspace 1 +bindsym $mod+comma workspace 2 +bindsym $mod+period workspace 3 +bindsym $mod+p workspace 4 +bindsym $mod+y workspace 5 # move focused container to workspace bindsym $mod+Shift+1 move workspace 1 @@ -144,7 +149,7 @@ mode "resize" { # finds out, if available) bar { status_command i3blocks || i3status - font xft:Droid Sans Mono 8 + font xft:Source Code Pro 10 } exec xrdb -merge $HOME/.Xresources @@ -153,5 +158,7 @@ exec $HOME/bin/keyboard_setup.sh exec $HOME/bin/local.sh exec xbindkeys exec xset -b +exec nm-applet & exec google-chrome & exec xautolock -time 10 -locker 'i3lock -c 2A3462' & +exec redshift -l 40:-70 -r -t 5500:3700 & diff --git a/i3status.conf b/i3status.conf index 0b3b483..8d4744d 100644 --- a/i3status.conf +++ b/i3status.conf @@ -11,6 +11,7 @@ order += "disk /" #order += "run_watch VPN" order += "wireless wlp4s0" order += "ethernet enp0s25" +order += "battery 1" order += "battery 0" order += "cpu_temperature 0" order += "load" @@ -37,6 +38,13 @@ ethernet enp0s25 { format_down = "" } +battery 1 { + last_full_capacity = true + low_threshold = 15 + threshold_type = time + format = "%status %percentage %remaining (%consumption)" +} + battery 0 { last_full_capacity = true low_threshold = 15 @@ -245,7 +245,7 @@ user code." '(("t" "Todo" entry (file+headline "~/org/in.org" "Tasks") "* TODO %?"))) (eval-after-load "org" '(require 'ox-md nil t)) - (global-git-commit-mode t) + ; (global-git-commit-mode t) ) (defun mu4e-config () @@ -13,4 +13,7 @@ $HOME/bin/keyboard_setup.sh /usr/bin/env pasystray & /usr/bin/env xsetroot -solid midnightblue /usr/bin/env 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 +redshift -l 40:-70 -r -t 5500:3700 & exec xmonad |