stonewareslord/sync
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

merge into: stonewareslord:feature/ansible
Branches Tags
stonewareslord:master
stonewareslord:stow
stonewareslord:feature/ansible
stonewareslord:develop
stonewareslord:dev/performance
...
pull from: stonewareslord:master
Branches Tags
stonewareslord:stow
stonewareslord:feature/ansible
stonewareslord:develop
stonewareslord:master
stonewareslord:dev/performance

7 Commits
feature/an ... master

Author SHA1 Message Date
Austen Adler
ff32f361e3 Changes 2018-07-02 20:18:44 -04:00
Austen Adler
74876043bb Merge branch 'master' of gaw:stonewareslord/sync 2018-07-02 15:47:34 -04:00
Austen Adler
2421524bfb Changes before moving to skel 2018-07-02 15:42:22 -04:00
Austen Adler
baccb69e82 Many minor changes 2018-04-19 14:38:50 -04:00
Austen Adler
b3da54fafa Add mktemp 2018-03-22 12:48:02 -04:00
Austen Adler
007eedce1f Force pluginstall and plugupdate 2018-03-22 12:47:59 -04:00
Austen Adler
97e0b16cfe Disable compton (high cpu) 2018-03-22 12:47:46 -04:00
8 changed files with 154 additions and 171 deletions
Show Stats Expand all files Collapse all files

3
i3/G2-status.conf
View File

