From 65575fd7c78dfa4bc45cfc14bcadf2f1b20dd3f3 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Sun, 2 Apr 2023 14:16:57 +0200 Subject: moved sgd to functions.zsh --- config/essentials/zsh/functions.zsh | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'config/essentials/zsh/functions.zsh') diff --git a/config/essentials/zsh/functions.zsh b/config/essentials/zsh/functions.zsh index 637df07..c2c7ac3 100644 --- a/config/essentials/zsh/functions.zsh +++ b/config/essentials/zsh/functions.zsh @@ -77,3 +77,18 @@ delfile () { upfile () { curl -F "file=@\"$1\"" "https://upfast.craftmenners.men" } + +sgd () { + for dir in ${1:-$HOME/src/*} + do + cd $dir + if [ "$(git status --short 2>/dev/null | grep -v "??" | head -1)" ] + then + # There are changes, and this is a git repo + echo "$PWD \e[1;31m*changes\e[0m" + git fetch > /dev/null 2>&1 + fi + test "$(parse_git_remote)" && + echo "$PWD \e[0;32m*push/pull\e[0m" ; + done + } -- cgit v1.2.3 From c2017c1a39bf36ba4c5cd87c7ee79fa896e45d0e Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Sun, 2 Apr 2023 22:30:40 +0200 Subject: fix in sgd function --- config/essentials/zsh/functions.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config/essentials/zsh/functions.zsh') diff --git a/config/essentials/zsh/functions.zsh b/config/essentials/zsh/functions.zsh index c2c7ac3..e2cee79 100644 --- a/config/essentials/zsh/functions.zsh +++ b/config/essentials/zsh/functions.zsh @@ -89,6 +89,6 @@ sgd () { git fetch > /dev/null 2>&1 fi test "$(parse_git_remote)" && - echo "$PWD \e[0;32m*push/pull\e[0m" ; + echo "$PWD \e[0;32m*push/pull\e[0m" done } -- cgit v1.2.3 From f59063e330c896835c90b23ac6e25e04a0e9de6a Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Tue, 4 Apr 2023 17:34:37 +0200 Subject: added googoo aliases --- config/essentials/zsh/functions.zsh | 3 +++ 1 file changed, 3 insertions(+) (limited to 'config/essentials/zsh/functions.zsh') diff --git a/config/essentials/zsh/functions.zsh b/config/essentials/zsh/functions.zsh index e2cee79..9d16c0d 100644 --- a/config/essentials/zsh/functions.zsh +++ b/config/essentials/zsh/functions.zsh @@ -27,6 +27,9 @@ ogo () d="$(fhome f ${1:-$HOME} | fzf | xargs dirname)" test -d "$d" && cd "$d" } +alias o.='o .' +alias go.='go .' +alias ogo.='ogo .' ipc () { -- cgit v1.2.3 From 5d12ddb93e95b05eb0c53373d47b1407072e8d5b Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Wed, 5 Apr 2023 13:53:29 +0200 Subject: fixed git aliases needing functions --- config/essentials/zsh/functions.zsh | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) (limited to 'config/essentials/zsh/functions.zsh') diff --git a/config/essentials/zsh/functions.zsh b/config/essentials/zsh/functions.zsh index 9d16c0d..189dd22 100644 --- a/config/essentials/zsh/functions.zsh +++ b/config/essentials/zsh/functions.zsh @@ -94,4 +94,38 @@ sgd () { test "$(parse_git_remote)" && echo "$PWD \e[0;32m*push/pull\e[0m" done - } +} + +# Git functions +# Returns current branch +function git_current_branch() +{ + command git rev-parse --git-dir &>/dev/null || return + git branch --show-current +} + +# Check if main exists and use instead of master +function git_main_branch() { + command git rev-parse --git-dir &>/dev/null || return + local ref + for ref in refs/{heads,remotes/{origin,upstream}}/{main,trunk,mainline,default}; do + if command git show-ref -q --verify $ref; then + echo ${ref:t} + return + fi + done + echo master +} + +# Check for develop and similarly named branches +function git_develop_branch() { + command git rev-parse --git-dir &>/dev/null || return + local branch + for branch in dev devel development; do + if command git show-ref -q --verify refs/heads/$branch; then + echo $branch + return + fi + done + echo develop +} -- cgit v1.2.3 From 965da2ccb529e03167cd8a4a17d190640d1a4cc9 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Wed, 5 Apr 2023 13:54:49 +0200 Subject: use default urls for {up,del}file --- config/essentials/zsh/functions.zsh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'config/essentials/zsh/functions.zsh') diff --git a/config/essentials/zsh/functions.zsh b/config/essentials/zsh/functions.zsh index 189dd22..eb790a8 100644 --- a/config/essentials/zsh/functions.zsh +++ b/config/essentials/zsh/functions.zsh @@ -75,10 +75,10 @@ esc () { } delfile () { - curl "https://upfast.craftmenners.men/delete/$1" + curl ${2:-"https://upfast.craftmenners.men/delete/$1"} } upfile () { - curl -F "file=@\"$1\"" "https://upfast.craftmenners.men" + curl -F "file=@\"$1\"" ${2:-"https://upfast.craftmenners.men"} } sgd () { -- cgit v1.2.3 From c41328bec94c2d3fe58b6cc0db7336702b054cb7 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Wed, 5 Apr 2023 13:56:27 +0200 Subject: added more googoo aliases --- config/essentials/zsh/aliases.zsh | 8 ++++++++ config/essentials/zsh/functions.zsh | 3 --- 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'config/essentials/zsh/functions.zsh') diff --git a/config/essentials/zsh/aliases.zsh b/config/essentials/zsh/aliases.zsh index b042d2b..79a35e0 100644 --- a/config/essentials/zsh/aliases.zsh +++ b/config/essentials/zsh/aliases.zsh @@ -139,6 +139,14 @@ alias -g esls='$EDITOR ~/src/slstatus/config.def.h' alias -g cfd='$EDITOR config.def.h' alias -g cdo='$HOME/src/dotfiles' +# googoo aliases +alias o.='o .' +alias go.='go .' +alias ogo.='ogo .' +alias o/='o /' +alias go/='go /' +alias ogo/='ogo /' + alias fzps='ps aux | tail +2 | fzf --bind \ "1:execute(echo -n {} | awk '\''{print \$1}'\'' | xclip -sel c -r),\ 2:execute(echo -n {} | awk '\''{print \$2}'\'' | xclip -sel c -r),\ diff --git a/config/essentials/zsh/functions.zsh b/config/essentials/zsh/functions.zsh index eb790a8..9ee4b93 100644 --- a/config/essentials/zsh/functions.zsh +++ b/config/essentials/zsh/functions.zsh @@ -27,9 +27,6 @@ ogo () d="$(fhome f ${1:-$HOME} | fzf | xargs dirname)" test -d "$d" && cd "$d" } -alias o.='o .' -alias go.='go .' -alias ogo.='ogo .' ipc () { -- cgit v1.2.3