Merge remote-tracking branch 'refs/remotes/origin/master'

2 files changed, 9 insertions, 0 deletions

diff --git a/.bashrc b/.bashrc
index dff0eed..e23838c 100644
--- a/.bashrc
+++ b/.bashrc
@@ -131,6 +131,13 @@ alias gp='git push'
 
 alias cd..='cd ..'
 
+alias pyinit='source venv/bin/activate'
+
+# X Server
+if grep -q Microsoft /proc/version; then
+    export DISPLAY=localhost:0
+fi
+
 # autojump
 if [ ! -d /usr/share/autojump ]; then
     sudo apt install autojump
diff --git a/.vimrc b/.vimrc
index 5b77c85..de90224 100644
--- a/.vimrc
+++ b/.vimrc
@@ -12,6 +12,8 @@ set shiftwidth=4
 set expandtab
 set softtabstop=4
 
+autocmd FileType html setlocal shiftwidth=2 softtabstop=2 expandtab
+
 set wrap
 "set nowrap
 "set wrapmargin=4