Skip to content

Commit

Permalink
Adding tagbar and good aliases
Browse files Browse the repository at this point in the history
  • Loading branch information
Johnny Thompson committed Mar 17, 2017
1 parent f85cc13 commit 5e36fc8
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 14 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
Expand Up @@ -61,3 +61,6 @@
[submodule "_vim/bundle/taglist"]
path = _vim/bundle/taglist
url = https://github.com/vim-scripts/taglist.vim.git
[submodule "_vim/bundle/tagbar"]
path = _vim/bundle/tagbar
url = https://github.com/majutsushi/tagbar.git
9 changes: 6 additions & 3 deletions _bash_aliases
Expand Up @@ -5,7 +5,7 @@ if [[ "$unamestr" == 'Linux' ]]; then
platform='linux'
#Remember to uncomment this to do xilinx development in bash
#bash /opt/Xilinx/Vivado/2013.2/settings64.sh
bash /opt/Xilinx/14.7/ISE_DS/settings64.sh
# bash /opt/Xilinx/14.7/ISE_DS/settings64.sh
elif [[ "$unamestr" == 'Darwin' ]]; then
platform='osx'
alias usbinfo='system_profiler SPUSBDataType'
Expand All @@ -29,9 +29,9 @@ if [[ $platform == 'linux' ]]; then
alias ls='ls --color=auto'
alias go='xdg-open'
# uncomment the following to do xilinx development in bash
source /opt/Xilinx/14.7/ISE_DS/settings64.sh
#source /opt/Xilinx/14.7/ISE_DS/settings64.sh
#export XILINX_EDK=/opt/Xilinx/13.4/ISE_DS/EDK
export XILINX_EDK=/opt/Xilinx/14.7/ISE_DS/EDK
#export XILINX_EDK=/opt/Xilinx/14.7/ISE_DS/EDK
alias updatewsgi='touch /srv/www/DBxPosed/apache/django.wsgi'
alias gotowork='ssh -Y -C -o CompressionLevel=9 -c arcfour,blowfish-cbc ztswdev@worklaptop.local'

Expand Down Expand Up @@ -91,3 +91,6 @@ alias yms='yaourt -S'

# Add in server aliases
. ~/.servers
alias eagle='/home/vet-fpga/eagle-7.6.0/bin/eagle'
alias tma='tmux att -t'
alias cp='rsync -avz --progress'
6 changes: 1 addition & 5 deletions _bashrc
Expand Up @@ -175,8 +175,4 @@ export GIT_EDITOR="$vim"
# Add git and svn branch names
export PS1="$PS1\$(parse_git_branch)\$(parse_svn_branch) "

export PATH=/Applications/microchip/mplabc30/v3.30c/bin:$PATH

PATH=$PATH:$HOME/.rvm/bin:/usr/local/sbin # Add RVM to PATH for scripting

export PATH="/Applications/microchip/xc16/v1.11/bin":$PATH
export PATH=$PATH:$HOME/.rvm/bin:/usr/local/sbin # Add RVM to PATH for scripting
2 changes: 0 additions & 2 deletions _config/htop/htoprc
Expand Up @@ -8,7 +8,6 @@ hide_kernel_threads=1
hide_userland_threads=0
shadow_other_users=0
show_thread_names=0
show_program_path=1
highlight_base_name=0
highlight_megabytes=1
highlight_threads=1
Expand All @@ -17,7 +16,6 @@ header_margin=1
detailed_cpu_time=0
cpu_count_from_zero=0
update_process_names=0
account_guest_in_cpu_meter=0
color_scheme=0
delay=15
left_meters=LeftCPUs Memory Swap
Expand Down
6 changes: 3 additions & 3 deletions _gitconfig
@@ -1,6 +1,6 @@
[user]
name = MacGyverQue
email = skelotar@gmail.com
name = Johnny Thompson
email = johnny.thompson@apogee-research.com

[color]
diff = auto
Expand All @@ -14,7 +14,7 @@
[core]
editor = vim
pager = less -R
excludesfile = $HOME/.gitignore_global
excludesfile = /home/vet-fpga/.gitignore_global

[alias]
diverges = !bash -c 'diff -u <(git rev-list --first-parent "${1}") <(git rev-list --first-parent "${2:-HEAD}") | sed -ne \"s/^ //p\" | head -1' -
Expand Down
1 change: 1 addition & 0 deletions _vim/bundle/tagbar
Submodule tagbar added at 959f48
5 changes: 4 additions & 1 deletion _vimrc
Expand Up @@ -131,6 +131,9 @@ map <leader>t :TlistToggle<CR>
" Vimgrep Search under Cursor
map <F4> :execute "vimgrep /" . expand("<cword>") . "/j **/*.?" <Bar> cw<CR>
" Tagbar Toggle
nmap <F8> :TagbarToggle<CR>
" Quick Write
map <leader>w :w<CR>
Expand Down Expand Up @@ -321,7 +324,7 @@ let g:pyflakes_use_quickfix = 0
" C Specific Instructions
" ====================================================================
" Regenerate ctags after file write
au BufWritePost *.c,*.cpp,*.h,*.py silent! !ctags -R &
"au BufWritePost *.c,*.cpp,*.h,*.py silent! !ctags -R &
" Set colorcolumn for c files
" au FileType c setlocal colorcolumn=80
" Override make with make! to keep quickfix from jumping to the errors
Expand Down

0 comments on commit 5e36fc8

Please sign in to comment.