From 13ac3d78d1defe400a9d20d2c400c759ee5a088e Mon Sep 17 00:00:00 2001 From: lfreixial Date: Thu, 10 Jul 2025 21:45:43 +0100 Subject: [PATCH] update zsh with the ones from home dir --- Makefile | 8 ++++++++ zsh/.zsh_alias | 9 +-------- zsh/.zsh_functions | 25 +------------------------ 3 files changed, 10 insertions(+), 32 deletions(-) diff --git a/Makefile b/Makefile index 4661a0d..62fe790 100644 --- a/Makefile +++ b/Makefile @@ -5,3 +5,11 @@ zsh: file=$${file#zsh/}; \ [ -f "$$HOME/$$file" ] && mv "$$HOME/$$file" "$$HOME/$$file.bak"; \ done && cp -r zsh/.[!.]* ~/ && echo "zsh files copied to home directory" || echo "zsh files not copied to home directory" + +update-zsh: + @for file in zsh/.[!.]*; do \ + base=$$(basename $$file); \ + if [ -f "$$HOME/$$base" ]; then \ + cp -v "$$HOME/$$base" "$$file"; \ + fi \ + done && echo "zsh files updated from home directory" || echo "zsh files not updated from home directory" \ No newline at end of file diff --git a/zsh/.zsh_alias b/zsh/.zsh_alias index 8102a35..63ccee8 100644 --- a/zsh/.zsh_alias +++ b/zsh/.zsh_alias @@ -7,17 +7,10 @@ alias gcm='git checkout origin/main' alias gce='git fetch && git pull && git commit --allow-empty -m "run-ci" && git push' alias dcu='docker compose up -d' alias dcub='docker compose up --build -d' -alias dcf='docker compose logs -f' alias dcd='docker compose down' alias dps='docker ps' alias dk=docker_kill_fzf alias zs='nvim ~/.zshrc' alias sz='source ~/.zshrc' alias ls="eza --color=always --long --git --no-filesize --icons=always --no-time --no-user --no-permissions" -alias ghb='gh browse' -alias ghs='gh status' -alias ghl='gh pr list' -alias ghw='gh pr view --web' -alias prs='select_and_open_pr' -alias pr='select_and_open_pr_web_only' -alias e='exit +alias gk="gitkraken" diff --git a/zsh/.zsh_functions b/zsh/.zsh_functions index 33e128b..f673878 100644 --- a/zsh/.zsh_functions +++ b/zsh/.zsh_functions @@ -30,27 +30,4 @@ fzf-cd-widget() { local dir dir=$(find ${1:-.} -path '*/\.*' -prune -o -type d -print 2> /dev/null | fzf +m) && cd "$dir" zle reset-prompt -} - -select_and_open_pr() { - local pr_info=$(gh pr list --state open --json number,title | jq -r '.[] | "\(.number) \(.title)"' | fzf -1) - - if [[ -n "$pr_info" ]]; then - local pr_number=$(echo "$pr_info" | awk '{print $1}') - gh pr checkout "$pr_number" - gh pr view --web - else - echo "No PR selected." - fi -} - -select_and_open_pr_web_only() { - local pr_info=$(gh pr list --state open --json number,title | jq -r '.[] | "\(.number) \(.title)"' | fzf -1) - - if [[ -n "$pr_info" ]]; then - local pr_number=$(echo "$pr_info" | awk '{print $1}') - gh pr view --web - else - echo "No PR selected." - fi -} +} \ No newline at end of file