mirror of https://github.com/mitchell/dotfiles.git
Change prompt git check; Remove vim ctrl-w alias and vimwiki index remap
This commit is contained in:
parent
47d96cda20
commit
906de36bbc
|
@ -61,7 +61,7 @@ function fish_prompt --description 'Write out the prompt'
|
||||||
if test -n "$SSH_CLIENT"; set user_prefix $USER @ (prompt_hostname) ' '; end
|
if test -n "$SSH_CLIENT"; set user_prefix $USER @ (prompt_hostname) ' '; end
|
||||||
|
|
||||||
# Show current git branch, based on git commands only.
|
# Show current git branch, based on git commands only.
|
||||||
if test -e ./.git; and command -sq git
|
if git status > /dev/null 2>&1
|
||||||
set -l branch_color green
|
set -l branch_color green
|
||||||
set -l git_status (git status)
|
set -l git_status (git status)
|
||||||
|
|
||||||
|
|
|
@ -76,3 +76,6 @@
|
||||||
[submodule ".vim/bundle/vim-fsharp"]
|
[submodule ".vim/bundle/vim-fsharp"]
|
||||||
path = .vim/bundle/vim-fsharp
|
path = .vim/bundle/vim-fsharp
|
||||||
url = https://github.com/fsharp/vim-fsharp.git
|
url = https://github.com/fsharp/vim-fsharp.git
|
||||||
|
[submodule ".vim/bundle/vim-terraform"]
|
||||||
|
path = .vim/bundle/vim-terraform
|
||||||
|
url = https://github.com/hashivim/vim-terraform.git
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
Subproject commit c8c9bbd70da65e2c0bcba2947c4061a7c3e24e69
|
4
.vimrc
4
.vimrc
|
@ -44,7 +44,6 @@ inoremap <leader>j <Esc>
|
||||||
|
|
||||||
let mapleader = ','
|
let mapleader = ','
|
||||||
nnoremap <leader>n :NERDTree<cr>
|
nnoremap <leader>n :NERDTree<cr>
|
||||||
nnoremap <leader>w <C-w>
|
|
||||||
nnoremap <leader>p :FZF<cr>
|
nnoremap <leader>p :FZF<cr>
|
||||||
nnoremap <leader>g :ALEGoToDefinition<cr>
|
nnoremap <leader>g :ALEGoToDefinition<cr>
|
||||||
nnoremap <leader>r :ALEFindReferences<cr>
|
nnoremap <leader>r :ALEFindReferences<cr>
|
||||||
|
@ -52,7 +51,6 @@ nnoremap <leader>d :ALEDetail<cr>
|
||||||
nnoremap <leader>h :ALEHover<cr>
|
nnoremap <leader>h :ALEHover<cr>
|
||||||
nnoremap <leader>a :Ack<cr>
|
nnoremap <leader>a :Ack<cr>
|
||||||
nnoremap <leader>we :VimwikiAll2HTML<cr>
|
nnoremap <leader>we :VimwikiAll2HTML<cr>
|
||||||
nmap <leader>wk <Plug>VimwikiIndex
|
|
||||||
|
|
||||||
" next line is necessary to prevent background rendering bug with kitty term
|
" next line is necessary to prevent background rendering bug with kitty term
|
||||||
let &t_ut=''
|
let &t_ut=''
|
||||||
|
@ -78,6 +76,7 @@ let g:ale_linters = {
|
||||||
\ 'vim': ['vint'],
|
\ 'vim': ['vint'],
|
||||||
\ 'elixir': ['credo', 'elixir-ls'],
|
\ 'elixir': ['credo', 'elixir-ls'],
|
||||||
\ 'cs': ['OmniSharp'],
|
\ 'cs': ['OmniSharp'],
|
||||||
|
\ 'terraform': ['terraform', 'tflint'],
|
||||||
\}
|
\}
|
||||||
|
|
||||||
|
|
||||||
|
@ -93,6 +92,7 @@ let g:ale_fixers = {
|
||||||
\ 'html': ['prettier'],
|
\ 'html': ['prettier'],
|
||||||
\ 'make': ['remove_trailing_lines', 'trim_whitespace'],
|
\ 'make': ['remove_trailing_lines', 'trim_whitespace'],
|
||||||
\ 'elixir': ['mix_format'],
|
\ 'elixir': ['mix_format'],
|
||||||
|
\ 'terraform': ['terraform'],
|
||||||
\}
|
\}
|
||||||
|
|
||||||
let g:ale_fix_on_save = 1
|
let g:ale_fix_on_save = 1
|
||||||
|
|
Loading…
Reference in New Issue