diff --git a/.gitmodules b/.gitmodules index d45c3c8..9636a75 100644 --- a/.gitmodules +++ b/.gitmodules @@ -40,3 +40,6 @@ [submodule "vim/bundle/yaifa"] path = vim/bundle/yaifa url = https://github.com/vim-scripts/yaifa.vim.git +[submodule "vim/bundle/vim-colors-solarized"] + path = vim/bundle/vim-colors-solarized + url = https://github.com/altercation/vim-colors-solarized.git diff --git a/dircolors b/dircolors index 4d4fa30..c318c4f 100644 --- a/dircolors +++ b/dircolors @@ -131,11 +131,11 @@ DIR 36 LINK 35 # pipe, socket, block device, character device (blue bg) -FIFO 37;44 -SOCK 37;44 -DOOR 37;44 # Solaris 2.5 and later -BLK 37;44 -CHR 37;44 +FIFO 34 +SOCK 34 +DOOR 34 # Solaris 2.5 and later +BLK 34 +CHR 34 # }}} # File attributes {{{ @@ -146,9 +146,9 @@ ORPHAN 05;37;45 # ... and the files that orphaned symlinks point to (blinking white on red) MISSING 05;37;45 # dir that is sticky and other-writable (+t,o+w) -STICKY_OTHER_WRITABLE 30;46 +STICKY_OTHER_WRITABLE 36 # dir that is other-writable (o+w) and not sticky -OTHER_WRITABLE 30;46 +OTHER_WRITABLE 36 # files with execute permission EXEC 01;31 # Unix @@ -361,20 +361,20 @@ EXEC 01;31 # Unix .log 32 # Unimportant non-text files -*,v 01;30 -.BAK 01;30 -.DIST 01;30 -.OFF 01;30 -.OLD 01;30 -.ORIG 01;30 -.bak 01;30 -.dist 01;30 -.off 01;30 -.old 01;30 -.org_archive 01;30 -.orig 01;30 -.swo 01;30 -.swp 01;30 +*,v 01;32 +.BAK 01;32 +.DIST 01;32 +.OFF 01;32 +.OLD 01;32 +.ORIG 01;32 +.bak 01;32 +.dist 01;32 +.off 01;32 +.old 01;32 +.org_archive 01;32 +.orig 01;32 +.swo 01;32 +.swp 01;32 # }}} diff --git a/gentags b/gentags index 0009239..dd62b9f 100755 --- a/gentags +++ b/gentags @@ -2,16 +2,46 @@ CSCOPE_DIR="$PWD/cscope" +if [ $# -lt 1 ]; then + LANG="C" +else + LANG="${1}" +fi + if [ ! -d "$CSCOPE_DIR" ]; then - mkdir "$CSCOPE_DIR" + mkdir "$CSCOPE_DIR" fi echo "Finding files ..." -find "$PWD" -type d \( -name regs -o -name reg \) -prune \ - -o -name '*.[ch]' \ - -o -name '*.cpp' \ - -o -name '*.cc' \ - -o -name '*.hpp' > "$CSCOPE_DIR/cscope.files" + +case $LANG in + "C") + find "$PWD" -type d \( -name regs -o -name reg \) -prune \ + -o -name '*.[ch]' \ + -o -name '*.cpp' \ + -o -name '*.cc' \ + -o -name '*.hpp' \ + > "$CSCOPE_DIR/cscope.files" + ;; + "PYTHON") + find "$PWD" -type f \ + -name "*.py" \ + > "$CSCOPE_DIR/cscope.files" + ;; + "JAVA") + find "$PWD" -type f \ + -name "*.java" \ + > "$CSCOPE_DIR/cscope.files" + ;; + "JAVASCRIPT") + find "$PWD" -type f \ + -name "*.js" \ + > "$CSCOPE_DIR/cscope.files" + ;; + *) + echo "Valid choices are C, PYTHON, JAVA, and JAVASCRIPT" + exit 1 +esac echo "Adding files to cscope db: $PWD/cscope.db ..." cscope -b -i "$CSCOPE_DIR/cscope.files" diff --git a/gitconfig b/gitconfig index 6fc42c0..3333f06 100644 --- a/gitconfig +++ b/gitconfig @@ -1,8 +1,9 @@ [user] - email = anaber@pm.me - name = Autumn Naber + email = ENTERME + name = ENTERME [diff] tool = vimdiff + wsErrorHighlight = all [difftool] prompt = false [alias] @@ -17,3 +18,13 @@ default = simple [core] editor = vim +[pull] + ff = only +[http] + postBuffer = 524288000 + sslcainfo = /etc/ssl/certs/ca-certificates.crt +[filter "lfs"] + clean = git-lfs clean -- %f + smudge = git-lfs smudge -- %f + process = git-lfs filter-process + required = true diff --git a/tmux.conf b/tmux.conf index eb46ab6..ab7d705 100644 --- a/tmux.conf +++ b/tmux.conf @@ -25,6 +25,9 @@ set-option -s escape-time 0 # Enable mouse control (clickable windows, panes, resizable panes) set -g mouse on +# Enable support for 256-colors +set -g default-terminal "screen-256color" + ###################### ### DESIGN CHANGES ### ###################### diff --git a/vim/bundle/vim-colors-solarized b/vim/bundle/vim-colors-solarized new file mode 160000 index 0000000..528a59f --- /dev/null +++ b/vim/bundle/vim-colors-solarized @@ -0,0 +1 @@ +Subproject commit 528a59f26d12278698bb946f8fb82a63711eec21 diff --git a/vimrc b/vimrc index 3fc427d..f7a8cbc 100644 --- a/vimrc +++ b/vimrc @@ -15,13 +15,15 @@ set hlsearch set ignorecase set smartcase set smartindent -:nnoremap :nohlsearch:echo +nnoremap :nohlsearch:echo syntax on filetype plugin indent on -colorscheme apprentice -set switchbuf+=uselast " Use last window when making selection from quickfix window +set background=dark +colorscheme solarized +"set switchbuf+=uselast " Use last window when making selection from quickfix window set redrawtime=5000 " Increase maximum redraw time to use syntax highlighting for large files +:set colorcolumn=80 " Add a vertical line at column 80 set backspace=indent,eol,start " Make backspace key work in insert mode @@ -70,6 +72,8 @@ let g:rainbow_ctermfgs = ['lightblue', 'lightgreen', 'yellow', 'red', 'magenta'] """" Gitgutter " CTRL-g to toggle GitGutter display nnoremap :GitGutterToggle +" Default to off +:au VimEnter * :GitGutterDisable " Fugitive conflict resolution nnoremap gd :Gvdiff @@ -82,6 +86,11 @@ autocmd FileType yml setlocal ts=2 sts=2 sw=2 expandtab autocmd FileType puml setlocal ts=4 sts=4 sw=4 expandtab let g:indentLine_char = '┆' let g:indentLine_color_term = 237 +autocmd Filetype json let g:indentLine_setConceal = 0 + +"""" syntax highlighting editor settigs +autocmd BufRead,BufNewFile *.cppcheck set filetype=xml +autocmd BufRead,BufNewFile Jenkinsfile* set filetype=groovy " vim-airline let g:airline#extensions#whitespace#enabled = 0 @@ -98,6 +107,14 @@ function! InitAirline() endfunction autocmd VimEnter * call InitAirline() +" codeium-vim +" let g:codeium_server_config = { +" \ "api_url": "https://codeium-hdd.wdc.com/_route/api_server", +" \ "portal_url": "https://codeium-hdd.wdc.com", +" \ "config_url": "https://codeium-hdd.wdc.com"} +" let g:codeium_no_map_tab = 1 +" imap