diff --git a/vim/pack/normal/start/vim-airline-themes b/vim/pack/normal/start/vim-airline-themes index dd81554..55bad92 160000 --- a/vim/pack/normal/start/vim-airline-themes +++ b/vim/pack/normal/start/vim-airline-themes @@ -1 +1 @@ -Subproject commit dd81554c2231e438f6d0e8056ea38fd0e80ac02a +Subproject commit 55bad92d246a31e3425dfaf16b7eec657eab1fad diff --git a/vimrc b/vimrc index e0ff19b..14cd8ed 100644 --- a/vimrc +++ b/vimrc @@ -7,10 +7,9 @@ set backspace=indent,eol,start " two-spaced tabs set tabstop=2 -set softtabstop=0 +set softtabstop=0 noexpandtab set shiftwidth=2 -set noexpandtab -set smarttab +set tabstop=2 softtabstop=0 expandtab shiftwidth=2 smarttab " custom filetypes autocmd BufNewFile,BufRead *.plist set syntax=xml diff --git a/zshrc b/zshrc index a90af02..adda6d1 100644 --- a/zshrc +++ b/zshrc @@ -103,7 +103,7 @@ if [ -d /nix ]; then fi # Rust -if [ -d $HOME/.cargo/env ]; then +if [ -d $HOME/.cargo ]; then source $HOME/.cargo/env fi