Updates for newer program versions

.gitmodules

@@ -40,6 +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"]
+[submodule "vim/bundle/nord"]
-	path = vim/bundle/vim-colors-solarized
+	path = vim/bundle/nord
-	url = https://github.com/altercation/vim-colors-solarized.git
+	url = https://github.com/nordtheme/vim.git

ctags.d/base.ctags

@@ -1,4 +1,5 @@
 --c++-kinds=+p
 --fields=+iaS 
---extra=+q
+--extras=+q
 --exclude=build
+--exclude=.git

ctags.d/trenton.ctags

@@ -0,0 +1 @@
+--exclude=mock

dircolors

@@ -131,24 +131,24 @@ DIR 36
 LINK 35
 
 # pipe, socket, block device, character device (blue bg)
-FIFO 34
+FIFO 37
-SOCK 34
+SOCK 37
-DOOR 34 # Solaris 2.5 and later
+DOOR 37 # Solaris 2.5 and later
-BLK  34
+BLK  37
-CHR  34
+CHR  37
 
 # }}}
 # File attributes {{{
 
 # Orphaned symlinks (blinking white on red)
 # Blink may or may not work (works on iTerm dark or light, and Putty dark)
-ORPHAN  05;37;45
+ORPHAN  37
 # ... and the files that orphaned symlinks point to (blinking white on red)
-MISSING 05;37;45
+MISSING 37
 # dir that is sticky and other-writable (+t,o+w)
-STICKY_OTHER_WRITABLE 36
+STICKY_OTHER_WRITABLE 37
 # dir that is other-writable (o+w) and not sticky
-OTHER_WRITABLE 36
+OTHER_WRITABLE 37
 
 # files with execute permission
 EXEC 01;31  # Unix

gentags

@@ -1,5 +1,6 @@
 #!/bin/bash
 
+LANGUAGE=${1:-CPP}
 CSCOPE_DIR="$PWD/cscope"
 
 if [ $# -lt 1 ]; then
@@ -12,37 +13,29 @@ if [ ! -d "$CSCOPE_DIR" ]; then
     mkdir "$CSCOPE_DIR"
 fi
 
-echo "Finding files ..."
+case ${LANGUAGE} in
-
+	CPP)    	ftypes=('*.c' '*.h' '*.cpp' '*.hpp' '*.cc') ;;
-case $LANG in
+	PYTHON) 	ftypes=('*.py') ;;
-    "C")
+	JAVA)   	ftypes=('*.java') ;;
-        find "$PWD" -type d \( -name regs -o -name reg \) -prune \
+	JAVASCRIPT) ftypes=('*.js') ;;
-            -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"
+		echo "Usage: ${0} [CPP|PYTHON|JAVA|JAVASCRIPT]"
 		exit 1
+		;;
 esac
 
+echo "Finding files ..."
+echo -n '' > "$CSCOPE_DIR/cscope.files"
+for ftype in ${ftypes[@]}; do
+	find "$PWD" \
+		-type f -name "${ftype}" \
+		-not -path "*/mock/*" \
+		-not -path "*.git/*" \
+		-not -path "*/regs/*" \
+		-not -path "*/Regs/*" \
+		-not -path "*/reg/*" >> "$CSCOPE_DIR/cscope.files"
+done
+
 echo "Adding files to cscope db: $PWD/cscope.db ..."
 cscope -b -i "$CSCOPE_DIR/cscope.files"
 

setup.sh

@@ -18,7 +18,7 @@ git submodule init
 git submodule update --recursive
 
 echo "Copying configs"
-config_copy_list=(ctags dircolors gitconfig inputrc tmux.conf vim vimrc Xdefaults)
+config_copy_list=(ctags.d dircolors gitconfig inputrc tmux.conf vim vimrc Xdefaults)
 for config in ${config_copy_list[@]}; do
     cp -fr "$config" $HOME/."$config"
 done

tmux.conf

@@ -52,7 +52,7 @@ set -g status-position bottom
 set -g status-justify left
 set -g status-style 'bg=colour8 fg=colour7'
 set -g status-left ''
-set -g status-right '#[fg=colour7,bg=colour237] LOCAL %H:%M:%S '
+set -g status-right '#[fg=colour7,bg=colour237] LOCAL %H:%M '
 set -g status-right-length 50
 set -g status-left-length 20
 

update_compile_commands

@@ -0,0 +1,26 @@
+#!/bin/bash
+
+BASE_PATH="/home/anaber/prj/trenton"
+DB_NAME="compile_commands.json"
+
+function do_update {
+    DB_SRC="$1"
+    ln -sf "${DB_SRC}" "${BASE_PATH}"/"${DB_NAME}"
+}
+
+# Get a list of valid compile command databases in the repo
+mapfile -t DB_LIST < <( find "${BASE_PATH}" -mindepth 2 -type f -name "${DB_NAME}" )
+idx=0
+for DB_ELEM in ${DB_LIST[@]}; do
+    echo "${idx}:  ${DB_ELEM}"
+    idx=$((idx+1))
+done
+
+# Parse and validate the user selection
+read -p "Select an option to update: " SELECTION
+NUM_ELEM=${#DB_LIST[@]}
+MAX_ELEM=$((NUM_ELEM-1))
+case "${SELECTION}" in
+    ''|*[!0-${MAX_ELEM}]*) echo "Operation cancelled" ;;
+    *) do_update "${DB_LIST[${SELECTION}]}" ;;
+esac

vimrc

@@ -20,8 +20,8 @@ nnoremap <silent> <Space> :nohlsearch<Bar>:echo<CR>
 syntax on
 filetype plugin indent on
 set background=dark
-colorscheme solarized
+colorscheme nord
-"set switchbuf+=uselast " Use last window when making selection from quickfix window
+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
 
@@ -32,6 +32,9 @@ nnoremap tn :tabnew<CR>
 map <C-\> :tab split<CR>:exec("tag ".expand("<cword>"))<CR>
 map <A-]> :vsp <CR>:exec("tag ".expand("<cword>"))<CR>
 
+hi ColorColumn guibg=#3b4252 ctermbg=black
+let &colorcolumn="80,120,160"
+
 " Load all plugins now.
 " Plugins need to be added to runtimepath before helptags can be generated.
 " packloadall
@@ -72,6 +75,7 @@ let g:rainbow_ctermfgs = ['lightblue', 'lightgreen', 'yellow', 'red', 'magenta']
 """" Gitgutter
 " CTRL-g to toggle GitGutter display
 nnoremap <C-g> :GitGutterToggle<CR>
+highlight SignColumn guibg=#002b36 ctermbg=8
 " Default to off
 :au VimEnter * :GitGutterDisable
 
@@ -84,10 +88,12 @@ nnoremap gdl :diffget //3<CR>
 autocmd FileType yaml setlocal ts=2 sts=2 sw=2 expandtab
 autocmd FileType yml setlocal ts=2 sts=2 sw=2 expandtab
 autocmd FileType puml setlocal ts=4 sts=4 sw=4 expandtab
+
+"""" IndentLine
 let g:indentLine_char = '┆'
 let g:indentLine_color_term = 237
-autocmd Filetype json let g:indentLine_setConceal = 0
 
+let g:indentLine_conceallevel = 0
 """" syntax highlighting editor settigs
 autocmd BufRead,BufNewFile *.cppcheck set filetype=xml
 autocmd BufRead,BufNewFile Jenkinsfile* set filetype=groovy