From 568aa72b5be6a3696737cea37c85493983967134 Mon Sep 17 00:00:00 2001 From: Kevin Mok Date: Tue, 6 Feb 2018 18:32:15 -0500 Subject: [PATCH] Forked vim-snippets and transferred snippets I wanted to alter the default snippets so I thought I might as well move all mine into there as well, instead of keeping track of changes in 2 repositories. Also, having become comfortable with Vim folding, I thought it'd be more organized to consolidate similar alias files (i.e. 209 -> school, laptop/my_pc -> pc) and then add folding to the top-level files. --- .vimrc | 27 ++++++++++++---- NZXT-terminator | 2 +- UltiSnips/all.snippets | 26 --------------- UltiSnips/c.snippets | 21 ------------- UltiSnips/snippets.snippets | 10 ------ UltiSnips/tex.snippets | 7 ----- UltiSnips/texmath.snippets | 63 ------------------------------------- aliases/.209_aliases | 57 --------------------------------- aliases/.bash_aliases | 31 +++++++++--------- aliases/.git_aliases | 5 +++ aliases/.laptop_aliases | 8 ----- aliases/.my_pc_aliases | 7 ----- aliases/.pc_aliases | 23 ++++++++++++++ aliases/.school_aliases | 54 ++++++++++++++++++++++++++++--- 14 files changed, 117 insertions(+), 224 deletions(-) delete mode 100644 UltiSnips/all.snippets delete mode 100644 UltiSnips/c.snippets delete mode 100644 UltiSnips/snippets.snippets delete mode 100644 UltiSnips/tex.snippets delete mode 100644 UltiSnips/texmath.snippets delete mode 100644 aliases/.209_aliases delete mode 100644 aliases/.laptop_aliases delete mode 100644 aliases/.my_pc_aliases diff --git a/.vimrc b/.vimrc index 2ebd9a2..cad8c8c 100644 --- a/.vimrc +++ b/.vimrc @@ -1,3 +1,4 @@ +" set x=y {{{ " set relativenumber set background=dark " set t_Co=256 @@ -11,14 +12,13 @@ set autoindent set mouse=c set clipboard=unnamedplus set foldmethod=marker +" }}} set x=y " autocmd VimResized * wincmd = autocmd BufNewFile,BufRead .*_aliases set syntax=sh -" 'h/u3/c7/05/mokkar/.vim/plugged' -" '~/.vim/plugged' - -" plug +" vim-plug {{{ " +" plug auto-install if empty(glob('~/.vim/autoload/plug.vim')) silent !curl -fLo ~/.vim/autoload/plug.vim --create-dirs \ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim @@ -36,23 +36,26 @@ Plug '907th/vim-auto-save' Plug 'xuhdev/vim-latex-live-preview', { 'for': 'tex' } Plug 'lervag/vimtex' Plug 'Valloric/YouCompleteMe' -Plug 'honza/vim-snippets' +Plug 'Kevin-Mok/vim-snippets' Plug 'SirVer/ultisnips' Plug 'ervandew/supertab' +" }}} vim-plug " +" YCM/UltiSnips {{{ " " make YCM compatible with UltiSnips (using supertab) let g:ycm_key_list_select_completion = ['', ''] let g:ycm_key_list_previous_completion = ['', ''] let g:SuperTabDefaultCompletionType = '' - " better key bindings for UltiSnipsExpandTrigger let g:UltiSnipsExpandTrigger = "" let g:UltiSnipsJumpForwardTrigger = "" let g:UltiSnipsJumpBackwardTrigger = "" +" }}} YCM/UltiSnips " call plug#end() colorscheme gotham256 +" Mappings {{{ " map :wa map :wqa map :qa! @@ -64,6 +67,18 @@ map O let mapleader="\" nnoremap e o nnoremap f za +nnoremap ff :set foldmethod=marker zM nnoremap m :call cursor(0, len(getline('.'))/2) nnoremap p :LLPStartPreview +nnoremap r :.,.+s///g nnoremap s :set syn=sh +" }}} Mappings " + +" Local Mappings {{{ " +let maplocalleader="-" +autocmd Filetype c inoremap s struct pixel + +autocmd Filetype tex inoremap t $T$ +autocmd Filetype tex inoremap x $x$-axis +autocmd Filetype tex inoremap y $y$-axis +" }}} Local Mappings " diff --git a/NZXT-terminator b/NZXT-terminator index 5457bf4..10ac648 100644 --- a/NZXT-terminator +++ b/NZXT-terminator @@ -28,7 +28,7 @@ copy_on_selection = True cursor_color = "#b9b9b9" custom_command = env TERM=xterm-256color bash - font = Monospace 9 + font = Monospace 8.5 foreground_color = "#0077ff" palette = "#000000:#aa0000:#00aa00:#aa5500:#0000aa:#aa00aa:#00aaaa:#aaaaaa:#555555:#ff5555:#55ff55:#ffff55:#5555ff:#ff55ff:#55ffff:#ffffff" scrollbar_position = hidden diff --git a/UltiSnips/all.snippets b/UltiSnips/all.snippets deleted file mode 100644 index fb71ed2..0000000 --- a/UltiSnips/all.snippets +++ /dev/null @@ -1,26 +0,0 @@ -snippet alias "Custom alias" -alias ${1:name}="${2:cmd}" -endsnippet - -snippet 1lf "One-line function" -${1:name}() { ${2:cmd} ; } -endsnippet - -snippet mlf "Multi-line function" -${1:name}() { - ${2:cmd} -} -endsnippet - -snippet ltx "LaTeX" i -LaTeX -endsnippet - -snippet evr "Var with escaped quotes" w -\"$${1:var}\" -endsnippet - -snippet vr "Var with quotes" w -"$${1:var}" -endsnippet - diff --git a/UltiSnips/c.snippets b/UltiSnips/c.snippets deleted file mode 100644 index 056476e..0000000 --- a/UltiSnips/c.snippets +++ /dev/null @@ -1,21 +0,0 @@ -snippet forg "Generic for" -for (int i = 0; i < ${1:count}; i++) { - ${2} -} -endsnippet - -snippet mlc "malloc" i -= malloc(sizeof(${1:type}) * ${2:amt}); -endsnippet - -snippet stl "strlen" -strlen(${1:var}) -endsnippet - -snippet scp "strcpy" -strcpy(${1:dest}, ${2:str}); -endsnippet - -snippet cmt "Line comment" b -/* ${1:text} */ -endsnippet diff --git a/UltiSnips/snippets.snippets b/UltiSnips/snippets.snippets deleted file mode 100644 index 5b71e97..0000000 --- a/UltiSnips/snippets.snippets +++ /dev/null @@ -1,10 +0,0 @@ -snippet ts "Tabstop" i -${${1:number}:${2:default}} -endsnippet - -snippet "b(egin)?" "begin{} / end{}" br -\begin{${1:something}} - ${0:${VISUAL}} -\end{$1} -endsnippet - diff --git a/UltiSnips/tex.snippets b/UltiSnips/tex.snippets deleted file mode 100644 index ed92608..0000000 --- a/UltiSnips/tex.snippets +++ /dev/null @@ -1,7 +0,0 @@ -snippet bf "Boldface" i -\textbf{$0} -endsnippet - -snippet geq "Geq eqn" i -$\geq $0$ -endsnippet diff --git a/UltiSnips/texmath.snippets b/UltiSnips/texmath.snippets deleted file mode 100644 index b0ba40a..0000000 --- a/UltiSnips/texmath.snippets +++ /dev/null @@ -1,63 +0,0 @@ -snippet ali "Align (math)" b -\begin{align*} - $1 &= $2 \\\\ -\end{align*} -endsnippet - -snippet al "Align line" b -&= $2 \\\\ -endsnippet - -snippet pwf "Piecewise function" b -\[ - ${1:name} = \left. - \begin{cases} - ${2:equation}, & ${3:condition} \\\\ - \end{cases} - \right\\} -\] -endsnippet - -snippet int "Integral" i -\int_{${1:lower}}^{${2:upper}} \, \mathrm{d}${3:x} -endsnippet - -snippet ie "I-L equation" i -$$1$ $2 -endsnippet - -snippet le "Lined equation" b -$$$1$$ -endsnippet - -snippet sqrt "Square root" i -\sqrt{$1}$2 -endsnippet - -snippet ex "cdot" i -\cdot -endsnippet - -snippet et "I-L var T" i -$T$ -endsnippet - -snippet dlty "I-L Delta y" i -$\Delta y$ -endsnippet - -snippet thus "Therefore" b -$\therefore$ -endsnippet - -snippet rd "Roman d" i -\mathrm{d}${1:x} $2 -endsnippet - -snippet xax "x-axis" i -$x$-axis -endsnippet - -snippet yax "y-axis" i -$y$-axis -endsnippet diff --git a/aliases/.209_aliases b/aliases/.209_aliases deleted file mode 100644 index 8f1a970..0000000 --- a/aliases/.209_aliases +++ /dev/null @@ -1,57 +0,0 @@ -alias ll="ls -l" - -cd_209="d ~/Documents/School/209"; -alias 209="$cd_209" -alias 9r="$cd_209/mokkar" -alias l5="$cd_209/mokkar/lab5" -alias a2="$cd_209/mokkar/a2" -# alias cdf="ssh -t mokkar@cdf.utoronto.ca '. ./.bashrc; bash -l'" -alias cdf="echo \". ./.bashrc\"&& ssh mokkar@cdf.utoronto.ca" -mkex() { chmod 700 $1 ; } - -## compilation functions - -# compile without running -c9() { gcc -Wall -std=gnu99 -g -o "${1%.*}.out" "$1" -lm ; } - -# compile without running -c9a() { - for file in *; do - if [[ $file = *.c ]]; then - gcc -Wall -std=gnu99 -g -o "${file%.*}".out "$file" - fi - done -} - -# compile and run -c9r() { gc9 $1 && ./"${1%.*}.out" ; } - -# compile and run with input -c9i() { gc9 $1 && ./"${1%.*}.out" < $2 ; } - -# compile and run with input file -run() { - while read line; do - # ./$1.out $line - echo ./$1.out $line - done < $1.in -} - - # temp - c4g() { - gcc -Wall -std=gnu99 -g -o greeting.out greeting.c - ./greeting.out "Good morning" "Emmanuel" - } - - # compile a1p2 and test with simple case - ca12() { - gcc -Wall -std=gnu99 -g -o validate_sin.out validate_sin.c sin_helpers.c - ./validate_sin.out 810620716 - } - - # compile a1p1 and test with simple case - ca1() { - gcc -Wall -std=gnu99 -g -o count_large.out count_large.c - # ll | ./count_large.out 4000 - ./count_large.out 0 rw------- < ll.txt - } diff --git a/aliases/.bash_aliases b/aliases/.bash_aliases index 0188f68..76bc4d2 100644 --- a/aliases/.bash_aliases +++ b/aliases/.bash_aliases @@ -1,10 +1,12 @@ +# Initialize Other Alias Files {{{ # alias_folder="~/linux-config/aliases" -alias_type="school git pc laptop 209 my_pc" +alias_type="school git pc" for type in $alias_type; do . ~/linux-config/aliases/."$type"_aliases done +# }}} -# system +# System {{{ # alias l='ls -a' alias ll='ls -alF' alias cs='printf "\033c"' @@ -15,18 +17,19 @@ alias s="systemctl suspend" alias hst="history" alias topo="top -o %MEM" alias rmsw="rm .sw*" +# }}} System # -# directories +# Directories {{{ # # unalias c d() { cd "$@" && ls -a ; } cd_up() { d $(printf "%0.s../" $(seq 1 $1 )) ; } alias "d."="cd_up" alias cdd="d ~/Downloads" +# }}} # -# apps ok() { okular $1 ; } -## config +# Config {{{ # alias lc="d ~/linux-config/" alias vv="vi ~/.vimrc" alias r=". ~/.bashrc" @@ -34,17 +37,17 @@ alias r=". ~/.bashrc" alias lca="d ~/linux-config/aliases" alias vb="vi $alias_folder/.bash_aliases" alias vs="vi $alias_folder/.school_aliases" - alias vs9="vi $alias_folder/.209_aliases" + alias vsg="vi $alias_folder/.git_aliases" + alias vsp="vi $alias_folder/.pc_aliases" +# }}} Config # # redshift rs(){ redshift -O $(($1 * 1000)) ; } alias rx="redshift -x" -# UltiSnips -alias dsnp="d ~/.vim/plugged/vim-snippets/UltiSnips/" -alias csnp="d ~/.vim/UltiSnips/" - -alias vsptm="vi ~/.vim/UltiSnips/texmath.snippets" -vdsnp() { vi ~/.vim/plugged/vim-snippets/UltiSnips/"$1".snippets ; } -vsnp() { vi ~/.vim/UltiSnips/"$1".snippets ; } - +# UltiSnips {{{ # +usnp_dir="~/.vim/plugged/vim-snippets/UltiSnips" +alias snp="d $usnp_dir" +vsnp() { vi ~/.vim/plugged/vim-snippets/UltiSnips/"$1".snippets ; } +alias tmsp="vi $usnp_dir/texmath.snippets" +# }}} # diff --git a/aliases/.git_aliases b/aliases/.git_aliases index b55fc15..c6a5ded 100644 --- a/aliases/.git_aliases +++ b/aliases/.git_aliases @@ -1,3 +1,4 @@ +# Aliases {{{ # . ~/.secure alias gs="git status -u" alias gpl="git pull --rebase" @@ -17,8 +18,11 @@ alias gst="git stash" alias gstp="git stash pop" alias gclear="git stash clear" alias egc="vim -c \"set syn=gitcommit\" -c \"set tw=72\" commit-msg.txt" +# Aliases }}} +# Functions {{{ gcho() { git checkout $1 ; } +gcln() { git clone $1 ; } gremotes() { git remote set-url --add --push origin $1 git remote set-url --add --push origin $2 @@ -31,3 +35,4 @@ gmrgr() { git merge --allow-unrelated-histories $1/master git remote remove $1 } +# Functions }}} diff --git a/aliases/.laptop_aliases b/aliases/.laptop_aliases deleted file mode 100644 index 3f5b844..0000000 --- a/aliases/.laptop_aliases +++ /dev/null @@ -1,8 +0,0 @@ -if [ "$(hostname)" == "X1-Carbon" ]; then - # key swaps - xmodmap -e "keycode 9 = Escape" - xmodmap -e "keycode 22 = Home" - xmodmap -e "keycode 119 = End" - xmodmap -e "keycode 110 = Delete" - xmodmap -e "keycode 115 = BackSpace" -fi diff --git a/aliases/.my_pc_aliases b/aliases/.my_pc_aliases deleted file mode 100644 index 2ec9ba4..0000000 --- a/aliases/.my_pc_aliases +++ /dev/null @@ -1,7 +0,0 @@ -if [ "$(whoami)" == "kevin" ]; then - alias vbn="cvlc --loop --alsa-gain 1 ~/Downloads/brown-noise.mp3" - - alias mt="ok ~/Documents/School/calc-textbook.pdf" - alias clc="gcalccmd" - alias 36t="ok ~/Documents/School/236-textbook.pdf" -fi diff --git a/aliases/.pc_aliases b/aliases/.pc_aliases index 8709604..1425407 100644 --- a/aliases/.pc_aliases +++ b/aliases/.pc_aliases @@ -1,3 +1,14 @@ +# Both PC/Laptop {{{ +if [ "$(whoami)" == "kevin" ]; then + alias vbn="cvlc --loop --alsa-gain 1 ~/Downloads/brown-noise.mp3" + + alias mt="ok ~/Documents/School/calc-textbook.pdf" + alias clc="gcalccmd" + alias 36t="ok ~/Documents/School/236-textbook.pdf" +fi +# Both PC/Laptop }}} + +# NZXT {{{ if [ "$(hostname)" == "NZXT" ]; then rt() { output="HDMI-0" @@ -33,3 +44,15 @@ if [ "$(hostname)" == "NZXT" ]; then alias rcg="d ~/Documents/coding/random-color-generator" alias dcr="d ~/Documents/coding/dcr-logger" fi +# NZXT }}} + +# Laptop {{{ +if [ "$(hostname)" == "X1-Carbon" ]; then + # key swaps + xmodmap -e "keycode 9 = Escape" + xmodmap -e "keycode 22 = Home" + xmodmap -e "keycode 119 = End" + xmodmap -e "keycode 110 = Delete" + xmodmap -e "keycode 115 = BackSpace" +fi +# Laptop }}} diff --git a/aliases/.school_aliases b/aliases/.school_aliases index 381bc3d..eb7099e 100644 --- a/aliases/.school_aliases +++ b/aliases/.school_aliases @@ -1,19 +1,20 @@ in_lab=false cd_school="d ~/Documents/School/notes"; + +# Lab Setup/Aliases {{{ if [ $(whoami) == "mokkar" ]; then TERM=xterm-256color xmodmap -e "clear Lock" in_lab=true cd_school="d ~"; -fi -if $in_lab; then ff() { firefox $1 ; } zip() { tar -zcvf $1.tar.gz $1/ ; } alias nau="nautilus ." fi +# }}} -# general +# General {{{ alias sch="$cd_school" alias 236="$cd_school/236" alias psy="$cd_school/psy" @@ -25,8 +26,53 @@ cptp() { date=`date +%-m-%d` mv cp-template.tex "$date".tex } +# }}} -# 136 +# 136 {{{ alias 136="$cd_school/136" alias 136l="$cd_school/136/lecture" alias pr2="$cd_school/136/par/2" +# }}} + +# 209 {{{ +alias ll="ls -l" + +# General {{{ +cd_209="d ~/Documents/School/209"; +alias 209="$cd_209" +alias 9r="$cd_209/mokkar" +alias l5="$cd_209/mokkar/lab5" +alias a2="$cd_209/mokkar/a2" +# alias cdf="ssh -t mokkar@cdf.utoronto.ca '. ./.bashrc; bash -l'" +alias cdf="echo \". ./.bashrc\"&& ssh mokkar@cdf.utoronto.ca" +mkex() { chmod 700 $1 ; } +# }}} + +# {{{ Compilation Functions +# compile without running +c9() { gcc -Wall -std=gnu99 -g -o "${1%.*}.out" "$1" -lm ; } + +# compile all without running +c9a() { + for file in *; do + if [[ $file = *.c ]]; then + gcc -Wall -std=gnu99 -g -o "${file%.*}".out "$file" + fi + done +} + +# compile and run +c9r() { gc9 $1 && ./"${1%.*}.out" ; } + +# compile and run with input +c9i() { gc9 $1 && ./"${1%.*}.out" < $2 ; } + +# compile and run with input file +run() { + while read line; do + # ./$1.out $line + echo ./$1.out $line + done < $1.in +} +# }}} +# }}}