From 46ac10388aa15308f33454cbe75a3633a0f82150 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hannes=20K=C3=B6rber?= Date: Sun, 1 Nov 2015 01:37:32 +0100 Subject: [PATCH] Pre-cleanup. --- i3/i3/config | 14 ++++++++------ i3/i3/scripts/pa-volume.bash | 2 +- tmux/tmux.conf | 14 ++++++++++---- vim/vimrc | 1 + x/Xresources | 4 ++-- x/xinitrc | 8 +++++--- zsh/zshrc | 5 ++++- 7 files changed, 31 insertions(+), 17 deletions(-) diff --git a/i3/i3/config b/i3/i3/config index 92da36b..fc58b20 100644 --- a/i3/i3/config +++ b/i3/i3/config @@ -67,8 +67,8 @@ set $up k set $right l - set $splith c - set $splitv v + set $splith v + set $splitv c set $split_toggle x set $fullscreen f @@ -99,6 +99,10 @@ set $redshift_colortemp_day 6500 set $redshift_colortemp_night 4500 + gaps inner 10 + smart_gaps on + smart_borders on + ################################################################################ ### KEYBINDINGS ################################################################ ##################9############################################################# @@ -283,10 +287,11 @@ client.urgent #2f343a #900000 #ffffff #900000 ### APPLICATION SPECIFIC SETTINGS ############################################## ################################################################################ + for_window [class="^.*$"] border pixel 0 + for_window [class="^Wicd-client.py$"] floating enable for_window [class="^Xfce4-notifyd$"] floating enable , border none for_window [class="^Conky$"] floating enable - for_window [class="^Terminator$"] border 1pixel for_window [class="^Firefox$"] border none for_window [class="^Truecrypt$"] floating enable for_window [class="^URxvt$"] border 1pixel @@ -308,8 +313,6 @@ client.urgent #2f343a #900000 #ffffff #900000 #for_window [class="^Xfce4-panel$"] floating enable for_window [class="^Thunderbird$"] border none for_window [instance="^shutdown-menu$"] border normal - for_window [class="^VirtualBox$" ] border normal - for_window [class="^Virt-manager$" ] border normal #assign [class="^Thunderbird"] $workspace9 assign [class="^Firefox$" ] $workspace1 @@ -321,7 +324,6 @@ client.urgent #2f343a #900000 #ffffff #900000 assign [class="^Zim$" ] $workspace8 assign [class="^Thunderbird$" ] $workspace9 assign [class="^Skype$"] $workspace10 - assign [class="^Mumble"] $workspace10 assign [class="^Deluge$"] $workspace5 diff --git a/i3/i3/scripts/pa-volume.bash b/i3/i3/scripts/pa-volume.bash index 91d724f..7e0c553 100755 --- a/i3/i3/scripts/pa-volume.bash +++ b/i3/i3/scripts/pa-volume.bash @@ -36,7 +36,7 @@ setvol() { else newvol="$1" fi - pactl set-sink-volume $SINK $(( $newvol * 65536 / 100 )) + pactl set-sink-volume $SINKNAME $(( $newvol * 65536 / 100 )) } ismuted() { diff --git a/tmux/tmux.conf b/tmux/tmux.conf index 914354c..c1f33f6 100644 --- a/tmux/tmux.conf +++ b/tmux/tmux.conf @@ -14,11 +14,17 @@ unbind C-j set -s escape-time 0 set-window-option -g aggressive-resize on +bind -n WheelUpPane select-pane -t= \; copy-mode -e \; send-keys -M +bind -n WheelDownPane select-pane -t= \; send-keys -M -setw -g mode-mouse on -set -g mouse-select-pane on -set -g mouse-resize-pane on -set -g mouse-select-window on +bind -n C-WheelUpPane select-pane -t= \; copy-mode -e \; send-keys -M + +bind -t vi-copy C-WheelUpPane halfpage-up +bind -t vi-copy C-WheelDownPane halfpage-down +bind -t emacs-copy C-WheelUpPane halfpage-up +bind -t emacs-copy C-WheelDownPane halfpage-down + +set -g mouse on set -g mode-keys vi diff --git a/vim/vimrc b/vim/vimrc index 7b17ee7..54c19c3 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -24,6 +24,7 @@ Plugin 'tpope/vim-speeddating' Plugin 'tpope/vim-surround' Plugin 'junegunn/goyo.vim' Plugin 'junegunn/limelight.vim' +Plugin 'sheerun/vim-polyglot' "Plugin 'Lokaltog/vim-easymotion' "Plugin 'PeterRincker/vim-argumentative' diff --git a/x/Xresources b/x/Xresources index 846937b..d53a75f 100644 --- a/x/Xresources +++ b/x/Xresources @@ -8,7 +8,7 @@ URxvt.letterSpace: -1 ! clickable URLs URxvt.perl-ext-common: default,matcher,selection-to-clipboard -URxvt.url-launcher: /usr/bin/chromium +URxvt.url-launcher: /usr/bin/firefox URxvt.matcher.button: 1 URxvt.intensityStyles: false @@ -17,7 +17,7 @@ URxvt.intensityStyles: false URxvt.saveLines: 10000 -URxvt.fading: 30 +URxvt.fading: 20 URxvt.termName: urxvt diff --git a/x/xinitrc b/x/xinitrc index 2ee61de..b67594a 100755 --- a/x/xinitrc +++ b/x/xinitrc @@ -14,6 +14,8 @@ log() { log "xinitrc startup" +xsetroot -solid '#333333' + if [ -d /etc/X11/xinit/xinitrc.d ]; then for f in /etc/X11/xinit/xinitrc.d/*; do [ -x "$f" ] && . "$f" @@ -39,7 +41,7 @@ keyboard_repeat_delay=150 keyboard_repeat_speed=50 # path and options for the wallpaper changer script -path_wallchanger="$HOME/dev/projects/wallchanger/wallchanger" +path_wallchanger="$HOME/projects/wallchanger/wallchanger" wallchanger_pidfile="$RUNDIR/wallchanger.pid" wallpaper_directory="$HOME/pictures/wallpaper/misc" wallpaper_logfile="$LOGDIR/wallpaper.log" @@ -77,10 +79,10 @@ nice -n 10 ionice -c 3 dropboxd & &>> $LOGFILE # start the wallpaper changer log "starting $path_wallchanger" -{ +{ sleep 0 $path_wallchanger "$wallpaper_directory" "$wallpaper_interval" "$wallpaper_fallback" & - echo $! > "$wallchanger_pidfile" + echo $! > "$wallchanger_pidfile" } & &>> $LOGFILE # start redshift diff --git a/zsh/zshrc b/zsh/zshrc index fde6807..e9367fe 100644 --- a/zsh/zshrc +++ b/zsh/zshrc @@ -145,6 +145,8 @@ alias c="cd" alias l="ls" alias s="sudo" +alias cl="clear" + alias calc='python3 -ic "from math import *; import cmath"' # show non-printable characters by default @@ -155,6 +157,7 @@ alias zshrc="vim -c ':e ~/.zshrc' ; source ~/.zshrc" alias vim="nvim" + # rebase the current branch onto WTF ARE YOU DOING YOU ARE DRUNNK TO GO BED ##alias rebase="git rebase -i $(git branch --contains HEAD | grep -v '\*.*' | head -1)" @@ -258,7 +261,7 @@ fnottype() { find . -maxdepth 1 ! -type $1 } -http() { +httpcode() { curl http://httpcode.info/$1 }