diff --git a/.config/fish/config.fish b/.config/fish/config.fish index e5b73af..f5f7172 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -1,5 +1,7 @@ +set -gx EDITOR vim set -gx GOPATH $HOME/Documents/go set -gx GOBIN $GOPATH/bin +set -gx DOTNET_ENVIRONMENT Development set -gx PATH $PATH $GOBIN \ $HOME/.pub-cache/bin \ $HOME/Documents/scripts \ @@ -10,5 +12,7 @@ set -g fish_escape_delay_ms 10 kitty + complete setup fish | source +status --is-interactive; and source (rbenv init -|psub) + # The next line updates PATH for the Google Cloud SDK. # if test -f '/Users/m/Documents/google-cloud-sdk/path.fish.inc'; source '/Users/m/Documents/google-cloud-sdk/path.fish.inc'; end diff --git a/.vimrc b/.vimrc index e09f094..29132da 100644 --- a/.vimrc +++ b/.vimrc @@ -56,10 +56,10 @@ let g:lightline = { \} let g:ale_linters = { -\ 'javascript': ['tsserver', 'eslint'], -\ 'css': ['csslint'], +\ 'javascript': ['tsserver', 'eslint', 'stylelint'], +\ 'css': ['stylelint'], \ 'go': ['golint', 'go vet', 'gopls'], -\ 'typescript': ['tslint', 'tsserver', 'typecheck'], +\ 'typescript': ['tslint', 'tsserver', 'typecheck', 'stylelint'], \ 'make': ['checkmake'], \ 'proto': ['protoc-gen-lint'], \ 'dockerfile': ['hadolint'], @@ -92,3 +92,9 @@ let g:ale_completion_delay = 500 let g:ale_elixir_elixir_ls_release = expand('~/Documents/elixir-ls/bin') let g:OmniSharp_server_stdio = 1 + +augroup js_ft + au! + autocmd BufNewFile,BufRead *.jsx set ft=javascript + autocmd BufNewFile,BufRead *.tsx set ft=typescript +augroup END