Merge branch 'master' into minimal

.gitconfig

@@ -6,3 +6,5 @@
 	helper = store --file ~/.git-credentials
 [commit]
 	gpgsign = false
+[pull]
+	rebase = false

.zshrc

@@ -1,8 +1,6 @@
 ### ENVVARS
-export PATH="$PATH:/usr/local/sbin:/usr/sbin/:/usr/local/bin:/usr/bin:/var/lib/flatpak/exports/bin:"
-export PATH="$PATH:/usr/bin/site_perl:/usr/bin/vendor_perl:/usr/bin/core_perl:~/.local/bin:~/.cargo/bin"
-export PATH="$PATH:/home/plex/.local/bin"
-export PATH="$HOME/tools/node-v14.15.4-linux-x64/bin:$PATH"
+PATH="/usr/bin:/usr/sbin:$HOME/.local/bin:$HOME/.cargo/bin:/usr/local/bin"
+export PATH
 export EDITOR=nvim
 export editor=nvim
 export XDG_CONFIG_HOME=~/.config
@@ -23,7 +21,7 @@ alias isotime='date +"%Y-%m-%dT%H:%M:%S%z"'
 alias gg=lazygit
 alias reload="source ~/.zshrc"
 alias gls=/bin/ls
-alias neorg='nvim -c "Neorg workspace main"'
+alias neorg='nvim -c "Neorg workspace $1"'
 
 ### non standard aliases
 if [ -f ~/.zsh_aliases ]; then