diff --git a/i3/config b/i3/config index dd09644..2bf5b18 100644 --- a/i3/config +++ b/i3/config @@ -4,11 +4,12 @@ assign [class=Firefox] 2 assign [class=midori4] 2 assign [class=Chromium-browser] 2 exec --no-startup-id "zsh -c 'xrandr --output LVDS1 --primary || xrandr --output HDMI3 --primary'" +bindsym --release Num_Lock exec --no-startup-id xdotool key --clearmodifiers ctrl+insert bindsym $mod+apostrophe bar mode hide bindsym $mod+shift+apostrophe bar mode dock bindsym $mod+shift+d exec i3-input -F 'rename workspace to "%s"' -P 'Rename to: ' bindsym $mod+semicolon exec quickswitch.py -d 'rofi -dmenu' -#bindsym $mod+semicolon exec rofi -term urxvt -show window $() +#bindsym $mod+semicolon exec rofi -term termite -show window $() bindsym $mod+p exec rofi -show run bindsym $mod+shift+p exec "~/.i3/run.sh pass" #exec xrandr --output HDMI3 --left-of HDMI1 & @@ -90,8 +91,8 @@ bindsym $mod+z exec xdotool click 1 bindsym $mod+shift+z exec xdotool click 3 bindsym $mod+i border normal bindsym $mod+shift+i border 1pixel -bindsym $mod+Return exec urxvt -bindsym $mod+shift+Return exec urxvt -cd `xcwd` +bindsym $mod+Return exec termite +bindsym $mod+shift+Return exec termite -d `xcwd` bindsym $mod+shift+c kill bindsym $mod+c move absolute position center bindsym $mod+F1 exec "~/.i3/run.sh lock" @@ -187,7 +188,7 @@ exec --no-startup-id xmodmap ~/.xmodmap exec --no-startup-id /home/stonewareslord/xmodmap.sh #exec --no-startup-id i3-msg /usr/bin/redshift t -l 36.3:-80.3 -t 2000:2000 # exec --no-startup-id i3-msg 'workspace 2; exec /usr/bin/firefox' -exec --no-startup-id i3-msg 'workspace 1; exec /usr/bin/urxvt' +exec --no-startup-id i3-msg 'workspace 1; exec /usr/bin/termite' exec --no-startup-id /usr/bin/shutter --min_at_startup #exec --no-startup-id "sleep 25;/usr/bin/owncloud" exec --no-startup-id /usr/bin/redshift -l 36.3:-80.3 -t 4000:2000 diff --git a/shells/zshrc b/shells/zshrc index 2606e23..897df7f 100644 --- a/shells/zshrc +++ b/shells/zshrc @@ -1,3 +1,7 @@ +if [ "$TERM" = "xterm-termite" ] ; then + #Termite is in colors, but it doesn't like to tell anyone + export TERM="xterm-256color" +fi echo -ne '[ ]\r' export HISTFILE=$HOME/.zsh_history for config (~/.zsh/*.zsh) source $config @@ -260,7 +264,7 @@ rc(){ mask) sudo vim /etc/portage/package.mask/package.mask;; accept_keywords) sudo vim /etc/portage/package.accept_keywords/package.accept_keywords;; license) sudo vim /etc/portage/package.license/package.license;; - *) echo "Opts:\nz v i\nuse make unmask mask accept_keywords" + *) echo "Opts:\nz v i\nuse make unmask mask accept_keywords license" esac } pub-git-init(){ diff --git a/vim/vimrc b/vim/vimrc index 56d25eb..d037966 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -274,8 +274,6 @@ endif "More snippets | https://github.com/honza/vim-snippets Plug 'othree/eregex.vim' "Real regexes in vim | https://github.com/othree/eregex.vim - Plug 'Rykka/colorv.vim' - "Color selection in vim | https://github.com/Rykka/colorv.vim Plug 'vim-scripts/DoxygenToolkit.vim' "Doxygen | https://github.com/vim-scripts/DoxygenToolkit.vim Plug 'mhinz/vim-signify' @@ -284,18 +282,12 @@ endif "Automatic pairs | https://github.com/jiangmiao/auto-pairs Plug 'https://github.com/Valloric/YouCompleteMe' " "Autocompletion | https://github.com/Valloric/YouCompleteMe - Plug 'https://github.com/joonty/vdebug' - "Php debugging | https://github.com/joonty/vdebug - Plug 'https://github.com/zenbro/mirror.vim' - "Edit files remotely | https://github.com/zenbro/mirror.vim Plug 'https://github.com/xolox/vim-easytags' "Vim tags | https://github.com/xolox/vim-easytags Plug 'https://github.com/xolox/vim-misc' "Misc (required for easytags) | https://github.com/xolox/vim-misc Plug 'https://austenwares.com/gogs/stonewareslord/vim-java-getset.git' "Java getters and setters| gogs@austenwares.com:stonewareslord/vim-java-getset.git - Plug 'https://github.com/majutsushi/tagbar' - " | https://github.com/majutsushi/tagbar " } " Style { Plug 'nathanaelkane/vim-indent-guides' @@ -336,6 +328,14 @@ endif " "Colored parenthesis | https://github.com/kien/rainbow_parentheses.vim "Plug 'vim-scripts/SyntaxRange' "Range of syntaxes | https://github.com/vim-scripts/SyntaxRange + "Plug 'https://github.com/majutsushi/tagbar' + " " | https://github.com/majutsushi/tagbar + "Plug 'Rykka/colorv.vim' + " "Color selection in vim | https://github.com/Rykka/colorv.vim + "Plug 'https://github.com/joonty/vdebug' + " "Php debugging | https://github.com/joonty/vdebug + "Plug 'https://github.com/zenbro/mirror.vim' + " "Edit files remotely | https://github.com/zenbro/mirror.vim " } call plug#end() filetype plugin indent on