Skip to content

Commit f0c5e0f

Browse files
committed
refactor: update commands
1 parent e7caf5e commit f0c5e0f

File tree

4 files changed

+55
-7
lines changed

4 files changed

+55
-7
lines changed

git/git-commands.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,12 @@
33
### debug
44
GIT_TRACE=1 git push origin main
55

6-
function gclo() { REPO_URL="${1}"; DIR_NAME="${2}"; if [ -z "${DIR_NAME}" ]; then REPO_NAME="${DIR_NAME}"; else REPO_NAME=$(basename "${REPO_URL}" .git | tr '[:upper:]' '[:lower:]'); fi; echo "+ git clone ${REPO_URL} ${REPO_NAME}">&2; command git clone ${REPO_URL} ${REPO_NAME}; }
6+
######################################################################
7+
8+
git clone <REPO_URL>
9+
git clone --recurse-submodules <REPO_URL>
10+
11+
function git-clone-lower() { REPO_URL="${1}"; DIR_NAME="${2}"; if [ -z "${DIR_NAME}" ]; then REPO_NAME="${DIR_NAME}"; else REPO_NAME=$(basename "${REPO_URL}" .git | tr '[:upper:]' '[:lower:]'); fi; echo "+ git clone ${REPO_URL} ${REPO_NAME}">&2; command git clone ${REPO_URL} ${REPO_NAME}; }
712

813
######################################################################
914

linux/bash-commands.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@ alias watch="watch "
2121

2222
######################################################################
2323

24+
command -v ll
25+
26+
######################################################################
27+
2428
### location
2529

2630
export LS_COLORS="di=36:ln=38;5;210:or=31:so=32:pi=33:ex=32:bd=34;46:cd=34;43:su=30;41:sg=30;46:tw=30;42:ow=30;43"

linux/neovim/neovim-commands.sh

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,34 @@
33
alias vi="nvim"
44
alias vim="nvim"
55
alias vimdiff="nvim -d"
6+
7+
######################################################################
8+
9+
u # undo
10+
Ctrl-r # redo
11+
12+
######################################################################
13+
14+
### cursor movement
15+
16+
Ctrl-f # Down page
17+
Ctrl-b # Up page
18+
Ctrl-d # Down half page
19+
Ctrl-u # Up half page
20+
21+
0 # beginning of line
22+
$ # end of line
23+
24+
w # forward word
25+
b # backward word
26+
27+
######################################################################
28+
29+
### window management
30+
31+
Ctrl-w s # split window horizontally
32+
Ctrl-w v # split window vertically
33+
Ctrl-w c # close window
34+
Ctrl-w w # switch window
35+
36+
######################################################################

macos/zsh/.zshrc

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ DISABLE_LS_COLORS="true"
66
ENABLE_CORRECTION="false"
77
SHOW_AWS_PROMPT="false"
88
plugins=(aliases brew copypath docker docker-compose dotnet forklift fzf gh git git-flow golang gpg-agent gradle helm kubectl kubectx npm perl pip poetry python virtualenv vscode yarn)
9+
fpath+=${ZSH_CUSTOM:-${ZSH:-~/.oh-my-zsh}/custom}/plugins/zsh-completions/src
910
source ${ZSH}/oh-my-zsh.sh
1011

1112
### starship
@@ -23,7 +24,7 @@ esac
2324
export LS_COLORS="di=36:ln=38;5;210:or=31:so=32:pi=33:ex=32:bd=34;46:cd=34;43:su=30;41:sg=30;46:tw=30;42:ow=30;43"
2425
export PATH="/opt/homebrew/opt/llvm/bin:${PATH}"
2526
export PATH="${HOME}/go/bin:${PATH}"
26-
export PATH="${KREW_ROOT:-$HOME/.krew}/bin:$PATH"
27+
export PATH="${HOME}/.krew/bin:${PATH}"
2728
export LDFLAGS="-L/opt/homebrew/opt/llvm/lib"
2829
export CPPFLAGS="-I/opt/homebrew/opt/llvm/include"
2930
export JAVA_HOME="/Library/Java/JavaVirtualMachines/microsoft-21.jdk/Contents/Home"
@@ -35,17 +36,24 @@ alias ll="lsd -alh"
3536
alias vi="nvim"
3637
alias vim="nvim"
3738
alias vimdiff="nvim -d"
39+
alias bat="bat --style=plain --paging=never"
3840
alias vcpkg="${HOME}/tools/vcpkg/vcpkg"
3941
alias mysql="/opt/homebrew/opt/mysql-client@8.4/bin/mysql"
4042
alias mysqldump="/opt/homebrew/opt/mysql-client@8.4/bin/mysqldump"
4143

