From 3753f84597c2f506c07e1b453f0c2bdd1af82476 Mon Sep 17 00:00:00 2001
From: Maximilian Wolf <69987866+MaxWolf-01@users.noreply.github.com>
Date: Tue, 16 Jul 2024 21:09:01 +0200
Subject: [PATCH] update

---
 zsh/aliases   | 5 ++++-
 zsh/exports   | 1 +
 zsh/functions | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/zsh/aliases b/zsh/aliases
index f970766..ebc0b1e 100644
--- a/zsh/aliases
+++ b/zsh/aliases
@@ -6,8 +6,11 @@ fi
 # git #
 #######
 alias g='git'
+alias gc='git commit'
+alias gp='git push'
 alias gst='git status'
-
+alias gspp="git stash && git pull && git stash pop"
+alias gacp="git add . && git commit -m 'update' && git push"
 alias ggraph='git log --graph --abbrev-commit --date=relative --pretty=format:"%C(auto)%h %s%n  %C(yellow)by %C(blue)%an %C(magenta)<%ae> [%G?] %C(green)%ad%n %C(auto)%d%n"'
 alias gdiff='git diff --color | sed "s/^\([^-+ ]*\)[-+ ]/\\1/" | less -r' # Remove `+` and `-` from start of diff lines; just rely upon color.
 
diff --git a/zsh/exports b/zsh/exports
index 3418246..03aa0a9 100644
--- a/zsh/exports
+++ b/zsh/exports
@@ -4,6 +4,7 @@ export PATH=~/bin:${PATH}
 export PATH=~/minconda/bin:${PATH}
 export PATH=~/.local/bin:${PATH}
 export PATH=~/.dotfiles/secrets/bin:${PATH}
+export PATH=/usr/local/bin:${PATH}
 export PYTHONPATH="$PYTHONPATH:$(pwd)"  # useful for running scripts from the root of the repo (when opening shell in pycharm for example)
 
 # Make Python use UTF-8 encoding for output to stdin, stdout, and stderr. (Redundant as of Python 3?)
diff --git a/zsh/functions b/zsh/functions
index e0fd46c..c9d31dd 100644
--- a/zsh/functions
+++ b/zsh/functions
@@ -128,7 +128,7 @@ function gz() {
 # `less` with options to preserve color and line numbers, unless the output is
 # small enough for one screen.
 function tre() {
-  tree -aC -I '.git|node_modules|bower_components|__pycache__' --dirsfirst "$@" | less -FRNX
+  tree -aC -I '.git|node_modules|bower_components|__pycache__|.next|.idea|.vscode' --dirsfirst "$@" | less -FRNX
 }
 # TODO, needs fixing: https://github.com/conda/conda/issues/7980
 ## Disallow installing packages in base environment https://stackoverflow.com/a/69617319/17777085