From a2819f2316fa14d87506fc77e973e03197bf7ce2 Mon Sep 17 00:00:00 2001
From: Raymaekers Luca <raymaekers.luca@gmail.com>
Date: Fri, 15 Dec 2023 12:18:39 +0100
Subject: Added aliases

---
 config/essentials/shell/aliases.sh | 37 +++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/config/essentials/shell/aliases.sh b/config/essentials/shell/aliases.sh
index 157e7aa..eed3fa0 100644
--- a/config/essentials/shell/aliases.sh
+++ b/config/essentials/shell/aliases.sh
@@ -223,28 +223,29 @@ alias vblsr='vbm list runningvms'
 alias vb='vbm startvm'
 
 # quick config
-alias ez='$EDITOR ${ZDOTDIR:-~}/.zshrc'
-alias eza='$EDITOR $HOME/.config/shell/aliases.sh'
-alias ezf='$EDITOR $HOME/.config/shell/functions.sh'
-alias eto='$EDITOR ~/sync/TODO'
-alias edw='$EDITOR ~/proj/suckless/dwm/config.def.h'
-alias edm='$EDITOR ~/proj/suckless/dmenu/config.def.h'
-alias ehst='$EDITOR $ZDOTDIR/histfile'
-alias ezh=' $EDITOR $HISTFILE'
-alias est='$EDITOR ~/proj/suckless/st/config.def.h'
-alias esl='$EDITOR ~/proj/suckless/slock/config.def.h'
-alias esls='$EDITOR ~/proj/suckless/slstatus/config.def.h'
-alias ehy='$EDITOR ~/.config/hypr/hyprland.conf'
-alias ehyb='$EDITOR ~/.config/hypr/binds.conf'
-alias ewbj='$EDITOR ~/.config/waybar/config.jsonc'
-alias ewbs='$EDITOR ~/.config/waybar/style.css'
-alias cfd='$EDITOR config.def.h'
+alias ez='vi ${ZDOTDIR:-~}/.zshrc'
+alias eza='vi $HOME/.config/shell/aliases.sh'
+alias ezf='vi $HOME/.config/shell/functions.sh'
+alias eto='vi ~/sync/TODO'
+alias edw='vi ~/proj/suckless/dwm/config.def.h'
+alias edm='vi ~/proj/suckless/dmenu/config.def.h'
+alias ehst='vi $ZDOTDIR/histfile'
+alias ezh=' vi $HISTFILE'
+alias est='vi ~/proj/suckless/st/config.def.h'
+alias esl='vi ~/proj/suckless/slock/config.def.h'
+alias esls='vi ~/proj/suckless/slstatus/config.def.h'
+alias ehy='vi ~/.config/hypr/hyprland.conf'
+alias ehyb='vi ~/.config/hypr/binds.conf'
+alias ewbj='vi ~/.config/waybar/config.jsonc'
+alias ewbs='vi ~/.config/waybar/style.css'
+alias cfd='vi config.def.h'
 # /# quick cd
jV}k:!sort -t "'" -k 2
 alias cdl='cd ~/dl'
 alias cdoc='cd ~/docs'
 alias czk='cd ~/docs/zk'
 alias cda='cd ~/docs/android/projects'
 alias csv='cd ~/docs/school/Vakken'
+alias cdpj='cd ~/docs/school/Vakken/ITProj'
 alias cdm='cd ~/music'
 alias cdp='cd ~/pics'
 alias cdpa='cd ~/pics/ai-outputs/'
@@ -313,8 +314,8 @@ alias dbsmu='rsync -aPz db:/media/basilisk/music/ /media/kilimanjaro/music'
 
 # oh-my-zsh git aliases
 alias config='GIT_WORK_TREE=~/src/dotfiles/ GIT_DIR=~/src/dotfiles/.git'
-alias cfg='$EDITOR ~/src/dotfiles/"$(config git ls-files | fzf || exit)"'
-alias gmod='git status --short | sed '\''/^\s*M/!d;s/^\s*M\s*//'\'' | fzf | xargs $EDITOR'
+alias cfg='vi ~/src/dotfiles/"$(config git ls-files | fzf || exit)"'
+alias gmod='git status --short | sed '\''/^\s*M/!d;s/^\s*M\s*//'\'' | fzf | xargs vi'
 alias g='git'
 alias ga='git add'
 alias gaa='git add --all'
-- 
cgit v1.2.3


From d75c2e1af43b44950dbb210da9fcc94a9b9656e8 Mon Sep 17 00:00:00 2001
From: Raymaekers Luca <raymaekers.luca@gmail.com>
Date: Sat, 16 Dec 2023 20:44:06 +0100
Subject: rebase must exist

---
 config/essentials/git/config | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/config/essentials/git/config b/config/essentials/git/config
index 66ed53e..92bd6e5 100644
--- a/config/essentials/git/config
+++ b/config/essentials/git/config
@@ -3,7 +3,3 @@
 [user]
 	email = raymaekers.luca@gmail.com
 	name = Raymaekers Luca
-[pull]
-	rebase = false
-[merge]
-	ff = false
-- 
cgit v1.2.3


From 2601dc4b2e0eb8785fda7196c2f8d42799ddd668 Mon Sep 17 00:00:00 2001
From: Raymaekers Luca <raymaekers.luca@gmail.com>
Date: Sat, 16 Dec 2023 20:44:14 +0100
Subject: added autosetupremote

---
 config/essentials/git/config | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/config/essentials/git/config b/config/essentials/git/config
index 92bd6e5..90bab4f 100644
--- a/config/essentials/git/config
+++ b/config/essentials/git/config
@@ -3,3 +3,5 @@
 [user]
 	email = raymaekers.luca@gmail.com
 	name = Raymaekers Luca
+[push]
+	autoSetupRemote = true
-- 
cgit v1.2.3