summaryrefslogtreecommitdiff
path: root/i3
diff options
context:
space:
mode:
authorKjetil Orbekk <kjetil.orbekk@gmail.com>2015-10-12 10:04:07 -0400
committerKjetil Orbekk <kjetil.orbekk@gmail.com>2015-10-12 10:04:07 -0400
commitf1ac8e846ce94e04339517a90ffd297bd901b44a (patch)
tree91f92f9d8e35c01b96ae40645cd7fce1db9b14e6 /i3
parent59b0b39e30804a653d04866a1b3f9784610006fc (diff)
parent404e60caa500606d324a4021fb42321d118a5223 (diff)
Merge branch 'master' of tesuji.6.orbekk.com:/storage/projects/dotfiles
Diffstat (limited to 'i3')
-rw-r--r--i3/config10
1 files changed, 2 insertions, 8 deletions
diff --git a/i3/config b/i3/config
index b964549..5dda98e 100644
--- a/i3/config
+++ b/i3/config
@@ -74,12 +74,6 @@ bindsym $mod+Shift+space floating toggle
# change focus between tiling / floating windows
bindsym $mod+space focus mode_toggle
-# focus the parent container
-bindsym $mod+a focus parent
-
-# focus the child container
-#bindsym $mod+d focus child
-
# switch to workspace
bindsym $mod+1 workspace 1
bindsym $mod+2 workspace 2
@@ -161,12 +155,12 @@ mode "resize" {
# Start i3bar to display a workspace bar (plus the system information i3status
# finds out, if available)
bar {
- status_command i3status
+ status_command i3blocks || i3status
font xft:Droid Sans Mono 8
}
exec xrdb -merge $HOME/.Xresources
-setxkbmap us -variant dvorak -option compose:ralt -option caps:ctrl_modifier
+exec setxkbmap us -variant dvorak -option compose:ralt -option caps:ctrl_modifier
exec $HOME/bin/keyboard_setup.sh
exec xbindkeys
exec xset -b