From 07f475b44ab4d6bb4c91940bb01279a47e7be35f Mon Sep 17 00:00:00 2001
From: Kevin Mok <kevin.mok@mail.utoronto.ca>
Date: Mon, 29 Jan 2018 18:07:25 -0500
Subject: [PATCH] Compile assignment functions, CDF SSH alias

Vim enter for new lines.
---
 dotfiles/.bash_aliases | 19 +++++++++++++++----
 dotfiles/.vimrc        | 21 +++++++++------------
 2 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/dotfiles/.bash_aliases b/dotfiles/.bash_aliases
index 9af694a..94fa909 100644
--- a/dotfiles/.bash_aliases
+++ b/dotfiles/.bash_aliases
@@ -72,18 +72,29 @@ alias psy="$cd_school/psy"
 	alias l3="$cd_school/209/mokkar/lab3"
 	alias a1="$cd_school/209/mokkar/a1"
 
-	gc9l3() {
+	alias cdf="ssh mokkar@cdf.utoronto.ca"
+
+	ca12() {
+		gcc -Wall -std=gnu99 -g -o validate_sin.out validate_sin.c sin_helpers.c
+		./validate_sin.out 810620716
+	}
+	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
+	}
+	cl3() {
 		gcc -Wall -std=gnu99 -g -o split_array.out split_array.c
 		./split_array.out 1 2 3 
 	}
-	gc9() { 
+	c9() { 
 		gcc -Wall -std=gnu99 -g -o "${1%.*}.out" "$1" -lm 
 	}
-	gc9r() {
+	c9r() {
 		gc9 $1
 		./"${1%.*}.out"
 	}
-	gc9i() {
+	c9i() {
 		gc9 $1
 		./"${1%.*}.out" < $2
 	}
diff --git a/dotfiles/.vimrc b/dotfiles/.vimrc
index ed95e88..3dccd53 100644
--- a/dotfiles/.vimrc
+++ b/dotfiles/.vimrc
@@ -34,17 +34,15 @@ Plug '907th/vim-auto-save'
 Plug 'xuhdev/vim-latex-live-preview', { 'for': 'tex' }
 Plug 'lervag/vimtex'
 Plug 'Valloric/YouCompleteMe'
-Plug 'ervandew/supertab'
 Plug 'honza/vim-snippets'
 Plug 'SirVer/ultisnips'
-" make YCM compatible with UltiSnips (using supertab)
-let g:ycm_key_list_select_completion = ['<C-n>', '<Down>']
-let g:ycm_key_list_previous_completion = ['<C-p>', '<Up>']
-let g:SuperTabDefaultCompletionType = '<C-n>'
-" better key bindings for UltiSnipsExpandTrigger
-let g:UltiSnipsExpandTrigger = "<tab>"
-let g:UltiSnipsJumpForwardTrigger = "<tab>"
-let g:UltiSnipsJumpBackwardTrigger = "<s-tab>"
+" let g:ycm_key_list_select_completion = ['<C-d>', '<Down>']
+" let g:ycm_key_list_previous_completion = ['<C-u>', '<Up>']
+let g:ycm_key_list_select_completion = []
+let g:ycm_key_list_previous_completion = []
+let g:UltiSnipsExpandTrigger = "<c-j>"
+let g:UltiSnipsJumpForwardTrigger = "<c-b>"
+let g:UltiSnipsJumpBackwardTrigger = "<c-z>"
 
 call plug#end()
 
@@ -56,6 +54,5 @@ map <F5> :qa!<CR>
 map <F6> :LLPStartPreview<CR>
 map <F7> :AutoSaveToggle<CR>
 map <F10> :PlugInstall<CR>
-map <C-F1> :.,$s/:\(\w\)/: \1/g<CR>
-" map <Enter> o<ESC>
-" map <S-Enter> O<ESC>
+map <Enter> o<ESC>
+map <S-Enter> O<ESC>