1
0
Fork 0

Autocommitted updated scripts from mari-wovn

main
Mari 5 years ago
parent 3114269331
commit 7357060d23
  1. 3
      .gitmodules
  2. 1
      nvim/init.vim
  3. 6
      per-host/mari-wovn/.bash_aliases
  4. 3
      tmux.conf
  5. 1
      vim/bundle/vim-javascript
  6. 19
      vimrc

3
.gitmodules vendored

@ -19,3 +19,6 @@
[submodule "vim/bundle/YouCompleteMe"]
path = vim/bundle/YouCompleteMe
url = https://github.com/ycm-core/YouCompleteMe.git
[submodule "vim/bundle/vim-javascript"]
path = vim/bundle/vim-javascript
url = https://github.com/pangloss/vim-javascript.git

@ -1,4 +1,3 @@
set runtimepath^=~/.vim runtimepath+=~/.vim/after
let &packpath = &runtimepath
source ~/.vimrc
set synmaxcol=1000

@ -168,3 +168,9 @@ function _branch_completions() {
complete -F _branch_completions wovn_start
complete -F _branch_completions wovn_delete
function front_tests() {
(
cd "$(git rev-parse --show-toplevel)/front" && npm run test
)
}

@ -8,6 +8,9 @@ set-window-option -g xterm-keys on
bind-key _ split-window -v
source-file $TMUX_CONF_DIR/tmux.screen.conf
set-option -g mouse on
bind c new-window -c "#{pane_current_path}"
bind '_' split-window -v -c "#{pane_current_path}"
bind % split-window -h -c "#{pane_current_path}"
#####################
# Terminal Properties

@ -0,0 +1 @@
Subproject commit 3c90d0cc37bb8b78422f647e62587f498a5dd7bd

19
vimrc

@ -41,3 +41,22 @@ set shiftwidth=2
set softtabstop=2
set laststatus=2
hi Statement ctermfg=3 guifg=#C4A000
set synmaxcol=1000
set foldmethod=syntax
let javaScript_Fold=1
set foldcolumn=1
set foldlevelstart=99
let g:javascript_conceal_function = "ƒ"
let g:javascript_conceal_null = "ø"
let g:javascript_conceal_this = "@"
"let g:javascript_conceal_return = "⇚"
let g:javascript_conceal_undefined = "¿"
"let g:javascript_conceal_NaN = "ℕ"
let g:javascript_conceal_prototype = "¶"
let g:javascript_conceal_static = "•"
let g:javascript_conceal_super = "Ω"
let g:javascript_conceal_arrow_function = "⇒"
let g:javascript_conceal_noarg_arrow_function = "🞅"
let g:javascript_conceal_underscore_arrow_function = "🞅"
set conceallevel=1

Loading…
Cancel
Save