Fidgeting
This commit is contained in:
parent
f5a232bc71
commit
11536ef919
8 changed files with 40 additions and 15 deletions
2
.gitignore
vendored
2
.gitignore
vendored
|
@ -5,3 +5,5 @@
|
||||||
vim/vim/autoload
|
vim/vim/autoload
|
||||||
vim/vim/bundle
|
vim/vim/bundle
|
||||||
|
|
||||||
|
# Ignore undo files
|
||||||
|
*.un~
|
||||||
|
|
|
@ -10,6 +10,11 @@ if which ruby >/dev/null && which gem >/dev/null; then
|
||||||
PATH="$(ruby -rubygems -e 'puts Gem.user_dir')/bin:$PATH"
|
PATH="$(ruby -rubygems -e 'puts Gem.user_dir')/bin:$PATH"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Add Python projects to path
|
||||||
|
PYTHONPATH="${PYTHONPATH}:/home/niblock/Lab/gomez_audit"
|
||||||
|
|
||||||
|
export PYTHONPATH
|
||||||
|
|
||||||
# Uncomment the following line if you don't like systemctl's auto-paging feature:
|
# Uncomment the following line if you don't like systemctl's auto-paging feature:
|
||||||
# export SYSTEMD_PAGER=
|
# export SYSTEMD_PAGER=
|
||||||
|
|
||||||
|
@ -37,3 +42,5 @@ function live(){
|
||||||
* ) echo "Not an option, try again." ;;
|
* ) echo "Not an option, try again." ;;
|
||||||
esac
|
esac
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export PATH="$PATH:$HOME/.rvm/bin" # Add RVM to PATH for scripting
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
" vim: set ft=vim :
|
" vim: set ft=vim :
|
||||||
|
|
||||||
|
colorscheme seaweed
|
||||||
|
|
||||||
|
|
|
@ -16,3 +16,5 @@
|
||||||
[user]
|
[user]
|
||||||
name = Bill Niblock
|
name = Bill Niblock
|
||||||
email = bill_niblock@yahoo.com
|
email = bill_niblock@yahoo.com
|
||||||
|
[init]
|
||||||
|
templatedir = ~/.git_template
|
||||||
|
|
|
@ -32,7 +32,7 @@ class Clocks
|
||||||
w = Weather.new()
|
w = Weather.new()
|
||||||
t = Time.new()
|
t = Time.new()
|
||||||
@tu = t.utc.strftime("[ %H:%M ]")
|
@tu = t.utc.strftime("[ %H:%M ]")
|
||||||
@tb = t.getlocal("-04:00").strftime("<][ %b %d %H:%M | ")
|
@tb = t.getlocal.strftime("<][ %b %d %H:%M | ")
|
||||||
@tw = "#{w::flag} #{w::temp} ][>"
|
@tw = "#{w::flag} #{w::temp} ][>"
|
||||||
@tc = t.getlocal("-07:00").strftime("<][ %H:%M ]")
|
@tc = t.getlocal("-07:00").strftime("<][ %H:%M ]")
|
||||||
@ti = t.getlocal("+05:30").strftime("[ %H:%M ][>")
|
@ti = t.getlocal("+05:30").strftime("[ %H:%M ][>")
|
||||||
|
|
|
@ -1,9 +1,7 @@
|
||||||
= Date =
|
= Date =
|
||||||
|
|
||||||
== To-Do ==
|
|
||||||
|
|
||||||
== Quote ==
|
== Quote ==
|
||||||
|
|
||||||
== Goals ==
|
== Recap ==
|
||||||
|
|
||||||
== Notes ==
|
== Notes ==
|
||||||
|
|
28
vim/vimrc
28
vim/vimrc
|
@ -19,6 +19,9 @@ set encoding=utf-8
|
||||||
" Auto-reload files changed outside Vim
|
" Auto-reload files changed outside Vim
|
||||||
set autoread
|
set autoread
|
||||||
|
|
||||||
|
" Enable persistent undo
|
||||||
|
set undofile
|
||||||
|
|
||||||
" Shows you which commands you're typing
|
" Shows you which commands you're typing
|
||||||
set showcmd
|
set showcmd
|
||||||
|
|
||||||
|
@ -49,6 +52,12 @@ set textwidth=80
|
||||||
set winwidth=80
|
set winwidth=80
|
||||||
set wrap
|
set wrap
|
||||||
|
|
||||||
|
" Folding
|
||||||
|
" Enable folding; map fold-toggle to space when applicable
|
||||||
|
set foldmethod=syntax
|
||||||
|
nnoremap <silent> <Space> @=(foldlevel('.')?'za':"\<Space>")<CR>
|
||||||
|
vnoremap <Space> zf
|
||||||
|
|
||||||
" Enable auto-completion for vim commands
|
" Enable auto-completion for vim commands
|
||||||
" :help wildmode and :help wildmenu for details
|
" :help wildmode and :help wildmenu for details
|
||||||
set wildmenu
|
set wildmenu
|
||||||
|
@ -61,15 +70,20 @@ set incsearch
|
||||||
set hlsearch
|
set hlsearch
|
||||||
|
|
||||||
" Set default/backup colorscheme
|
" Set default/backup colorscheme
|
||||||
colorscheme desert
|
" colorscheme desert
|
||||||
|
|
||||||
|
" Spelling, but only on by default for certain files
|
||||||
|
augroup spellcheckr
|
||||||
|
autocmd BufNewFile,BufRead *.md setlocal spell
|
||||||
|
autocmd BufNewFile,BufRead *.rdoc setlocal spell
|
||||||
|
autocmd BufNewFile,BufRead *.txt setlocal spell
|
||||||
|
autocmd BufNewFile,BufRead *.wiki setlocal spell
|
||||||
|
augroup END
|
||||||
|
|
||||||
"######
|
"######
|
||||||
"# Mappings
|
"# Mappings
|
||||||
"##
|
"##
|
||||||
"
|
"
|
||||||
" I make use of many mappings from vim-impaired (hlsearch, relative numbering,
|
|
||||||
" and several other toggles). I highly suggest investing the time to learn and
|
|
||||||
" take advantage of those very eash mappings!
|
|
||||||
|
|
||||||
" Map Leader key
|
" Map Leader key
|
||||||
let mapleader = ","
|
let mapleader = ","
|
||||||
|
@ -99,7 +113,7 @@ nnoremap <silent> <leader>rtw :%s/\s\+$//e<CR>
|
||||||
nnoremap <silent> <leader>s :Startify<CR>
|
nnoremap <silent> <leader>s :Startify<CR>
|
||||||
|
|
||||||
" Open help topics in a full new tab
|
" Open help topics in a full new tab
|
||||||
command! -nargs=1 -complete=help H :enew | :set buftype=help | :h <args>
|
command! -nargs=1 -complete=help H :tabnew | :set buftype=help | :h <args>
|
||||||
|
|
||||||
" Show buffer list and prompt to choose one
|
" Show buffer list and prompt to choose one
|
||||||
nnoremap <leader>b :ls<CR>:b<space>
|
nnoremap <leader>b :ls<CR>:b<space>
|
||||||
|
@ -108,10 +122,6 @@ nnoremap <leader>b :ls<CR>:b<space>
|
||||||
"# Plugins
|
"# Plugins
|
||||||
"###
|
"###
|
||||||
|
|
||||||
" Old Way: Pathogen, add-ons go in ~/.vim/bundle/
|
|
||||||
" runtime bundle/vim-pathogen/autoload/pathogen.vim
|
|
||||||
" execute pathogen#infect()
|
|
||||||
|
|
||||||
" New Way: Vim-Plug, add-ons configured in .vimrc-plugins
|
" New Way: Vim-Plug, add-ons configured in .vimrc-plugins
|
||||||
if filereadable(expand("~/.vimrc-plugins"))
|
if filereadable(expand("~/.vimrc-plugins"))
|
||||||
source ~/.vimrc-plugins
|
source ~/.vimrc-plugins
|
||||||
|
|
|
@ -25,7 +25,6 @@ endif
|
||||||
" # Fetch & Install Plugins
|
" # Fetch & Install Plugins
|
||||||
" ###
|
" ###
|
||||||
|
|
||||||
|
|
||||||
call plug#begin('~/.vim/bundle')
|
call plug#begin('~/.vim/bundle')
|
||||||
|
|
||||||
" Current list of plugins
|
" Current list of plugins
|
||||||
|
@ -36,6 +35,7 @@ Plug 'tpope/vim-surround'
|
||||||
Plug 'vimwiki/vimwiki'
|
Plug 'vimwiki/vimwiki'
|
||||||
Plug 'tpope/vim-unimpaired'
|
Plug 'tpope/vim-unimpaired'
|
||||||
Plug 'tpope/vim-commentary'
|
Plug 'tpope/vim-commentary'
|
||||||
|
Plug 'ajh17/VimCompletesMe'
|
||||||
" Plug 'ap/vim-templates'
|
" Plug 'ap/vim-templates'
|
||||||
|
|
||||||
" Ruby Related
|
" Ruby Related
|
||||||
|
@ -46,6 +46,7 @@ Plug 'vim-ruby/vim-ruby'
|
||||||
Plug 'mhinz/vim-startify'
|
Plug 'mhinz/vim-startify'
|
||||||
Plug 'bling/vim-airline'
|
Plug 'bling/vim-airline'
|
||||||
Plug 'dikiaap/minimalist'
|
Plug 'dikiaap/minimalist'
|
||||||
|
Plug 'junegunn/goyo.vim'
|
||||||
|
|
||||||
" Syntax Related
|
" Syntax Related
|
||||||
Plug 'scrooloose/syntastic'
|
Plug 'scrooloose/syntastic'
|
||||||
|
@ -85,9 +86,14 @@ let g:syntastic_check_on_wq = 1
|
||||||
let g:syntastic_sh_checkers = [ 'shellcheck', 'sh' ]
|
let g:syntastic_sh_checkers = [ 'shellcheck', 'sh' ]
|
||||||
|
|
||||||
" Vimwiki Configs
|
" Vimwiki Configs
|
||||||
|
let g:vimwiki_list = [{'auto_tags': 1}]
|
||||||
"" Insert my journal template, and the current date
|
"" Insert my journal template, and the current date
|
||||||
nnoremap <silent><leader>tj :call NewJournal()<CR>
|
nnoremap <silent><leader>tj :call NewJournal()<CR>
|
||||||
function! NewJournal()
|
function! NewJournal()
|
||||||
.-1read ~/.vim/templates/journal
|
.-1read ~/.vim/templates/journal
|
||||||
s/Date/\=strftime("%A, %B %d")/
|
s/Date/\=strftime("%A, %B %d")/
|
||||||
endfunction
|
endfunction
|
||||||
|
|
||||||
|
"" Easy mappings for previous/next day, since defaults don't work
|
||||||
|
nnoremap <silent><leader>dp :VimwikiDiaryPrevDay<CR>
|
||||||
|
nnoremap <silent><leader>dn :VimwikiDiaryNextDay<CR>
|
||||||
|
|
Loading…
Reference in a new issue