@ -33,7 +33,8 @@ ethernet enp1s0 {
format_down = "!E" format_down = "!E"
} }
tztime local { tztime local {
format = "%a %b%e %r" #format = "%a %b%e %r"
format = "%a %e %b %F %r"
#:%M:%S #:%M:%S
} }
load { load {

28
i3/config
View File

@ -53,6 +53,8 @@ bindsym XF86AudioLowerVolume exec "amixer set Master 7%- unmute"
bindsym XF86AudioMute exec "amixer -D pulse set Master 1+ toggle;amixer set Master 0%" bindsym XF86AudioMute exec "amixer -D pulse set Master 1+ toggle;amixer set Master 0%"
# Toggle toucpad # Toggle toucpad
bindsym $mod+backslash exec "synclient TouchpadOff=$(synclient -l | grep -c 'TouchpadOff.*=.*0')" bindsym $mod+backslash exec "synclient TouchpadOff=$(synclient -l | grep -c 'TouchpadOff.*=.*0')"
# Toggle tap to click
bindsym $mod+shift+backslash exec "synclient TapButton2=$(($(synclient -l | grep -c 'TapButton1.*=.*0') * 3));synclient TapButton1=$(synclient -l | grep -c 'TapButton1.*=.*0')"
# Movement # Movement
bindsym $mod+o workspace back_and_forth bindsym $mod+o workspace back_and_forth
bindsym $mod+bracketleft workspace prev bindsym $mod+bracketleft workspace prev
@ -73,6 +75,11 @@ bindsym $mod+shift+Left move left
bindsym $mod+shift+Down move down bindsym $mod+shift+Down move down
bindsym $mod+shift+Up move up bindsym $mod+shift+Up move up
bindsym $mod+shift+Right move right bindsym $mod+shift+Right move right
# Moving to corners
bindsym $mod+ctrl+h exec "~/.i3/run.sh move left"
bindsym $mod+ctrl+j exec "~/.i3/run.sh move bottom"
bindsym $mod+ctrl+k exec "~/.i3/run.sh move top"
bindsym $mod+ctrl+l exec "~/.i3/run.sh move right"
# Fullscreen # Fullscreen
bindsym $mod+f fullscreen bindsym $mod+f fullscreen
bindsym $mod+shift+f fullscreen global bindsym $mod+shift+f fullscreen global
@ -82,7 +89,7 @@ bindsym $mod+w layout tabbed
bindsym $mod+e layout toggle split 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 focus mode_toggle
#bindsym $mod+space exec "~/.i3/run.sh window" bindsym $mod+comma exec "~/.i3/run.sh window"
bindsym $mod+1 $x_switch 1 bindsym $mod+1 $x_switch 1
bindsym $mod+2 $x_switch 2 bindsym $mod+2 $x_switch 2
bindsym $mod+3 $x_switch 3 bindsym $mod+3 $x_switch 3
@ -110,6 +117,8 @@ bindsym $mod+r mode "resize"
bindsym $mod+u focus parent bindsym $mod+u focus parent
bindsym $mod+shift+u focus child bindsym $mod+shift+u focus child
bindsym --release $mod+n exec "~/.i3/run.sh paste" bindsym --release $mod+n exec "~/.i3/run.sh paste"
# Reload i3
bindsym $mod+shift+r reload;exec notify-send -a i3 Reloaded
# Exit/restart i3 # Exit/restart i3
bindsym $mod+q restart bindsym $mod+q restart
#bindsym $mod+shift+q exec "i3-nagbar -m 'NMRestart/Shutdown/Restart/Logout' -t warning -b NMRestart 'nmcli radio wifi off;sleep 1;nmcli radio wifi on' -b Shutdown 'sudo /sbin/poweroff' -b Restart 'sudo /sbin/shutdown -r now' -b Logout 'i3-msg exit' -b Sleep 'amixer set Master 0% mute;slock&until echo mem|sudo tee /sys/power/state>/dev/null;do sleep 1;done;sleep 4;nmcli radio wifi off;sleep 3;nmcli radio wifi on'" #bindsym $mod+shift+q exec "i3-nagbar -m 'NMRestart/Shutdown/Restart/Logout' -t warning -b NMRestart 'nmcli radio wifi off;sleep 1;nmcli radio wifi on' -b Shutdown 'sudo /sbin/poweroff' -b Restart 'sudo /sbin/shutdown -r now' -b Logout 'i3-msg exit' -b Sleep 'amixer set Master 0% mute;slock&until echo mem|sudo tee /sys/power/state>/dev/null;do sleep 1;done;sleep 4;nmcli radio wifi off;sleep 3;nmcli radio wifi on'"
@ -175,6 +184,19 @@ mode "resize" {
bindsym Escape mode "default" bindsym Escape mode "default"
} }
# Minecraft mode
mode "minecraft" {
bindsym $mod+r exec "xdotool mousedown 3"
bindsym $mod+shift+r exec "xdotool mouseup 3";mode "default"
bindsym $mod+d exec "xdotool mousedown 1"
bindsym $mod+shift+d exec "xdotool mouseup 1";mode "default"
bindsym $mod+s exec "sleep 1;xdotool keydown Shift_R;sleep 1;xdotool mousedown 3"
bindsym $mod+shift+s exec "xdotool keyup Shift_R;xdotool mouseup 3";mode "default"
bindsym Return mode "default"
bindsym Escape mode "default"
}
bindsym $mod+m mode "minecraft"
# Startup # Startup
# Monitor setup # Monitor setup
@ -188,7 +210,7 @@ exec --no-startup-id xmodmap ~/.xmodmap
#exec --no-startup-id ~/xmodmap.sh #exec --no-startup-id ~/xmodmap.sh
# Misc # Misc
# Compositor # Compositor
exec --no-startup-id compton #exec --no-startup-id compton
# Spawn a terminal # Spawn a terminal
#TODO: Currently the terminal will spawn in the current workspace #TODO: Currently the terminal will spawn in the current workspace
exec --no-startup-id /usr/bin/urxvt exec --no-startup-id /usr/bin/urxvt
@ -205,7 +227,7 @@ exec --no-startup-id firefox -p a || firefox-bin -p a
#exec --no-startup-id /bin/zsh -c 'pidof syncthing||screen -dmS syncthing ~/bin/syncthing' #exec --no-startup-id /bin/zsh -c 'pidof syncthing||screen -dmS syncthing ~/bin/syncthing'
exec --no-startup-id nextcloud exec --no-startup-id nextcloud
# Start kdeconnect # Start kdeconnect
exec --no-startup-id "~/bin/indicator-kdeconnect" #exec --no-startup-id "~/bin/indicator-kdeconnect"
# riot # riot
exec --no-startup-id riot-web --hidden exec --no-startup-id riot-web --hidden
# vim: ts=2:sw=2:et # vim: ts=2:sw=2:et

25
i3/run.sh
View File

@ -1,7 +1,20 @@
#!/usr/bin/env zsh #!/usr/bin/env bash
if [ "$1" = "lock" ];then if [ "$1" = "move" ]; then
#!/bin/bash shift
eval "$(xdotool getwindowfocus getwindowgeometry | grep Geometry: | perl -pe 's/^\s*Geometry: /WinH=/;s/x/\nWinW=/g')"
eval "$(xdotool getwindowfocus getwindowgeometry | grep Position: | perl -pe 's/^\s*Position: /WinY=/;s/,/\nWinX=/g;s/\s\(.+//')"
eval "$(xrandr | grep -w connected | perl -pe 's/.+?(\d+x\d+)\+\d+\+\d+.*/\1/g;s/^/MonH=/;s/x/\nMonW=/;' | head -n2)"
if [ "$1" = "top" ]; then
echo $((WinY))
xdotool getwindowfocus windowmove $((WinY - 1)) 0
elif [ "$1" = "right" ]; then
xdotool getwindowfocus windowmove $((MonH - WinH)) $((WinX - 1))
elif [ "$1" = "left" ]; then
xdotool getwindowfocus windowmove 0 $((WinX - 1))
elif [ "$1" = "bottom" ]; then
xdotool getwindowfocus windowmove $((WinY - 1)) $((MonW - WinW))
fi
elif [ "$1" = "lock" ];then
declare -i ID declare -i ID
ID=`xinput list | grep -Eo 'TouchPad\s*id\=[0-9]{1,2}' | grep -Eo '[0-9]{1,2}'` ID=`xinput list | grep -Eo 'TouchPad\s*id\=[0-9]{1,2}' | grep -Eo '[0-9]{1,2}'`
declare -i STATE declare -i STATE
@ -89,7 +102,7 @@ if [ "$1" = "ping" ]; then
fi fi
if [ "$1" = "ip" ]; then if [ "$1" = "ip" ]; then
shift shift
local RET=0 RET=0
if [ "$(hostname)" = "MMLin" ]; then if [ "$(hostname)" = "MMLin" ]; then
if grep -q "$1" < <(ifconfig enp2s0f0); then if grep -q "$1" < <(ifconfig enp2s0f0); then
RET=1 RET=1
@ -109,7 +122,7 @@ if [ "$1" = "copy" ]; then
(printf '-chegg ';xsel | perl -pe 's/[^a-zA-Z ]//g;chomp()') | xsel && notify-send "Copied" || notify-send "Error" (printf '-chegg ';xsel | perl -pe 's/[^a-zA-Z ]//g;chomp()') | xsel && notify-send "Copied" || notify-send "Error"
fi fi
if [ "$1" = "screenshot" ]; then if [ "$1" = "screenshot" ]; then
\rm -f ~/last-photo/*(N) \rm -f ~/last-photo/*
sleep .2 sleep .2
#DISPLAY=:0.0 xfce4-screenshooter -r -s ~/last-photo #DISPLAY=:0.0 xfce4-screenshooter -r -s ~/last-photo
local FNAME="$HOME/last-photo/$(date +'%Y-%m-%d_%T').png" local FNAME="$HOME/last-photo/$(date +'%Y-%m-%d_%T').png"

3
shells/Xresources
View File

@ -7,7 +7,8 @@
!URxvt.font: xft:Neep:size=13 !URxvt.font: xft:Neep:size=13
!URxvt.font: xft:Courier New:size=12 !URxvt.font: xft:Courier New:size=12
!URxvt.font: xft:Gohu GohuFont:size=12 !URxvt.font: xft:Gohu GohuFont:size=12
URxvt.font: xft:Misc Termsynu:size=13 !URxvt.font: xft:Misc Termsynu:size=13
!URxvt.font: xft:Unifont:size=13
!URxvt.faceName: -*-*-*-*-*-*-10-*-*-*-*-*-*-* !URxvt.faceName: -*-*-*-*-*-*-10-*-*-*-*-*-*-*
!URxvt.font: xft:Fixed:style=SemiCondensed:size=16 !URxvt.font: xft:Fixed:style=SemiCondensed:size=16

1
shells/bashrc
View File

@ -1,2 +1 @@
export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games
PS1="$ "

9
shells/zshrc
View File

@ -330,7 +330,7 @@ fi
if ex git; then if ex git; then
alias g="git" alias g="git"
fi fi
alias stdns="sudo sh -c 'echo nameserver 8.8.8.8 > /etc/resolv.conf'" alias stdns="sudo sh -c 'echo nameserver 1.1.1.1 > /etc/resolv.conf'"
alias fvim="vim -u NONE +\"so ~/.vim/plugged/flappyvird-vim/plugin/flappyvird.vim\" +\"so ~/.vim/plugged/flappyvird-vim/autoload/flappyvird.vim\" +\":FlappyVird\" +\":q\"" alias fvim="vim -u NONE +\"so ~/.vim/plugged/flappyvird-vim/plugin/flappyvird.vim\" +\"so ~/.vim/plugged/flappyvird-vim/autoload/flappyvird.vim\" +\":FlappyVird\" +\":q\""
alias fk='k `fzf --no-mouse -m -1 -x`' alias fk='k `fzf --no-mouse -m -1 -x`'
#alias susp="sudo true&&((slock;sleep 2;nmcli radio wifi off;nmcli radio wifi on)&echo mem | sudo tee /sys/power/state >/dev/null);sudo -k" #alias susp="sudo true&&((slock;sleep 2;nmcli radio wifi off;nmcli radio wifi on)&echo mem | sudo tee /sys/power/state >/dev/null);sudo -k"
@ -347,6 +347,9 @@ fi
alias -g nify=" > /dev/null 2>&1 &" alias -g nify=" > /dev/null 2>&1 &"
alias -g nifyd=" > /dev/null 2>&1 & disown" alias -g nifyd=" > /dev/null 2>&1 & disown"
alias -g L="2>&1|less" alias -g L="2>&1|less"
if ex mktemp; then
alias mtmp='pushd "$(mktemp -d)" >/dev/null'
fi
if ex rg; then if ex rg; then
alias -g G='|& rg' alias -g G='|& rg'
alias rg='rg -i' alias rg='rg -i'
@ -433,7 +436,7 @@ grename() {
done done
} }
bp(){ bp(){
echo '\a' printf '\a'
} }
ltar(){ ltar(){
tar -cf - $@|pv -WcN tar|xz|pv -WcN lzma tar -cf - $@|pv -WcN tar|xz|pv -WcN lzma
@ -456,7 +459,7 @@ dnstest(){
echo "Testing DNS:" echo "Testing DNS:"
dig google.com dig google.com
echo "Testing ping:" echo "Testing ping:"
ping -c 2 8.8.8.8 ping -c 2 1.1.1.1
echo "Testing IP curl:" echo "Testing IP curl:"
curl -L 178.33.250.62 curl -L 178.33.250.62
echo echo

1
tmux/tmux.conf
View File

@ -1,4 +1,3 @@
set-option -g default-shell /bin/zsh
#set -g mouse on #set -g mouse on
set -g status-bg black set -g status-bg black
set -g status-fg white set -g status-fg white

255
vim/vimrc
View File

@ -2,112 +2,103 @@
if has('conceal') if has('conceal')
set conceallevel=2 concealcursor=i set conceallevel=2 concealcursor=i
endif endif
let g:formatdef_my_custom_cpp = '"astyle --mode=cpp -xc --style=google -j -s2 -xG -S -K -N -xn -xl -n -p -H"' "let g:formatdef_my_custom_cpp = '"astyle --mode=cpp -xc --style=google -j -s2 -xG -S -K -N -xn -xl -n -p -H"'
let g:formatters_cpp = ['my_custom_cpp'] "let g:formatters_cpp = ['my_custom_cpp']
let g:formatdef_my_custom_java = '"astyle --mode=java -xc --style=google -j -s2 -xG -S -K -N -xn -xl -n -p -H"' "let g:formatdef_my_custom_java = '"astyle --mode=java -xc --style=google -j -s2 -xG -S -K -N -xn -xl -n -p -H"'
let g:formatters_java = ['my_custom_java'] "let g:formatters_java = ['my_custom_java']
let g:UltiSnipsUsePythonVersion=3 "let g:UltiSnipsUsePythonVersion=3
command! WW %!sudo tee > /dev/null % command! WW %!sudo tee > /dev/null %
"TODO: Fix this "TODO: Fix this
"let g:rbpt_loadcmd_toggle = 1 "let g:rbpt_loadcmd_toggle = 1
let g:indent_guides_auto_colors = 0 "let g:indent_guides_auto_colors = 0
"Required for CSC216, not needed for current classes
"autocmd FileType java set shiftwidth=3 tabstop=3 softtabstop=3 expandtab
"au FileType twig let b:AutoPairs['%']='%'
autocmd VimEnter,Colorscheme * :hi IndentGuidesOdd guibg=darkgrey ctermbg=darkgrey autocmd VimEnter,Colorscheme * :hi IndentGuidesOdd guibg=darkgrey ctermbg=darkgrey
autocmd VimEnter,Colorscheme * :hi IndentGuidesEven guibg=grey ctermbg=grey autocmd VimEnter,Colorscheme * :hi IndentGuidesEven guibg=grey ctermbg=grey
filetype plugin on filetype plugin on
set grepprg=grep\ -nH\ $* set grepprg=grep\ -nH\ $*
let g:tex_flavor='latex' "let g:tex_flavor='latex'
"match Error /\s\+$/ "match Error /\s\+$/
" Basic, very important mappings { " Basic, very important mappings {
" Movement { " Movement {
"Vertical "Vertical
nnoremap gj j noremap gj j
nnoremap gk k noremap gk k
nnoremap j gj noremap j gj
nnoremap k gk noremap k gk
vnoremap gj j
vnoremap gk k
vnoremap j gj
vnoremap k gk
"Horizontal "Horizontal
nnoremap Y y$ noremap H ^
nnoremap H ^
nnoremap L $ nnoremap L $
vnoremap L $h vnoremap L $h
vnoremap H ^
nnoremap Y y$
"Move to end of line "Move to end of line
inoremap jk <End> inoremap jk <End>
inoremap kj <End> inoremap kj <End>
"Move to last character of last line "Move to last character of last line
nnoremap G G$ noremap G G$
vnoremap G G$ noremap G G$
" } " }
" Buffers { " Buffers {
"Control-key movement "Control-key movement
nnoremap <C-h> <C-w>h noremap <C-h> <C-w>h
nnoremap <C-j> <C-w>j noremap <C-j> <C-w>j
nnoremap <C-k> <C-w>k noremap <C-k> <C-w>k
nnoremap <C-l> <C-w>l noremap <C-l> <C-w>l
"Arrow keys "Arrow keys
nnoremap <Up> <C-w>w noremap <Up> <C-w>w
nnoremap <Down> <C-w>W noremap <Down> <C-w>W
nnoremap <Left> :bp<CR> noremap <Left> :bp<CR>
nnoremap <Right> :bn<CR> noremap <Right> :bn<CR>
"Vertical and horizontal split "Vertical and horizontal split
nnoremap <C-w>\| <C-w>v<C-w>l noremap <C-w>\| <C-w>v<C-w>l
nnoremap <C-w>- <C-w>s<C-w>j noremap <C-w>- <C-w>s<C-w>j
"Close buffer "Close buffer
nnoremap <C-d> <C-w>q "noremap <C-d> <C-w>q
"Fullscreen buffer "Fullscreen buffer
nnoremap <C-w>z <C-w>_<C-w>\| noremap <C-w>z <C-w>_<C-w>\|
"Go to last buffer "Go to last buffer
nnoremap <Leader><Leader> <C-^> noremap <Leader><Leader> <C-^>
" } " }
" Misc { " Misc {
vnoremap <silent> * :call VisualSelection('f')<CR> vnoremap <silent> * :call VisualSelection('f')<CR>
vnoremap <silent> # :call VisualSelection('b')<CR> vnoremap <silent> # :call VisualSelection('b')<CR>
vnoremap ; : vnoremap ; :
nnoremap ! :!
vnoremap < <gv vnoremap < <gv
vnoremap > >gv vnoremap > >gv
noremap ! :!
"Disable F1 "Disable F1
nnoremap <F1> <nop> noremap <F1> <nop>
inoremap <F1> <nop> noremap! <F1> <nop>
vnoremap <F1> <nop>
"F2 toggle paste "F2 toggle paste
nnoremap <F2> :set invpaste<CR> noremap <F2> :set invpaste<CR>
"Better searching "Better searching
nnoremap / /\v noremap / /\v
vnoremap / /\v
"Addition and subtraction "Addition and subtraction
nnoremap + <C-a> "nnoremap + <C-a>
nnoremap - <C-x> "nnoremap - <C-x>
"Backspace remove highlights "Backspace remove highlights
nnoremap <BS> :nohlsearch<CR>g<C-g>zo noremap <BS> :nohlsearch<CR>g<C-g>
"Better save "Better save
nnoremap <Enter> :up<CR>:silent! call sy#start()<CR> nnoremap <Enter> :up<CR>
"Unmap Q "Unmap Q
nnoremap Q <Nop> noremap Q <Nop>
" } " }
" } " }
" Plugin mappings { " Plugin mappings {
"Easymotion "Easymotion
map , <Plug>(easymotion-prefix) map , <Plug>(easymotion-prefix)
"Ctrl-p "Ctrl-p
nnoremap <Leader><C-p> :CtrlPFunky<CR> "nnoremap <Leader><C-p> :CtrlPFunky<CR>
"Gundo "Gundo
nnoremap <F5> :GundoToggle<CR> "nnoremap <F5> :GundoToggle<CR>
"Easytags "Easytags
"nnoremap <Leader><Space> :CtrlPTag<CR> "nnoremap <Leader><Space> :CtrlPTag<CR>
"Replacing easytags with ctrl p buffer "Replacing easytags with ctrl p buffer
nnoremap <Leader><Space> :CtrlPBuffer<CR> "nnoremap <Leader><Space> :CtrlPBuffer<CR>
"Tagbar "Tagbar
"nnoremap <Leader><Space> :Tagbar<CR> "nnoremap <Leader><Space> :Tagbar<CR>
"Add a bundle from clipboard "Add a bundle from clipboard
nnoremap <Leader>bun G?Plug <CR>yyjp$hdi'"+gPo " \| <Esc>"+gp<Esc>:nohlsearch<CR>:up<CR>:PlugInstall "nnoremap <Leader>bun G?Plug <CR>yyjp$hdi'"+gPo " \| <Esc>"+gp<Esc>:nohlsearch<CR>:up<CR>:PlugInstall
"Automatic if/else/for/while wrappers "Automatic if/else/for/while wrappers
nnoremap <Leader>if m"Oif(){<Esc>jo}<Esc>`"v><Esc>k^wa nnoremap <Leader>if m"Oif(){<Esc>jo}<Esc>`"v><Esc>k^wa
nnoremap <Leader>else m"kAelse{<Esc>jo}<Esc>`"v><Esc> nnoremap <Leader>else m"kAelse{<Esc>jo}<Esc>`"v><Esc>
@ -121,8 +112,8 @@ let g:tex_flavor='latex'
vnoremap <Leader>rm <Esc>`<<Esc>kdd`>jddgv<<Esc> vnoremap <Leader>rm <Esc>`<<Esc>kdd`>jddgv<<Esc>
" } " }
" Trial mappings { " Trial mappings {
nnoremap <Leader>o m`o<Esc>`` "nnoremap <Leader>o m`o<Esc>``
nnoremap <Leader>O m`O<Esc>`` "nnoremap <Leader>O m`O<Esc>``
" } " }
@ -141,19 +132,15 @@ let g:tex_flavor='latex'
set conceallevel=0 set conceallevel=0
" } " }
" Misc { " Misc {
set tabstop=2 shiftwidth=2 expandtab set tabstop=2 softtabstop=2 shiftwidth=2 expandtab
set tags=./tags;/ set tags=./tags;/
set wildmode=longest,list,full set wildmode=longest,list,full
set formatoptions-=r set formatoptions-=rot
set formatoptions-=o
set diffopt+=iwhite set diffopt+=iwhite
set noesckeys set noesckeys
set shiftwidth=2
set tabstop=2
set modeline set modeline
set softtabstop=2
set expandtab set expandtab
set history=1000 set history=2048
set hidden set hidden
"set cursorline "set cursorline
set incsearch set incsearch
@ -165,8 +152,7 @@ let g:tex_flavor='latex'
set backup set backup
set backupdir=~/.vim/backup set backupdir=~/.vim/backup
set directory=~/.vim/tmp set directory=~/.vim/tmp
set undolevels=1000 set undolevels=2048
set history=500
set ttyfast set ttyfast
set fileformat=unix set fileformat=unix
set encoding=utf-8 set encoding=utf-8
@ -174,7 +160,6 @@ let g:tex_flavor='latex'
set foldmethod=indent set foldmethod=indent
set foldnestmax=10 set foldnestmax=10
set foldlevel=2 set foldlevel=2
set relativenumber
set number set number
set background=dark set background=dark
set t_Co=256 set t_Co=256
@ -182,76 +167,45 @@ let g:tex_flavor='latex'
set nocompatible set nocompatible
set ignorecase set ignorecase
set textwidth=0 set textwidth=0
set path+=**
syntax on syntax on
" } " }
"Polyglot conflicts with another latex editor "Polyglot conflicts with another latex editor
let g:polyglot_disabled = ['latex'] let g:polyglot_disabled = ['latex']
"Symfony
let g:symfony_app_console_caller="php"
let g:symfony_app_console_path="bin/console"
"Signify "Signify
let g:signify_vcs_list = [ 'git', 'svn' ] let g:signify_vcs_list = [ 'git', 'svn' ]
let g:signify_difftool = 'diff' let g:signify_difftool = 'diff'
"CtrlP "CtrlP
let g:ctrlp_root_markers = ['.cproot'] "let g:ctrlp_root_markers = ['.cproot']
let g:ctrlp_custom_ignore = { "let g:ctrlp_custom_ignore = {
\ 'dir': '\v[\/](\.git|\.hg|\.svn|vendor)$', " \ 'dir': '\v[\/](\.git|\.hg|\.svn|vendor)$',
\ 'file': '\v\.(exe|so|dll|class)$', " \ 'file': '\v\.(exe|so|dll|class)$',
\ 'link': 'SOME_BAD_SYMBOLIC_LINKS', " \ 'link': 'SOME_BAD_SYMBOLIC_LINKS',
\ } " \ }
let g:ctrlp_extensions=['funky']
"Airline "Airline
let g:airline_left_sep='▶' "let g:airline_left_sep='▶'
let g:airline_right_sep='◀' "let g:airline_right_sep='◀'
let g:airline#extensions#syntastic#enabled=0 "let g:airline#extensions#syntastic#enabled=0
let g:ycm_show_diagnostics_ui=0 "let g:ycm_show_diagnostics_ui=0
let g:ycm_path_to_python_interpreter='/usr/bin/python2.7' "let g:ycm_path_to_python_interpreter='/usr/bin/python2.7'
"let g:syntastic_cpp_compiler = 'clang++' "let g:syntastic_cpp_compiler = 'clang++'
"let g:syntastic_cpp_compiler_options = ' -std=c++11 -stdlib=libc++' "let g:syntastic_cpp_compiler_options = ' -std=c++11 -stdlib=libc++'
let g:syntastic_cpp_compiler_options = ' -std=c++11' "let g:syntastic_cpp_compiler_options = ' -std=c++11'
let g:airline#extensions#whitespace#enabled=0 "let g:airline#extensions#whitespace#enabled=0
let g:airline#extensions#whitespace#show_message=0 "let g:airline#extensions#whitespace#show_message=0
let g:airline#extensions#tmuxline#enabled=1 "let g:airline#extensions#tmuxline#enabled=1
"Autoformat
let g:formatdef_my_custom_php = '"astyle --mode=php -xc -A10 -j -s2 -xG -S -K -N -xn -xl -n"'
let g:formatdef_my_custom_cpp = '"astyle --mode=c -xc -A10 -j -s2 -xG -S -K -N -xn -xl -n"'
let g:formatter_cpp = ['formatdef_my_custom_cpp']
let g:formatter_php = ['formatdef_my_custom_php']
"let g:formatprg_cpp="astyle" "let g:formatprg_cpp="astyle"
"let g:formatprg_args_expr_cpp=" --mode=c --style=1tbs -xe -k1 -j" "let g:formatprg_args_expr_cpp=" --mode=c --style=1tbs -xe -k1 -j"
" These flags don't work for some reason " These flags don't work for some reason
" -xn -xc -xl -S " -xn -xc -xl -S
"Syntastic
let g:syntastic_java_javac_classpath = "~/applications/java/junit-4.12.jar:~/applications/java/hamcrest-core-1.3.jar:~/wpilib/java/current/lib/WPILib.jar:~/wpilib/java/current/lib/NetworkTables.jar:~/git/ford-java/src"
"IndentGuides
let g:indent_guides_start_level=1
let g:indent_guides_guide_size=1
let g:indent_guides_enable_on_vim_startup=1
let g:php_refactor_command='php /usr/local/bin/refactor.phar'
function! g:UltiSnips_Complete()
call UltiSnips#ExpandSnippet()
if g:ulti_expand_res == 0
if pumvisible()
return "\<C-n>"
else
call UltiSnips#JumpForwards()
if g:ulti_jump_forwards_res == 0
return "\<TAB>"
endif
endif
endif
return ""
endfunction
"inoremap <expr><Tab> pumvisible() ? "\<C-n>" : "\<Tab>" "inoremap <expr><Tab> pumvisible() ? "\<C-n>" : "\<Tab>"
"inoremap <Tab> pumvisible() ? "\<C-n>" : "\<Tab>" "inoremap <Tab> pumvisible() ? "\<C-n>" : "\<Tab>"
let g:UltiSnipsJumpForwardTrigger="<C-S-Q>" "let g:UltiSnipsJumpForwardTrigger="<C-S-Q>"
let g:UltiSnipsExpandTrigger="<S-Tab>" "let g:UltiSnipsExpandTrigger="<S-Tab>"
let g:UltiSnipsListSnippets="<C-e>" "let g:UltiSnipsListSnippets="<C-e>"
let g:UltiSnipsEditSplit="vertical" "let g:UltiSnipsEditSplit="vertical"
let g:ycm_key_list_select_completion = []
inoremap <expr> <CR> pumvisible() ? "\<C-y>" : "\<C-g>u\<CR>" inoremap <expr> <CR> pumvisible() ? "\<C-y>" : "\<C-g>u\<CR>"
let loaded_matchit=1
filetype off filetype off
if has("win32") if has("win32")
call plug#begin('~/vimfiles/plugged') call plug#begin('~/vimfiles/plugged')
@ -259,31 +213,31 @@ else
call plug#begin('~/.vim/plugged') call plug#begin('~/.vim/plugged')
endif endif
" Code writing { " Code writing {
Plug 'https://gitea.austenwares.com/vim/vim-autoformat', { 'on': 'Autoformat'} "Plug 'https://gitea.austenwares.com/vim/vim-autoformat', { 'on': 'Autoformat'}
"Adds autoformat command | https://github.com/Chiel92/vim-autoformat "Adds autoformat command | https://github.com/Chiel92/vim-autoformat
Plug 'https://gitea.austenwares.com/vim/vim-surround' Plug 'https://gitea.austenwares.com/vim/vim-surround'
"Surround selection in ({\"' or HTML tags | https://github.com/tpope/vim-surround "Surround selection in ({\"' or HTML tags | https://github.com/tpope/vim-surround
Plug 'https://gitea.austenwares.com/vim/syntastic' "Plug 'https://gitea.austenwares.com/vim/syntastic'
"Syntax checker | https://github.com/scrooloose/syntastic "Syntax checker | https://github.com/scrooloose/syntastic
Plug 'https://gitea.austenwares.com/vim/nerdtree', { 'on': 'NERDTreeToggle' } "Plug 'https://gitea.austenwares.com/vim/nerdtree', { 'on': 'NERDTreeToggle' }
"File browser | https://github.com/scrooloose/nerdtree "File browser | https://github.com/scrooloose/nerdtree
Plug 'https://gitea.austenwares.com/vim/vim-easymotion' Plug 'https://gitea.austenwares.com/vim/vim-easymotion'
"Move around quickly in a document | https://github.com/Lokaltog/vim-easymotion "Move around quickly in a document | https://github.com/Lokaltog/vim-easymotion
"Plug 'https://gitea.austenwares.com/vim/gundo.vim', { 'on': 'GundoToggle' } "Plug 'https://gitea.austenwares.com/vim/gundo.vim', { 'on': 'GundoToggle' }
"Visual undo | https://github.com/sjl/gundo.vim "Visual undo | https://github.com/sjl/gundo.vim
Plug 'https://gitea.austenwares.com/vim/vim-exchange' "Plug 'https://gitea.austenwares.com/vim/vim-exchange'
"Exchange two selections of text | https://github.com/tommcdo/vim-exchange "Exchange two selections of text | https://github.com/tommcdo/vim-exchange
Plug 'https://gitea.austenwares.com/vim/vim-repeat' "Plug 'https://gitea.austenwares.com/vim/vim-repeat'
"Repeat last tpope command with . | https://github.com/tpope/vim-repeat "Repeat last tpope command with . | https://github.com/tpope/vim-repeat
Plug 'https://gitea.austenwares.com/vim/vim-fugitive' "Plug 'https://gitea.austenwares.com/vim/vim-fugitive'
"Great Vim-Git compatibility | https://github.com/tpope/vim-fugitive "Great Vim-Git compatibility | https://github.com/tpope/vim-fugitive
Plug 'https://gitea.austenwares.com/vim/ctrlp.vim' "Plug 'https://gitea.austenwares.com/vim/ctrlp.vim'
"Fuzzy file search | https://github.com/kien/ctrlp.vim "Fuzzy file search | https://github.com/kien/ctrlp.vim
Plug 'https://gitea.austenwares.com/vim/tabular', { 'on': 'Tab' } Plug 'https://gitea.austenwares.com/vim/tabular', { 'on': 'Tab' }
"Quickly make tables in vim | https://github.com/godlygeek/tabular "Quickly make tables in vim | https://github.com/godlygeek/tabular
Plug 'https://gitea.austenwares.com/vim/UltiSnips' "Plug 'https://gitea.austenwares.com/vim/UltiSnips'
"Adds snippet support | https://github.com/sirver/UltiSnips "Adds snippet support | https://github.com/sirver/UltiSnips
Plug 'https://gitea.austenwares.com/vim/vim-snippets' "Plug 'https://gitea.austenwares.com/vim/vim-snippets'
"Add snippets | https://github.com/honza/vim-snippets "Add snippets | https://github.com/honza/vim-snippets
Plug 'https://gitea.austenwares.com/vim/eregex.vim' Plug 'https://gitea.austenwares.com/vim/eregex.vim'
"Real regexes in vim | https://github.com/othree/eregex.vim "Real regexes in vim | https://github.com/othree/eregex.vim
@ -291,11 +245,11 @@ endif
"Git information inline | https://github.com/mhinz/vim-signify "Git information inline | https://github.com/mhinz/vim-signify
Plug 'https://gitea.austenwares.com/vim/auto-pairs' Plug 'https://gitea.austenwares.com/vim/auto-pairs'
"Automatic pairs | https://github.com/jiangmiao/auto-pairs "Automatic pairs | https://github.com/jiangmiao/auto-pairs
Plug 'https://gitea.austenwares.com/vim/YouCompleteMe' "Plug 'https://gitea.austenwares.com/vim/YouCompleteMe'
"Autocompletion | https://github.com/Valloric/YouCompleteMe "Autocompletion | https://github.com/Valloric/YouCompleteMe
"Plug 'https://gitea.austenwares.com/vim/vim-java-getset.git' "Plug 'https://gitea.austenwares.com/vim/vim-java-getset.git'
"Java getters and setters| https://gitea.austenwares.com/vim/vim-java-getset.git "Java getters and setters| https://gitea.austenwares.com/vim/vim-java-getset.git
Plug 'https://gitea.austenwares.com/vim/double-tap.git' "Plug 'https://gitea.austenwares.com/vim/double-tap.git'
"Double tap for comments "Double tap for comments
" } " }
" Style { " Style {
@ -309,24 +263,26 @@ endif
"256 color vim in terminal | https://github.com/godlygeek/csapprox "256 color vim in terminal | https://github.com/godlygeek/csapprox
" } " }
" Syntax { " Syntax {
Plug 'https://gitea.austenwares.com/vim/vimtex' "Plug 'https://gitea.austenwares.com/vim/vimtex'
"Latex | https://github.com/lervag/vimtex "Latex | https://github.com/lervag/vimtex
Plug 'https://gitea.austenwares.com/vim/vim-polyglot' Plug 'https://gitea.austenwares.com/vim/vim-polyglot'
"Many languages | https://github.com/sheerun/vim-polyglot "Many languages | https://github.com/sheerun/vim-polyglot
Plug 'https://gitea.austenwares.com/vim/vim-vimperator' "Plug 'https://gitea.austenwares.com/vim/vim-vimperator'
"Vimperator for vim | https://github.com/superbrothers/vim-vimperator "Vimperator for vim | https://github.com/superbrothers/vim-vimperator
Plug 'https://gitea.austenwares.com/vim/i3-vim-syntax' "Plug 'https://gitea.austenwares.com/vim/i3-vim-syntax'
"i3 syntax | https://github.com/PotatoesMaster/i3-vim-syntax "i3 syntax | https://github.com/PotatoesMaster/i3-vim-syntax
" } " }
" Misc { " Misc {
Plug 'https://gitea.austenwares.com/vim/flappyvird-vim', { 'on': [] } "Plug 'https://gitea.austenwares.com/vim/flappyvird-vim', { 'on': [] }
"The amazing Flappy Bird game | https://github.com/mattn/flappyvird-vim "The amazing Flappy Bird game | https://github.com/mattn/flappyvird-vim
Plug 'https://gitea.austenwares.com/vim/vim-gnupg' "Plug 'https://gitea.austenwares.com/vim/vim-gnupg'
"GPG support | https://github.com/jamessan/vim-gnupg "GPG support | https://github.com/jamessan/vim-gnupg
Plug 'https://gitea.austenwares.com/vim/vim-bracketed-paste' Plug 'https://gitea.austenwares.com/vim/vim-bracketed-paste'
"Automatic :set paste funcationality | https://github.com/ConradIrwin/vim-bracketed-paste "Automatic :set paste funcationality | https://github.com/ConradIrwin/vim-bracketed-paste
Plug 'https://gitea.austenwares.com/vim/HiCursorWords' "Plug 'https://gitea.austenwares.com/vim/HiCursorWords'
"Highlight word under cursor automatically | http://www.vim.org/scripts/script.php?script_id=4306 "Highlight word under cursor automatically | http://www.vim.org/scripts/script.php?script_id=4306
"Plug 'https://github.com/chrisbra/NrrwRgn'
"Narrow region | https://github.com/chrisbra/NrrwRgn
" } " }
" Unused { " Unused {
"Plug 'https://gitea.austenwares.com/vim/mirror.vim' "Plug 'https://gitea.austenwares.com/vim/mirror.vim'
@ -345,8 +301,7 @@ if exists("+undofile")
if isdirectory($HOME . '/.vim/undo')==0 if isdirectory($HOME . '/.vim/undo')==0
:silent !mkdir -p ~/.vim/undo > /dev/null 2>&1 :silent !mkdir -p ~/.vim/undo > /dev/null 2>&1
endif endif
set undodir=./.vim-undo// set undodir=~/.vim/undo/
set undodir+=~/.vim/undo//
set undofile set undofile
endif endif
augroup autosave augroup autosave
@ -362,15 +317,11 @@ augroup vimrcEx
\ exe "normal g`\"" | \ exe "normal g`\"" |
\ endif \ endif
augroup END augroup END
if has('gui_running') "if has('gui_running')
set guioptions-=T " set guioptions-=T
else "else
set t_Co=256 " set t_Co=256
if &term=='xterm' || &term=='screen' "endif
set t_Co=256
endif
"colorscheme torte
endif
silent! colorscheme fruity silent! colorscheme fruity
function! Initialize() function! Initialize()
if has("win32") if has("win32")
@ -395,18 +346,12 @@ function! Initialize()
silent! so ~/.vimrc silent! so ~/.vimrc
endif endif
silent! PlugClean! silent! PlugClean!
silent! PlugUpdate silent! PlugInstall!
silent! PlugInstall silent! PlugUpdate!
q q
endfunction endfunction
if !exists('g:ycm_semantic_triggers')
let g:ycm_semantic_triggers = {}
endif
let g:ycm_semantic_triggers.tex = [
\ 're!\\[A-Za-z]*(ref|cite)[A-Za-z]*([^]]*])?{([^}]*, ?)*'
\ ]
set guifont=Gohu\ GohuFont set guifont=Gohu\ GohuFont
inoremap <Tab> <C-R>=g:UltiSnips_Complete()<cr> "inoremap <Tab> <C-R>=g:UltiSnips_Complete()<cr>
map <unique> <buffer> <LocalLeader>b <Plug>JavagetsetInsertBothGetterSetter "map <unique> <buffer> <LocalLeader>b <Plug>JavagetsetInsertBothGetterSetter
map <Leader>a O<Esc>:Autoformat<CR>:v/\S/d<CR>:nohlsearch<CR> "map <Leader>a O<Esc>:Autoformat<CR>:v/\S/d<CR>:nohlsearch<CR>
inoremap <expr> <CR> getline(".") =~ '^\s*\([#"]\)\s*$' ? "\<C-u>" : "\<CR>" "inoremap <expr> <CR> getline(".") =~ '^\s*\([#"]\)\s*$' ? "\<C-u>" : "\<CR>"