diff --git a/.gitignore b/.gitignore index 7f101a9..b7c59fd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ *.swp temp.sh konsole.shortcuts +dotfiles/termConfig diff --git a/dotfiles/.bash_aliases b/dotfiles/.bash_aliases index 32bc369..9af694a 100644 --- a/dotfiles/.bash_aliases +++ b/dotfiles/.bash_aliases @@ -61,7 +61,7 @@ fi # school alias sch="$cd_school" alias 136="$cd_school/136" -alias pr2="c \"$cd_school\"/136/par/1" +alias pr2="$cd_school/136/par/2" alias mt="ok \"$cd_school\"/136/calc-textbook.pdf" alias psy="$cd_school/psy" @@ -73,7 +73,7 @@ alias psy="$cd_school/psy" alias a1="$cd_school/209/mokkar/a1" gc9l3() { - gcc -Wall -std=gnu99 -g -o split_array.out split_array.c -lm + gcc -Wall -std=gnu99 -g -o split_array.out split_array.c ./split_array.out 1 2 3 } gc9() { diff --git a/dotfiles/.vimrc b/dotfiles/.vimrc index 9371d16..ed95e88 100644 --- a/dotfiles/.vimrc +++ b/dotfiles/.vimrc @@ -25,15 +25,26 @@ endif call plug#begin('~/.vim/plugged') Plug 'vim-scripts/L9' -Plug 'vim-scripts/FuzzyFinder' +" Plug 'vim-scripts/FuzzyFinder' Plug 'whatyouhide/vim-gotham' Plug 'nathanaelkane/vim-indent-guides' Plug 'flazz/vim-colorschemes' Plug 'felixhummel/setcolors.vim' Plug '907th/vim-auto-save' Plug 'xuhdev/vim-latex-live-preview', { 'for': 'tex' } -" Plug 'artur-shaik/vim-javacomplete2' -" autocmd FileType java setlocal omnifunc=javacomplete#Complete +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 = ['', ''] +let g:ycm_key_list_previous_completion = ['', ''] +let g:SuperTabDefaultCompletionType = '' +" better key bindings for UltiSnipsExpandTrigger +let g:UltiSnipsExpandTrigger = "" +let g:UltiSnipsJumpForwardTrigger = "" +let g:UltiSnipsJumpBackwardTrigger = "" call plug#end() diff --git a/dotfiles/termConfig b/dotfiles/termConfig deleted file mode 100644 index 5e4de62..0000000 --- a/dotfiles/termConfig +++ /dev/null @@ -1,35 +0,0 @@ -[global_config] - inactive_color_offset = 1.0 - title_font = Noto Sans 10 - title_transmit_bg_color = "#3d3d3d" -[keybindings] - close_term = w - cycle_next = Tab - go_down = Down - go_left = Left - go_right = Right - go_up = Up - new_tab = t - split_horiz = e - split_vert = o -[layouts] - [[default]] - [[[child1]]] - parent = window0 - type = Terminal - [[[window0]]] - parent = "" - type = Window -[plugins] -[profiles] - [[default]] - background_image = None - copy_on_selection = True - cursor_color = "#b9b9b9" - custom_command = env TERM=xterm-256color bash - 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 - use_custom_command = True - use_system_font = False