diff --git a/scripts/git-commit-push.sh b/scripts/git-commit-push.sh new file mode 100755 index 0000000..9c5d68b --- /dev/null +++ b/scripts/git-commit-push.sh @@ -0,0 +1,11 @@ +#!/bin/bash + +git add -A +COMMIT_MSG=$(gum input --placeholder "Commit message...") +git commit -m "$COMMIT_MSG" +BRANCH=$(git name-rev --name-only HEAD) +gum confirm "Push?" && git push origin $BRANCH +if [ "${!#}" == "-pr" ]; then + gh pr create --base beta +fi + diff --git a/scripts/link_dotfiles.zsh b/scripts/link_dotfiles.zsh deleted file mode 100644 index e69de29..0000000 diff --git a/symlink_dotfiles.zsh b/symlink_dotfiles.zsh new file mode 100644 index 0000000..8ea2fb8 --- /dev/null +++ b/symlink_dotfiles.zsh @@ -0,0 +1,22 @@ +# zshrc +ln -s -f ~/dotfiles/zsh_config/zshrc ~/.zshrc + +# oh my zsh +ln -s -f ~/dotfiles/misc_config/oh-my-zsh.sh ~/.oh-my-zsh/oh-my-zsh.sh + +# starship +ln -s -f ~/dotfiles/misc_config/starship.toml ~/.config/starship.toml + +# git +ln -s -f ~/dotfiles/git_config/gitconfig ~/.gitconfig +ln -s -f ~/dotfiles/git_config/global_ignore ~/.gitignore +ln -s -f ~/dotfiles/git_config/gh_cli.yaml ~/.config/gh/config.yml + +# micro +ln -s -f ~/dotfiles/micro_config/* ~/.config/micro + +# thefuck +ln -s -f ~/dotfiles/misc_config/thefuck.py ~/.config/thefuck/settings.py + +# zed +ln -s -f ~/dotfiles/zed_config/* ~/.config/zed diff --git a/zsh_config/alias.zsh b/zsh_config/alias.zsh index e88e91f..c1c6c87 100644 --- a/zsh_config/alias.zsh +++ b/zsh_config/alias.zsh @@ -4,7 +4,7 @@ alias ptob="gh pr create -B beta" alias prune-git="git remote prune origin" alias dev="sh ~/dotfiles/scripts/run-dev.sh" alias lint="sh ~/dotfiles/scripts/run-lint.sh" -alias commit="sh ~/Documents/Shell\ Scripts/git-commit-push.sh" +alias commit="sh ~/dotfiles/scripts/git-commit-push.sh" alias macmini="ssh admin@Memory-Alpha.local" alias ls="eza" alias cd="z"