From 14dfa6a57e524149a8e0a44731cfad6740a96dfd Mon Sep 17 00:00:00 2001
From: Sebastian Lenzlinger <74497638+sebaschi@users.noreply.github.com>
Date: Tue, 9 Apr 2024 20:54:53 +0200
Subject: [PATCH] Update bash aliases. New aliases for git

---
 bash/bash_aliases | 29 +++++++++++++++++++++++++++--
 bash/bashrc       |  2 +-
 vim/vimrc         |  9 +++++++++
 3 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/bash/bash_aliases b/bash/bash_aliases
index 1a7c6b4..2ac4704 100644
--- a/bash/bash_aliases
+++ b/bash/bash_aliases
@@ -13,16 +13,41 @@ alias pet23='cd ~/Documents/Education/UniBas/HS23/pethpc23/'
 alias diskmath='cd ~/Documents/Education/UniBas/HS23/diskmath-tutorat23/'
 alias pullbooks='rsync -av ~/Nextcloud/Books/ ~/Books'
 alias pushbooks='rsync -av ~/Books/ ~/Nextcloud/Books'
-alias pushfs24='rsync -uav --exclude=".*" --exclude="__*" --exclude-"/venv" ~/documents/education/unibas/fs24/ ~/Nextcloud/Documents/Unibas/FS24'
+alias pushfs24='rsync -uav --exclude=".*" --exclude="__*" --exclude="/venv" ~/documents/education/unibas/fs24/ ~/Nextcloud/Documents/Unibas/FS24'
 alias pullfs24='rsync -uav --exclude=".*" ~/Nextcloud/Documents/Unibas/FS24/ ~/documents/education/unibas/fs24'
 alias fs24l='cd ~/documents/education/unibas/fs24'
 alias fs24c='cd ~/Nextcloud/Documents/Unibas/FS24'
 alias sdev='ssh sebl@slenzlinger.dev'
 alias sslenz='ssh fm18b_sebaschi@slenzlinger.ch'
-# exa aliases
+
+#
+# eza aliases
+#
 alias ll='eza -l'
 alias la='eza -la'
 alias lll='eza -la -T -l --level=3'
 alias lla='eza -laF'
 alias la='eza -A'
 alias l='eza -CF'
+
+#
+## Git aliases
+#
+alias g='git'
+alias gs='git status'
+alias ga='git add'
+alias gc='git commit'
+alias gcm='git commit -m'
+alias gca='git commit --amend'
+alias gco='git checkout'
+alias gcb='git checkout -b'
+alias gcp='git cherry-pick'
+alias gcl='git clone'   
+alias gpr='git pull --rebase'
+alias gpo='git push origin'
+alias gpf='git push --force'
+alias gpl='git pull'
+alias glog='git log --oneline --graph --decorate'
+alias gloga='git log --oneline --graph --decorate --all'
+alias glod='git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%an>%Creset'
+alias glods='git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%an>%Creset' --date=short'
diff --git a/bash/bashrc b/bash/bashrc
index 3e52b39..9566b3d 100644
--- a/bash/bashrc
+++ b/bash/bashrc
@@ -45,7 +45,7 @@ unset __conda_setup
 # <<< conda initialize <<<
 #Source aliases
 source ~/.bash_aliases
-
+export PATH="~/scripts:$PATH"
 # !! Contents within this block are managed by juliaup !!
 
 case ":$PATH:" in
diff --git a/vim/vimrc b/vim/vimrc
index 69e00e4..ebdabe7 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -112,3 +112,12 @@ map ; :
 set shiftwidth=4 smarttab
 set expandtab
 set tabstop=8 softtabstop=0
+
+
+" VimPlug Section
+call plug#begin()
+
+" Add your plugins here
+Plug 'github/copilot.vim' , { 'rtp': '~/.config/nvim/pack/github/start/copilot.vim' }
+
+call plug#end()