From 1a1041ae7e58d300292a9d93931a4dc580fd6625 Mon Sep 17 00:00:00 2001 From: Austen Adler Date: Thu, 15 Jan 2015 12:42:10 -0500 Subject: [PATCH] i3 changes --- i3/config | 58 ++++++++++++++++++++++++------------------------ i3/i3status.conf | 4 ++-- scripts/sync.sh | 17 +++++++------- 3 files changed, 40 insertions(+), 39 deletions(-) diff --git a/i3/config b/i3/config index f4748a8..768ad79 100644 --- a/i3/config +++ b/i3/config @@ -1,6 +1,6 @@ set $mod Mod4 exec --no-startup-id "zsh -c 'xrandr --output LVDS1 --primary || xrandr --output HDMI3 --primary'" -bindsym $mod+d exec i3-input -F 'rename workspace to "%s"' -P 'Rename to: ' +bindsym $mod+shift+d exec i3-input -F 'rename workspace to "%s"' -P 'Rename to: ' #exec xrandr --output HDMI3 --left-of HDMI1 & #exec xmodmap ~/.Xmodmap & @@ -52,7 +52,7 @@ new_window pixel 1 # split in vertical orientation bindsym $mod+v split h # split in horizontal orientation -bindsym $mod+Shift+v split v +bindsym $mod+shift+v split v # split in vertical orientation @@ -75,8 +75,8 @@ mode "resize" { #font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1 floating_modifier $mod bindsym $mod+Return exec xterm -bindsym $mod+Shift+Return exec xterm -e "cd `xcwd`&&/bin/zsh" -bindsym $mod+Shift+c kill +bindsym $mod+shift+Return exec xterm -e "cd `xcwd`&&/bin/zsh" +bindsym $mod+shift+c kill bindsym $mod+c move absolute position center bindsym XF86TouchpadToggle exec "synclient TouchpadOff=$(synclient -l | grep -c 'TouchpadOff.*=.*0')" bindsym XF86AudioRaiseVolume exec "amixer set Master 5%+ unmute" @@ -90,19 +90,19 @@ bindsym $mod+Left focus left bindsym $mod+Down focus down bindsym $mod+Up focus up bindsym $mod+Right focus right -bindsym $mod+Shift+h move left -bindsym $mod+Shift+j move down -bindsym $mod+Shift+k move up -bindsym $mod+Shift+l move right -bindsym $mod+Shift+Left move left -bindsym $mod+Shift+Down move down -bindsym $mod+Shift+Up move up -bindsym $mod+Shift+Right move right +bindsym $mod+shift+h move left +bindsym $mod+shift+j move down +bindsym $mod+shift+k move up +bindsym $mod+shift+l move right +bindsym $mod+shift+Left move left +bindsym $mod+shift+Down move down +bindsym $mod+shift+Up move up +bindsym $mod+shift+Right move right bindsym $mod+f fullscreen bindsym $mod+s layout stacking bindsym $mod+w layout tabbed bindsym $mod+e layout toggle split -bindsym $mod+Shift+space floating toggle +bindsym $mod+shift+space floating toggle bindsym $mod+space focus mode_toggle # bindsym $mod+space workspace back_and_forth bindsym $mod+o workspace back_and_forth @@ -119,31 +119,31 @@ bindsym $mod+7 workspace 7 bindsym $mod+8 workspace 8 bindsym $mod+9 workspace 9 bindsym $mod+0 workspace 10 -bindsym $mod+Shift+1 move container to workspace 1 -bindsym $mod+Shift+2 move container to workspace 2 -bindsym $mod+Shift+3 move container to workspace 3 -bindsym $mod+Shift+4 move container to workspace 4 -bindsym $mod+Shift+5 move container to workspace 5 -bindsym $mod+Shift+6 move container to workspace 6 -bindsym $mod+Shift+7 move container to workspace 7 -bindsym $mod+Shift+8 move container to workspace 8 -bindsym $mod+Shift+9 move container to workspace 9 -bindsym $mod+Shift+0 move container to workspace 10 -bindsym $mod+Shift+r reload -bindsym $mod+Shift+minus exec --no-startup-id banshee --previous -bindsym $mod+Shift+equal exec --no-startup-id banshee --next +bindsym $mod+shift+1 move container to workspace 1 +bindsym $mod+shift+2 move container to workspace 2 +bindsym $mod+shift+3 move container to workspace 3 +bindsym $mod+shift+4 move container to workspace 4 +bindsym $mod+shift+5 move container to workspace 5 +bindsym $mod+shift+6 move container to workspace 6 +bindsym $mod+shift+7 move container to workspace 7 +bindsym $mod+shift+8 move container to workspace 8 +bindsym $mod+shift+9 move container to workspace 9 +bindsym $mod+shift+0 move container to workspace 10 +bindsym $mod+shift+r reload +bindsym $mod+shift+minus exec --no-startup-id banshee --previous +bindsym $mod+shift+equal exec --no-startup-id banshee --next bindsym $mod+minus exec --no-startup-id banshee --pause bindsym $mod+equal exec --no-startup-id banshee --play # To initialize wallpapers, run: # export DISPLAY=:0.0;mkdir -p ~/.i3/wall;cp ~/ownCloud/wallpaper/std/* ~/.i3/wall;cd ~/.i3/wall;rename -v 's/(.* )+//' *;mogrify -resize `xrandr -q|perl -F'\s|,' -lane "/^Sc/&&print join '',@F[8..10]"`^ -verbose -gravity center -format png *;rm *.jpg;rm *.jpeg bindsym $mod+grave exec "i3lock -di `echo $(shuf -n1 -e ~/.i3/wall/*) | tee /tmp/wall`" -bindsym $mod+Shift+grave exec "sudo pm-suspend | i3lock -di `echo $(shuf -n1 -e ~/.i3/wall/*) | tee /tmp/wall`" +bindsym $mod+shift+grave exec "sudo pm-suspend | i3lock -di `echo $(shuf -n1 -e ~/.i3/wall/*) | tee /tmp/wall`" # Tees the filename to /tmp/wall for debugging # restart i3 inplace (preserves your layout/session, can be used to upgrade i3) bindsym $mod+q restart # exit i3 (logs you out of your X session) -bindsym $mod+Shift+q exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -b 'Yes, exit i3' 'i3-msg exit'" +bindsym $mod+shift+q exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -b 'Yes, exit i3' 'i3-msg exit'" # resize window (you can also use the mouse for that) @@ -156,7 +156,7 @@ bindsym $mod+m focus mode_toggle # feh doesn't work with 2 monitors, so the wallOM folder exists for computers with 2 monitors #wallpaper -bindsym $mod+Shift+w exec "~/.i3/wall.sh" +bindsym $mod+shift+w exec "~/.i3/wall.sh" exec --no-startup-id "~/.i3/wall.sh" #startup exec --no-startup-id xmodmap ~/.xmodmap diff --git a/i3/i3status.conf b/i3/i3status.conf index b4b71a4..8014b1f 100644 --- a/i3/i3status.conf +++ b/i3/i3status.conf @@ -14,7 +14,7 @@ order += "disk /" order += "wireless wlan0" order += "ethernet p5p1" order += "volume master" -order += "path_exists VPN" +order += "path_exists V" order += "battery 1" order += "tztime local" wireless wlan0 { @@ -33,7 +33,7 @@ tztime local { load { format = "%5min" } -path_exists VPN { +path_exists V { path = "/proc/sys/net/ipv4/conf/tun0" } volume master { diff --git a/scripts/sync.sh b/scripts/sync.sh index ddfc847..447be54 100755 --- a/scripts/sync.sh +++ b/scripts/sync.sh @@ -48,9 +48,9 @@ while getopts ":hbsdpcw" VALUE "$@"; do if [ "$VALUE" = "c" ] ; then echo "Syncing config files" if which trash >/dev/null; then - trash ~/.gitconfig ~/.vimperatorrc ~/.vimperator/colors/vimPgray.vimp ~/.bashrc ~/.pylintrc ~/.zshrc ~/.tmux.conf ~/.config/synapse/gtkrc ~/.config/liquidpromptrc + trash ~/.gitconfig ~/.vimperatorrc ~/.vimperator/colors/vimPgray.vimp ~/.bashrc ~/.pylintrc ~/.zshrc ~/.tmux.conf ~/.config/liquidpromptrc else - rm ~/.gitconfig ~/.vimperatorrc ~/.vimperator/colors/vimPgray.vimp ~/.bashrc ~/.pylintrc ~/.zshrc ~/.tmux.conf ~/.config/synapse/gtkrc ~/.config/liquidpromptrc + rm ~/.gitconfig ~/.vimperatorrc ~/.vimperator/colors/vimPgray.vimp ~/.bashrc ~/.pylintrc ~/.zshrc ~/.tmux.conf ~/.config/liquidpromptrc fi # Install on all systems ln -s $ABSPATH/tmux/tmux.conf ~/.tmux.conf @@ -78,21 +78,22 @@ while getopts ":hbsdpcw" VALUE "$@"; do ln -s $ABSPATH/shells/liquidpromptrc ~/.config/liquidpromptrc if [ "$(uname)" != "Darwin" ]; then if which trash >/dev/null; then - trash ~/.i3/config ~/.i3/sleep.sh ~/.i3/wall.sh ~/.Xmodmap ~/.xsession ~/.Xresources + trash ~/.i3/config ~/.i3/sleep.sh ~/.i3/wall.sh ~/.i3/i3status.conf ~/.Xmodmap ~/.xsession ~/.config/synapse/gtkrc ~/.Xresources else - rm ~/.i3/config ~/.i3/sleep.sh ~/.i3/wall.sh ~/.Xmodmap ~/.xsession ~/.Xresources + rm ~/.i3/config ~/.i3/sleep.sh ~/.i3/wall.sh ~/i3status.conf ~/.Xmodmap ~/.xsession ~/.config/synapse/gtkrc ~/.Xresources fi # Don't install these on Mac - ln -s $ABSPATH/shells/Xresources ~/.Xresources - xrdb -merge ~/.Xresources + mkdir -p ~/.i3 ln -s $ABSPATH/i3/config ~/.i3/config - ln -s $ABSPATH/i3/wall.sh ~/.i3/wall.sh ln -s $ABSPATH/i3/sleep.sh ~/.i3/sleep.sh + ln -s $ABSPATH/i3/wall.sh ~/.i3/wall.sh + ln -s $ABSPATH/i3/i3status.conf ~/.i3/i3status.conf ln -s $ABSPATH/i3/Xmodmap ~/.Xmodmap ln -s $ABSPATH/i3/xsession ~/.xsession mkdir -p ~/.config/synapse ln -s $ABSPATH/i3/gtkrc ~/.config/synapse/gtkrc - mkdir -p ~/.i3 + ln -s $ABSPATH/shells/Xresources ~/.Xresources + xrdb -merge ~/.Xresources fi fi if [ "$VALUE" = "w" ] ; then