44+
### logging commands
4245
preexec() {
43-
if [[ "$1" =~ ^(aws|brew|curl|docker|fd|git|go|helm|http|istioctl|jar|java|jcmd|jq|jstack|kubectl|kustomize|make|python3|rg|sudo|tekton|vault|xargs).* ]]; then
44-
echo "+ $1"
45-
fi
46+
local TARGET_COMMANDS="aws|bat|brew|curl|docker|fd|git|go|helm|http|istioctl|jar|java|jcmd|jq|jstack|kubectl|kustomize|make|python3|rg|sudo|tekton|vault|xargs"
47+
local command=${1}
48+
local command_base=${command%% *}
49+
local command_rest=${command#"${command_base}"}
50+
local actual_command=$(whence -- "${command_base}" || echo "${command_base}")
51+
[[ ${actual_command} =~ ^($TARGET_COMMANDS) ]] && echo "+ ${actual_command}${command_rest}"
4652
}
4753

48-
source /opt/homebrew/opt/git-extras/share/git-extras/git-extras-completion.zsh
54+
source ${HOMEBREW_PREFIX}/opt/git-extras/share/git-extras/git-extras-completion.zsh
55+
source ${HOMEBREW_PREFIX}/share/zsh-autosuggestions/zsh-autosuggestions.zsh
56+
source ${HOMEBREW_PREFIX}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
4957

5058
function cddownloads() { DIRECTORY="${HOME}/Downloads"; echo "+ cd ${DIRECTORY}">&2; cd ${DIRECTORY} || exit; STATUS="${?}"; if [ "${STATUS}" -eq "0" ]; then lsd -alh; fi; }
5159
function cdrepos() { DIRECTORY="${HOME}/source/repos"; echo "+ cd ${DIRECTORY}">&2; cd ${DIRECTORY} || exit; STATUS="${?}"; if [ "${STATUS}" -eq "0" ]; then lsd -alh; fi; }
@@ -60,4 +68,4 @@ function change-java-temurin-11() { JAVA_HOME="/Library/Java/JavaVirtualMachines
6068
function change-java-temurin-17() { JAVA_HOME="/Library/Java/JavaVirtualMachines/temurin-17.jdk/Contents/Home"; export JAVA_HOME; ${JAVA_HOME}/bin/java -version; }
6169
function change-java-temurin-21() { JAVA_HOME="/Library/Java/JavaVirtualMachines/temurin-21.jdk/Contents/Home"; export JAVA_HOME; ${JAVA_HOME}/bin/java -version; }
6270

63-
function gclo() { REPO_URL="${1}"; DIR_NAME="${2}"; if [ -z "${DIR_NAME}" ]; then REPO_NAME="${DIR_NAME}"; else REPO_NAME=$(basename "${REPO_URL}" .git | tr '[:upper:]' '[:lower:]'); fi; echo "+ git clone ${REPO_URL} ${REPO_NAME}">&2; command git clone ${REPO_URL} ${REPO_NAME}; }
71+
function git-clone-lower() { REPO_URL="${1}"; DIR_NAME="${2}"; if [ -z "${DIR_NAME}" ]; then REPO_NAME="${DIR_NAME}"; else REPO_NAME=$(basename "${REPO_URL}" .git | tr '[:upper:]' '[:lower:]'); fi; echo "+ git clone ${REPO_URL} ${REPO_NAME}">&2; command git clone ${REPO_URL} ${REPO_NAME}; }

0 commit comments

Comments
 (0)