From 71870123c2c066f66b2585898350e5481bfaa1df Mon Sep 17 00:00:00 2001 From: Nicole Tietz-Sokolskaya Date: Fri, 10 Sep 2021 22:00:17 -0400 Subject: [PATCH] Out with the cruft, in with the new cruft --- .gitmodules | 48 ----- bash/.bash_helpers.sh | 68 ------- bash/.bashrc | 50 ++++- bash/.profile | 74 ++----- config.sh | 10 +- ctags/.ctags | 14 -- iex/.iex.exs | 2 - vim/.vim/autoload/pathogen.vim | 353 --------------------------------- vim/.vim/bundle/airline | 1 - vim/.vim/bundle/alchemist | 1 - vim/.vim/bundle/bats | 1 - vim/.vim/bundle/colorschemes | 1 - vim/.vim/bundle/ctrlp | 1 - vim/.vim/bundle/elm-vim | 1 - vim/.vim/bundle/fugitive | 1 - vim/.vim/bundle/nerdtree | 1 - vim/.vim/bundle/typescript-vim | 1 - vim/.vim/bundle/vim-css-color | 1 - vim/.vim/bundle/vim-elixir | 1 - vim/.vim/bundle/vim-gitgutter | 1 - vim/.vim/bundle/vim-graphql | 1 - vim/.vim/bundle/vim-scala | 1 - vim/.vim/bundle/vim-terraform | 1 - vim/.vim/bundle/vimwiki | 1 - vim/.vim/vimrc | 89 --------- 25 files changed, 67 insertions(+), 657 deletions(-) delete mode 100644 bash/.bash_helpers.sh delete mode 100644 ctags/.ctags delete mode 100644 iex/.iex.exs delete mode 100644 vim/.vim/autoload/pathogen.vim delete mode 160000 vim/.vim/bundle/airline delete mode 160000 vim/.vim/bundle/alchemist delete mode 160000 vim/.vim/bundle/bats delete mode 160000 vim/.vim/bundle/colorschemes delete mode 160000 vim/.vim/bundle/ctrlp delete mode 160000 vim/.vim/bundle/elm-vim delete mode 160000 vim/.vim/bundle/fugitive delete mode 160000 vim/.vim/bundle/nerdtree delete mode 160000 vim/.vim/bundle/typescript-vim delete mode 160000 vim/.vim/bundle/vim-css-color delete mode 160000 vim/.vim/bundle/vim-elixir delete mode 160000 vim/.vim/bundle/vim-gitgutter delete mode 160000 vim/.vim/bundle/vim-graphql delete mode 160000 vim/.vim/bundle/vim-scala delete mode 160000 vim/.vim/bundle/vim-terraform delete mode 160000 vim/.vim/bundle/vimwiki delete mode 100644 vim/.vim/vimrc diff --git a/.gitmodules b/.gitmodules index a257b20..d938106 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,51 +1,3 @@ -[submodule "bundle/fugitive"] - path = vim/.vim/bundle/fugitive - url = https://github.com/tpope/vim-fugitive.git -[submodule "bundle/nerdtree"] - path = vim/.vim/bundle/nerdtree - url = https://github.com/scrooloose/nerdtree.git -[submodule "bundle/airline"] - path = vim/.vim/bundle/airline - url = https://github.com/vim-airline/vim-airline -[submodule "bundle/vim-colorschemes"] - path = vim/.vim/bundle/colorschemes - url = https://github.com/flazz/vim-colorschemes -[submodule "bundle/vim-scala"] - path = vim/.vim/bundle/vim-scala - url = https://github.com/derekwyatt/vim-scala -[submodule "bundle/vimwiki"] - path = vim/.vim/bundle/vimwiki - url = https://github.com/vimwiki/vimwiki.git -[submodule "bundle/vim-graphql"] - path = vim/.vim/bundle/vim-graphql - url = https://github.com/jparise/vim-graphql -[submodule "bundle/typescript-vim"] - path = vim/.vim/bundle/typescript-vim - url = https://github.com/leafgarland/typescript-vim -[submodule "bundle/vim-elixir"] - path = vim/.vim/bundle/vim-elixir - url = https://github.com/elixir-lang/vim-elixir.git -[submodule "vim/.vim/bundle/alchemist"] - path = vim/.vim/bundle/alchemist - url = https://github.com/slashmili/alchemist.vim -[submodule "vim/.vim/bundle/vim-css-color"] - path = vim/.vim/bundle/vim-css-color - url = https://github.com/ap/vim-css-color -[submodule "vim/.vim/bundle/vim-terraform"] - path = vim/.vim/bundle/vim-terraform - url = https://github.com/hashivim/vim-terraform.git -[submodule "vim/.vim/bundle/ctrlp"] - path = vim/.vim/bundle/ctrlp - url = https://github.com/ctrlpvim/ctrlp.vim -[submodule "vim/.vim/bundle/vim-gitgutter"] - path = vim/.vim/bundle/vim-gitgutter - url = https://github.com/airblade/vim-gitgutter -[submodule "vim/.vim/bundle/elm-vim"] - path = vim/.vim/bundle/elm-vim - url = https://github.com/ElmCast/elm-vim -[submodule "vim/.vim/bundle/bats"] - path = vim/.vim/bundle/bats - url = https://github.com/vim-scripts/bats.vim [submodule "nvim/.config/nvim/plug"] path = nvim/.config/nvim/plug url = https://github.com/junegunn/vim-plug diff --git a/bash/.bash_helpers.sh b/bash/.bash_helpers.sh deleted file mode 100644 index aef7938..0000000 --- a/bash/.bash_helpers.sh +++ /dev/null @@ -1,68 +0,0 @@ - -set_prompt() { - local BLUE="\[\e[0;34m\]" - local DARK_BLUE="\[\e[1;34m\]" - local RED="\[\e[0;31m\]" - local DARK_RED="\[\e[1;31m\]" - local GREEN="\[\e[0;32m\]" - local NO_COLOR="\[\e[0m\]" - - case $TERM in - xterm*|screen) - TITLEBAR='\[\e]0;\u@\h \w\007\]'; - ;; - *) - TITLEBAR=""; - ;; - esac - - FAILURE_COLOR="if [[ \$? = '0' ]]; then echo \"$GREEN\"; else echo \"$RED\"; fi" - - PS1="${TITLEBAR}$BLUE[\t]\`$FAILURE_COLOR\` \u@\h> $NO_COLOR" -} - -restart_network_manager() { - sudo service network-manager restart -} - -configure_ls() { - PLATFORM=$(uname) - # makes ls print pretty - case $PLATFORM in - Linux) - alias ls="ls --color=auto" - ;; - *) - alias ls="ls -G" - ;; - esac -} - -configure_completions() { - # If the gcloud sdk is installed, set up completion for it - if [[ -e "$HOME/.install/google-cloud-sdk" ]]; then - source $HOME/.install/google-cloud-sdk/completion.bash.inc - source $HOME/.install/google-cloud-sdk/path.bash.inc - fi -} - -vimwiki() { - cd ~/Code/ntietz/vimwiki - git pull - nvim -c "VimwikiIndex" - git add -A - git commit -am "Auto-commit ($(date))" - git push - cd - -} - -set_term_colors() { - bash -c "$(wget -qO- https://git.io/vQgMr)" -} - - -print_available_colors() { - for i in {0..255} ; do printf "\x1b[38;5;${i}mcolour${i}\n"; done -} - - diff --git a/bash/.bashrc b/bash/.bashrc index 839f109..a6e262e 100644 --- a/bash/.bashrc +++ b/bash/.bashrc @@ -1,9 +1,47 @@ -source ~/.profile +# ~/.bashrc: executed by bash(1) for non-login shells. +# We source it in ~/.profile so that it is used for _all_ shells. -# something with keyword completion -# . /etc/bash_completion -if [ -f /etc/bash_completion ] -then - . /etc/bash_completion +# Don't do anything if the shell isn't interactive +case $- in + *i*) ;; + *) return;; +esac + +# don't put duplicates or lines starting with a space in the history. +HISTCONTROL=ignoreboth +# store a long history +export HISTSIZE=1000000 +export HISTFILESIZE=10000000 + +# append to the history file rather than overwriting it +shopt -s histappend + +# check the window size after each command and, if necessary, +# update the values of LINES and COLUMNS. +shopt -s checkwinsize + +# all my terminals support color so let's colorize this alllllll +PS1="\[\e[33m\][\t] \`if [[ \$? = '0' ]]; then echo \"\[\e[0;32m\]\"; else echo \"\[\e[0;31m\]\"; fi\`\u@\h\[\e[0m\]> " +# modify the title bar, too +PS1="\[\e]0;\u@\h: \w\a\]$PS1" + +# enable color support of ls and also add handy aliases +if [ -x /usr/bin/dircolors ]; then + test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)" + alias ls='ls --color=auto' + #alias dir='dir --color=auto' + #alias vdir='vdir --color=auto' + + alias grep='grep --color=auto' + alias fgrep='fgrep --color=auto' + alias egrep='egrep --color=auto' fi +# enable programmable completion features +if ! shopt -oq posix; then + if [ -f /usr/share/bash-completion/bash_completion ]; then + . /usr/share/bash-completion/bash_completion + elif [ -f /etc/bash_completion ]; then + . /etc/bash_completion + fi +fi diff --git a/bash/.profile b/bash/.profile index d28fec8..d89ea5a 100644 --- a/bash/.profile +++ b/bash/.profile @@ -1,61 +1,27 @@ +# ~/.profile: executed by the command interpreter for login shells. +# This file is not read by bash(1), if ~/.bash_profile or ~/.bash_login +# exists. +# see /usr/share/doc/bash/examples/startup-files for examples. +# the files are located in the bash-doc package. -source ~/.bash_helpers.sh +# the default umask is set in /etc/profile; for setting the umask +# for ssh logins, install and configure the libpam-umask package. +#umask 022 -set_prompt -configure_ls -configure_completions - -alias vim="nvim" -alias notes="vim ~/notes.md" - -alias vw="vimwiki" -alias update_configs="cd ~/Code/ntietz/config; git pull; cd -; source ~/.profile" - -# default editor -export EDITOR=vim - -# set history -export HISTSIZE=1000000 # very large history -export HISTFILESIZE=10000000 # very large history -export HISTCONTROL=ignoreboth:erasedups # ignore duplicate history entries -shopt -s histappend # append to the history when the shell exits (instead of overwriting) - -# disable messaging -if `tty -s`; then - mesg n +# if running bash +if [ -n "$BASH_VERSION" ]; then + # include .bashrc if it exists + if [ -f "$HOME/.bashrc" ]; then + . "$HOME/.bashrc" + fi fi -export PATH="$HOME/.local/bin:$HOME/.bin:$HOME/go/bin:$PATH" -export TERM=xterm-256color -#export TERM=xterm-256color - -if [ -d "$HOME/.pyenv" ] && [ -z ${PYENV_SHELL+x} ] -then - export PATH="$HOME/.pyenv/bin:$PATH" - eval "$(pyenv init -)" - export PYENV_ROOT="$HOME/.pyenv" +# set PATH so it includes user's private bin if it exists +if [ -d "$HOME/bin" ] ; then + PATH="$HOME/bin:$PATH" fi -if [ -x "$(command -v gcloud)" ] && [ -f "$HOME/.install/google-cloud-sdk" ] -then - source $HOME/.install/google-cloud-sdk/completion.bash.inc - source $HOME/.install/google-cloud-sdk/path.bash.inc +# set PATH so it includes user's private bin if it exists +if [ -d "$HOME/.local/bin" ] ; then + PATH="$HOME/.local/bin:$PATH" fi - -if [ -x "$(command -v yarn)" ] && [ -d "$HOME/.yarn/bin" ] -then - export PATH="/home/nicholas/.yarn/bin:$PATH" -fi - -alias iex="iex --erl \"-kernel shell_history enabled\"" - -if [ -f /usr/local/etc/bash_completion ] -then - . /usr/local/etc/bash_completion -fi - -export PATH="$HOME/.cargo/bin:$PATH" -export PATH="$HOME/.poetry/bin:$PATH" -export PATH=$PATH:/usr/local/go/bin - -export SHELL=/bin/bash diff --git a/config.sh b/config.sh index 738a323..511a8f4 100755 --- a/config.sh +++ b/config.sh @@ -1,11 +1,7 @@ #!/bin/bash stow -t ~ bash -stow -t ~ vim -stow -t ~ iex -stow -t ~ tmux -stow -t ~ nvim -stow -t ~ ctags -stow -t ~ editorconfig stow -t ~ git - +#stow -t ~ tmux +#stow -t ~ nvim +#stow -t ~ editorconfig diff --git a/ctags/.ctags b/ctags/.ctags deleted file mode 100644 index abd91b3..0000000 --- a/ctags/.ctags +++ /dev/null @@ -1,14 +0,0 @@ ---langdef=typescript ---langmap=typescript:.ts ---langmap=typescript:+.tsx ---regex-typescript=/^[ \t]*(export[ \t]+([a-z]+[ \t]+)?)?class[ \t]+([a-zA-Z0-9_$]+)/\3/c,classes/ ---regex-typescript=/^[ \t]*(declare[ \t]+)?namespace[ \t]+([a-zA-Z0-9_$]+)/\2/c,modules/ ---regex-typescript=/^[ \t]*(export[ \t]+)?module[ \t]+([a-zA-Z0-9_$]+)/\2/n,modules/ ---regex-typescript=/^[ \t]*(export[ \t]+)?(async[ \t]+)?function[ \t]+([a-zA-Z0-9_$]+)/\3/f,functions/ ---regex-typescript=/^[ \t]*export[ \t]+(var|let|const)[ \t]+([a-zA-Z0-9_$]+)/\2/v,variables/ ---regex-typescript=/^[ \t]*(var|let|const)[ \t]+([a-zA-Z0-9_$]+)[ \t]*=[ \t]*function[ \t]*[*]?[ \t]*\(\)/\2/v,varlambdas/ ---regex-typescript=/^[ \t]*(export[ \t]+)?(public|protected|private)[ \t]+(static[ \t]+)?(abstract[ \t]+)?(((get|set)[ \t]+)|(async[ \t]+[*]*[ \t]*))?([a-zA-Z1-9_$]+)/\9/m,members/ ---regex-typescript=/^[ \t]*(export[ \t]+)?interface[ \t]+([a-zA-Z0-9_$]+)/\2/i,interfaces/ ---regex-typescript=/^[ \t]*(export[ \t]+)?type[ \t]+([a-zA-Z0-9_$]+)/\2/t,types/ ---regex-typescript=/^[ \t]*(export[ \t]+)?enum[ \t]+([a-zA-Z0-9_$]+)/\2/e,enums/ ---regex-typescript=/^[ \t]*import[ \t]+([a-zA-Z0-9_$]+)/\1/I,imports/ diff --git a/iex/.iex.exs b/iex/.iex.exs deleted file mode 100644 index 2c3eb1a..0000000 --- a/iex/.iex.exs +++ /dev/null @@ -1,2 +0,0 @@ -IEx.configure(inspect: [limit: 10, pretty: true], history_size: 10_000) -IO.puts "History is enabled, inspect is configured." diff --git a/vim/.vim/autoload/pathogen.vim b/vim/.vim/autoload/pathogen.vim deleted file mode 100644 index 59a75c1..0000000 --- a/vim/.vim/autoload/pathogen.vim +++ /dev/null @@ -1,353 +0,0 @@ -" pathogen.vim - path option manipulation -" Maintainer: Tim Pope -" Version: 2.4 - -" Install in ~/.vim/autoload (or ~\vimfiles\autoload). -" -" For management of individually installed plugins in ~/.vim/bundle (or -" ~\vimfiles\bundle), adding `execute pathogen#infect()` to the top of your -" .vimrc is the only other setup necessary. -" -" The API is documented inline below. - -if exists("g:loaded_pathogen") || &cp - finish -endif -let g:loaded_pathogen = 1 - -" Point of entry for basic default usage. Give a relative path to invoke -" pathogen#interpose() (defaults to "bundle/{}"), or an absolute path to invoke -" pathogen#surround(). Curly braces are expanded with pathogen#expand(): -" "bundle/{}" finds all subdirectories inside "bundle" inside all directories -" in the runtime path. -function! pathogen#infect(...) abort - for path in a:0 ? filter(reverse(copy(a:000)), 'type(v:val) == type("")') : ['bundle/{}'] - if path =~# '^\%({\=[$~\\/]\|{\=\w:[\\/]\).*[{}*]' - call pathogen#surround(path) - elseif path =~# '^\%([$~\\/]\|\w:[\\/]\)' - call s:warn('Change pathogen#infect('.string(path).') to pathogen#infect('.string(path.'/{}').')') - call pathogen#surround(path . '/{}') - elseif path =~# '[{}*]' - call pathogen#interpose(path) - else - call s:warn('Change pathogen#infect('.string(path).') to pathogen#infect('.string(path.'/{}').')') - call pathogen#interpose(path . '/{}') - endif - endfor - call pathogen#cycle_filetype() - if pathogen#is_disabled($MYVIMRC) - return 'finish' - endif - return '' -endfunction - -" Split a path into a list. -function! pathogen#split(path) abort - if type(a:path) == type([]) | return a:path | endif - if empty(a:path) | return [] | endif - let split = split(a:path,'\\\@]','\\&','') - endif -endfunction - -" Like findfile(), but hardcoded to use the runtimepath. -function! pathogen#runtime_findfile(file,count) abort - let rtp = pathogen#join(1,pathogen#split(&rtp)) - let file = findfile(a:file,rtp,a:count) - if file ==# '' - return '' - else - return fnamemodify(file,':p') - endif -endfunction - -" Section: Deprecated - -function! s:warn(msg) abort - echohl WarningMsg - echomsg a:msg - echohl NONE -endfunction - -" Prepend all subdirectories of path to the rtp, and append all 'after' -" directories in those subdirectories. Deprecated. -function! pathogen#runtime_prepend_subdirectories(path) abort - call s:warn('Change pathogen#runtime_prepend_subdirectories('.string(a:path).') to pathogen#infect('.string(a:path.'/{}').')') - return pathogen#surround(a:path . pathogen#slash() . '{}') -endfunction - -function! pathogen#incubate(...) abort - let name = a:0 ? a:1 : 'bundle/{}' - call s:warn('Change pathogen#incubate('.(a:0 ? string(a:1) : '').') to pathogen#infect('.string(name).')') - return pathogen#interpose(name) -endfunction - -" Deprecated alias for pathogen#interpose(). -function! pathogen#runtime_append_all_bundles(...) abort - if a:0 - call s:warn('Change pathogen#runtime_append_all_bundles('.string(a:1).') to pathogen#infect('.string(a:1.'/{}').')') - else - call s:warn('Change pathogen#runtime_append_all_bundles() to pathogen#infect()') - endif - return pathogen#interpose(a:0 ? a:1 . '/{}' : 'bundle/{}') -endfunction - -if exists(':Vedit') - finish -endif - -let s:vopen_warning = 0 - -function! s:find(count,cmd,file,lcd) - let rtp = pathogen#join(1,pathogen#split(&runtimepath)) - let file = pathogen#runtime_findfile(a:file,a:count) - if file ==# '' - return "echoerr 'E345: Can''t find file \"".a:file."\" in runtimepath'" - endif - if !s:vopen_warning - let s:vopen_warning = 1 - let warning = '|echohl WarningMsg|echo "Install scriptease.vim to continue using :V'.a:cmd.'"|echohl NONE' - else - let warning = '' - endif - if a:lcd - let path = file[0:-strlen(a:file)-2] - execute 'lcd `=path`' - return a:cmd.' '.pathogen#fnameescape(a:file) . warning - else - return a:cmd.' '.pathogen#fnameescape(file) . warning - endif -endfunction - -function! s:Findcomplete(A,L,P) - let sep = pathogen#slash() - let cheats = { - \'a': 'autoload', - \'d': 'doc', - \'f': 'ftplugin', - \'i': 'indent', - \'p': 'plugin', - \'s': 'syntax'} - if a:A =~# '^\w[\\/]' && has_key(cheats,a:A[0]) - let request = cheats[a:A[0]].a:A[1:-1] - else - let request = a:A - endif - let pattern = substitute(request,'/\|\'.sep,'*'.sep,'g').'*' - let found = {} - for path in pathogen#split(&runtimepath) - let path = expand(path, ':p') - let matches = split(glob(path.sep.pattern),"\n") - call map(matches,'isdirectory(v:val) ? v:val.sep : v:val') - call map(matches,'expand(v:val, ":p")[strlen(path)+1:-1]') - for match in matches - let found[match] = 1 - endfor - endfor - return sort(keys(found)) -endfunction - -command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Ve :execute s:find(,'edit',,0) -command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vedit :execute s:find(,'edit',,0) -command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vopen :execute s:find(,'edit',,1) -command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vsplit :execute s:find(,'split',,1) -command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vvsplit :execute s:find(,'vsplit',,1) -command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vtabedit :execute s:find(,'tabedit',,1) -command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vpedit :execute s:find(,'pedit',,1) -command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vread :execute s:find(,'read',,1) - -" vim:set et sw=2 foldmethod=expr foldexpr=getline(v\:lnum)=~'^\"\ Section\:'?'>1'\:getline(v\:lnum)=~#'^fu'?'a1'\:getline(v\:lnum)=~#'^endf'?'s1'\:'=': diff --git a/vim/.vim/bundle/airline b/vim/.vim/bundle/airline deleted file mode 160000 index 9d1196f..0000000 --- a/vim/.vim/bundle/airline +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 9d1196f40aac7bbef5cec0c9307e80e207a4dfca diff --git a/vim/.vim/bundle/alchemist b/vim/.vim/bundle/alchemist deleted file mode 160000 index 6ccfc51..0000000 --- a/vim/.vim/bundle/alchemist +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 6ccfc513d42465247341225e1a3fd06993345cca diff --git a/vim/.vim/bundle/bats b/vim/.vim/bundle/bats deleted file mode 160000 index 3c283f5..0000000 --- a/vim/.vim/bundle/bats +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 3c283f594ff8bc7fb0c25cd07ebef0f17385f94a diff --git a/vim/.vim/bundle/colorschemes b/vim/.vim/bundle/colorschemes deleted file mode 160000 index 28a989b..0000000 --- a/vim/.vim/bundle/colorschemes +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 28a989b28457e38df620e4c7ab23e224aff70efe diff --git a/vim/.vim/bundle/ctrlp b/vim/.vim/bundle/ctrlp deleted file mode 160000 index bde7a29..0000000 --- a/vim/.vim/bundle/ctrlp +++ /dev/null @@ -1 +0,0 @@ -Subproject commit bde7a2950adaa82e894d7bdf69e3e7383e40d229 diff --git a/vim/.vim/bundle/elm-vim b/vim/.vim/bundle/elm-vim deleted file mode 160000 index ae53153..0000000 --- a/vim/.vim/bundle/elm-vim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ae5315396cd0f3958750f10a5f3ad9d34d33f40d diff --git a/vim/.vim/bundle/fugitive b/vim/.vim/bundle/fugitive deleted file mode 160000 index 9835920..0000000 --- a/vim/.vim/bundle/fugitive +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 9835920a3c91236021fc8c88cc4157304e24356b diff --git a/vim/.vim/bundle/nerdtree b/vim/.vim/bundle/nerdtree deleted file mode 160000 index 4ebbb53..0000000 --- a/vim/.vim/bundle/nerdtree +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4ebbb533c3faf2c480211db2b547972bb3b60f2b diff --git a/vim/.vim/bundle/typescript-vim b/vim/.vim/bundle/typescript-vim deleted file mode 160000 index 4dc79bd..0000000 --- a/vim/.vim/bundle/typescript-vim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4dc79bd1b0c43c16cae146bee065f2acc6d2b789 diff --git a/vim/.vim/bundle/vim-css-color b/vim/.vim/bundle/vim-css-color deleted file mode 160000 index 2411b84..0000000 --- a/vim/.vim/bundle/vim-css-color +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 2411b84298eb6db034001f35ce7cc32c36f9b43b diff --git a/vim/.vim/bundle/vim-elixir b/vim/.vim/bundle/vim-elixir deleted file mode 160000 index 1c9344d..0000000 --- a/vim/.vim/bundle/vim-elixir +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1c9344d8032374ca3767b1aaa0001edee9602e35 diff --git a/vim/.vim/bundle/vim-gitgutter b/vim/.vim/bundle/vim-gitgutter deleted file mode 160000 index 1e60667..0000000 --- a/vim/.vim/bundle/vim-gitgutter +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1e60667322b7cd1bfcba98762fbba746a888d21a diff --git a/vim/.vim/bundle/vim-graphql b/vim/.vim/bundle/vim-graphql deleted file mode 160000 index 88abf6e..0000000 --- a/vim/.vim/bundle/vim-graphql +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 88abf6e7f418f399478359c8bf279f000615c2ef diff --git a/vim/.vim/bundle/vim-scala b/vim/.vim/bundle/vim-scala deleted file mode 160000 index 842baaf..0000000 --- a/vim/.vim/bundle/vim-scala +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 842baaff633b61fcc92e1db10042f0ed9571cf95 diff --git a/vim/.vim/bundle/vim-terraform b/vim/.vim/bundle/vim-terraform deleted file mode 160000 index 2d9343c..0000000 --- a/vim/.vim/bundle/vim-terraform +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 2d9343c7165acbb6225017a9da8baf63bbd27a26 diff --git a/vim/.vim/bundle/vimwiki b/vim/.vim/bundle/vimwiki deleted file mode 160000 index 3a87437..0000000 --- a/vim/.vim/bundle/vimwiki +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 3a8743700581923c6fd2684510dad48a8b2b8c64 diff --git a/vim/.vim/vimrc b/vim/.vim/vimrc deleted file mode 100644 index 67ee84f..0000000 --- a/vim/.vim/vimrc +++ /dev/null @@ -1,89 +0,0 @@ -execute pathogen#infect() - -syntax on -filetype plugin indent on - -" Window settings -set winminwidth=20 -set winwidth=100 -set winheight=20 - -" Wrapping -set nowrap -set linebreak " wrap nicer - -" Keeps lines below the cursor -set scrolloff=2 - -" Tabbing -" I added this monster because Python doesn't play nice with my usual -" settings, or some such nonsense. Anyway, it appears to work. -function! SetupTabbing() - set tabstop=2 - set expandtab - set shiftwidth=2 - set softtabstop=2 - set sw=2 - set autoindent - set smartindent - set smarttab -endfunction -command! -bar SetupTabbing call SetupTabbing() -SetupTabbing - -" makes LaTeX use spell checking, word wrapping -autocmd FileType tex set wrap spell -autocmd FileType make set noexpandtab -autocmd FileType markdown set wrap - -let java_allow_cpp_keywords=1 - -set ruler -set number -set backspace=indent,eol,start -set incsearch -set hlsearch - -set splitright -set splitbelow - -map :NERDTreeToggle - - -" Enable airline by default -set laststatus=2 -let g:airline#extensions#tabline#enabled = 1 - -" Ignore *.pyc files. -let NERDTreeIgnore = ['\.pyc$'] - -" -"" I think this is some command for OS X compatibility? I don't know. Leaving -"" it here so that I can find it later if I need it. -set term=xterm-color -set t_Co=256 - -"colorscheme 256-grayvim -colorscheme gentooish - -" -" fixes webpack file watchers -set backupcopy=yes - -" put swap files out of the current directory -set dir=$HOME/.vim/tmp/swap -if !isdirectory(&dir) | call mkdir(&dir, 'p', 0700) | endif - -let g:vimwiki_list = [ {'path': '~/Code/ntietz/vimwiki'} ] - -set autoread -set updatetime=100 -au FileChangedShell * checktime -au CursorHold * checktime -au CursorHoldI * checktime - -let g:ctrlp_map = '' -let g:ctrlp_cmd = 'CtrlP' - -set wildignore +=*/tmp/*,*.pyc,*/__pycache__/* -