Skip to content

Commit b06e081

Browse files
codejshacodejsha
committed
Merge branch 'develop'
2 parents 8d58d87 + aa4f442 commit b06e081

File tree

15 files changed

+173
-69
lines changed

15 files changed

+173
-69
lines changed

‎.gitmodules‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
[submodule "confluent/confluent-kafka-script-generator"]
22
path = confluent/confluent-kafka-script-generator
33
url = https://github.com/codejsha/confluent-kafka-script-generator.git
4+
[submodule "macos/zsh/plugins"]
5+
path = macos/zsh/plugins
6+
url = https://github.com/codejsha/zsh-plugins.git

‎cpp/vcpkg/vcpkg-commands.sh‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@ vcpkg version
44
vcpkg integrate install
55
vcpkg list
66

7+
vcpkg remove $package
8+
vcpkg search $package
9+
vcpkg update
10+
vcpkg upgrade
11+
712
######################################################################
813

914
### install packages (windows)
@@ -41,7 +46,10 @@ vcpkg install avro-cpp
4146

4247
######################################################################
4348

44-
vcpkg remove $package
45-
vcpkg search $package
46-
vcpkg update
47-
vcpkg upgrade
49+
### install packages (macos)
50+
vcpkg install gsl:arm64-osx
51+
vcpkg install gtest:arm64-osx
52+
vcpkg install benchmark:arm64-osx
53+
vcpkg install fmt:arm64-osx
54+
vcpkg install boost-graph:arm64-osx
55+
vcpkg install abseil:arm64-osx

‎java/intellij/.ideavimrc‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
set clipboard+=unnamed,unnamedplus
2+
3+
sethandler <S-CR> a:ide
4+
sethandler <S-Left> a:ide
5+
sethandler <S-Up> a:ide
6+
sethandler <S-Right> a:ide
7+
sethandler <S-Down> a:ide
8+
sethandler <C-2> a:ide
9+
sethandler <C-S-2> a:ide
10+
sethandler <C-6> a:ide
11+
sethandler <C-S-6> a:ide
12+
sethandler <C-A> a:ide
13+
sethandler <C-B> a:ide
14+
sethandler <C-C> a:ide
15+
sethandler <C-D> a:ide
16+
sethandler <C-E> a:ide
17+
sethandler <C-F> a:ide
18+
sethandler <C-G> a:ide
19+
sethandler <C-H> a:ide
20+
sethandler <C-I> a:ide
21+
sethandler <C-J> a:ide
22+
sethandler <C-K> a:ide
23+
sethandler <C-L> a:ide
24+
sethandler <C-M> a:ide
25+
sethandler <C-N> a:ide
26+
sethandler <C-O> a:ide
27+
sethandler <C-P> a:ide
28+
sethandler <C-R> a:ide
29+
sethandler <C-S> a:ide
30+
sethandler <C-T> a:ide
31+
sethandler <C-V> a:ide
32+
sethandler <C-W> a:ide

‎linux/alacritty /alacritty.toml‎

Lines changed: 28 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,33 @@
1+
[env]
2+
TERM = "xterm-256color"
3+
4+
[window]
5+
dimensions.columns = 120
6+
dimensions.lines = 50
7+
padding.x = 8
8+
padding.y = 4
9+
110
[font]
211
size = 13.0
312
offset.y = 1
13+
normal.family = "Hack Nerd Font"
14+
normal.style = "Regular"
15+
bold.family = "Hack Nerd Font"
16+
bold.style = "Bold"
17+
bold_italic.family = "Hack Nerd Font"
18+
bold_italic.style = "Bold Italic"
19+
italic.family = "Hack Nerd Font"
20+
italic.style = "Italic"
421

5-
[font.normal]
6-
family = "Hack Nerd Font"
7-
style = "Regular"
8-
9-
[font.bold]
10-
family = "Hack Nerd Font"
11-
style = "Bold"
12-
13-
[font.bold_italic]
14-
family = "Hack Nerd Font"
15-
style = "Bold Italic"
22+
[colors]
23+
primary.background = "0x1E1E1E"
24+
primary.foreground = "0xD4D4D4"
1625

17-
[font.italic]
18-
family = "Hack Nerd Font"
19-
style = "Italic"
26+
[keyboard]
27+
bindings = [
28+
{ key = "Left", mods = "Alt", chars = "\u001bB" },
29+
{ key = "Right", mods = "Alt", chars = "\u001bF" },
30+
{ key = "Left", mods = "Command", chars = "\u001bOH" },
31+
{ key = "Right", mods = "Command", chars = "\u001bOF" },
32+
{ key = "Back", mods = "Command", chars = "\u0015" },
33+
]

‎linux/bash-commands.sh‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,20 @@ set -o xtrace
1515

1616
######################################################################
1717

18+
### command
19+
20+
command -v ll
21+
function sudo() { echo "+ sudo ${@}">&2; command sudo "${@}"; }
22+
function make() { echo "+ make ${@}">&2; command make "${@}"; }
23+
24+
which -a vim
25+
1826
### watch
1927
watch -x bash -ic "my-alias"
2028
alias watch="watch "
2129

2230
######################################################################
2331

24-
command -v ll
25-
26-
######################################################################
27-
2832
### location
2933

3034
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"
@@ -34,7 +38,13 @@ export LS_COLORS="di=36:ln=38;5;210:or=31:so=32:pi=33:ex=32:bd=34;46:cd=34;43:su
3438
# or: orphan symbolic link
3539
# so: socket
3640

37-
alias ll="ls -l -h --color=auto"
41+
ls -l -h --color=auto
42+
readlink --canonicalize .
3843

3944
function cdp() { DIRECTORY="${1}"; echo "+ cd -P ${*}">&2; command cd -P ${DIRECTORY}; STATUS="${?}"; if [ "${STATUS}" -eq "0" ]; then printf "\e[38;2;216;160;223mLOCATION: $(pwd)\e[0m\n"; ls --almost-all -l; fi; }
40-
function readlinkpwd() { echo "+ readlink --canonicalize .">&2; command readlink --canonicalize .; }
45+
46+
######################################################################
47+
48+
### split string
49+
local IFS=$'\n'
50+
local arr=($(echo "${input}" | awk -F'[;|&]+' '{for (i=1; i<=NF; i++) print $i}'))

‎linux/file/file-search-commands.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33
### rg (ripgrep)
44

5+
fd -tf -E "*test.go|test/" .go | xargs rg "\.Set[A-Za-z]+"
6+
fd -tf -E ".go" | xargs rg "time.ParseInLocation" | rg -v "time.Local"
7+
58
######################################################################
69

710
### grep (Print lines matching a pattern)

‎linux/neovim/init.vim‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
1-
syntax on
21
set termguicolors
3-
set background=dark
2+
highlight Normal guibg=#1E1E1E guifg=#D4D4D4

‎linux/neovim/neovim-config-commands.vim‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
######################################################################
2+
3+
set termguicolors
4+
set background=dark
5+
6+
######################################################################
7+
8+
set termguicolors
9+
highlight Normal guibg=#1E1E1E guifg=#D4D4D4
10+
11+
######################################################################

‎macos/karabiner/karabiner-option-number.json‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@
127127
{
128128
"conditions": [
129129
{
130-
"bundle_identifiers": ["^co\\.zeit\\.hyper$"],
130+
"bundle_identifiers": ["^org\\.alacritty$"],
131131
"type": "frontmost_application_unless"
132132
}
133133
],
@@ -139,15 +139,15 @@
139139
},
140140
"to": [
141141
{
142-
"shell_command": "open -b co.zeit.hyper"
142+
"shell_command": "open -b org.alacritty"
143143
}
144144
],
145145
"type": "basic"
146146
},
147147
{
148148
"conditions": [
149149
{
150-
"bundle_identifiers": ["^co\\.zeit\\.hyper$"],
150+
"bundle_identifiers": ["^org\\.alacritty$"],
151151
"type": "frontmost_application_if"
152152
}
153153
],
@@ -291,7 +291,7 @@
291291
{
292292
"conditions": [
293293
{
294-
"bundle_identifiers": ["^com\\.jetbrains\\.pycharm$"],
294+
"bundle_identifiers": ["^com\\.jetbrains\\.rustrover$"],
295295
"type": "frontmost_application_unless"
296296
}
297297
],
@@ -303,15 +303,15 @@
303303
},
304304
"to": [
305305
{
306-
"shell_command": "open -b com.jetbrains.pycharm"
306+
"shell_command": "open -b com.jetbrains.rustrover"
307307
}
308308
],
309309
"type": "basic"
310310
},
311311
{
312312
"conditions": [
313313
{
314-
"bundle_identifiers": ["^com\\.jetbrains\\.pycharm$"],
314+
"bundle_identifiers": ["^com\\.jetbrains\\.rustrover$"],
315315
"type": "frontmost_application_if"
316316
}
317317
],
@@ -332,7 +332,7 @@
332332
{
333333
"conditions": [
334334
{
335-
"bundle_identifiers": ["^com\\.jetbrains\\.WebStorm$"],
335+
"bundle_identifiers": ["^com\\.jetbrains\\.pycharm$"],
336336
"type": "frontmost_application_unless"
337337
}
338338
],
@@ -344,15 +344,15 @@
344344
},
345345
"to": [
346346
{
347-
"shell_command": "open -b com.jetbrains.WebStorm"
347+
"shell_command": "open -b com.jetbrains.pycharm"
348348
}
349349
],
350350
"type": "basic"
351351
},
352352
{
353353
"conditions": [
354354
{
355-
"bundle_identifiers": ["^com\\.jetbrains\\.WebStorm$"],
355+
"bundle_identifiers": ["^com\\.jetbrains\\.pycharm$"],
356356
"type": "frontmost_application_if"
357357
}
358358
],
@@ -373,7 +373,7 @@
373373
{
374374
"conditions": [
375375
{
376-
"bundle_identifiers": ["^com\\.jetbrains\\.CLion$"],
376+
"bundle_identifiers": ["^com\\.jetbrains\\.WebStorm$"],
377377
"type": "frontmost_application_unless"
378378
}
379379
],
@@ -385,15 +385,15 @@
385385
},
386386
"to": [
387387
{
388-
"shell_command": "open -b com.jetbrains.CLion"
388+
"shell_command": "open -b com.jetbrains.WebStorm"
389389
}
390390
],
391391
"type": "basic"
392392
},
393393
{
394394
"conditions": [
395395
{
396-
"bundle_identifiers": ["^com\\.jetbrains\\.CLion$"],
396+
"bundle_identifiers": ["^com\\.jetbrains\\.WebStorm$"],
397397
"type": "frontmost_application_if"
398398
}
399399
],

‎macos/zsh/.zshrc‎

Lines changed: 9 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,28 @@
1-
### ohmyzsh
2-
export ZSH="${HOME}/.oh-my-zsh"
3-
export ZSH_COMPDUMP="${HOME}/.cache/zcompdump/zcompdump-${ZSH_VERSION}"
4-
DISABLE_AUTO_TITLE="true"
5-
DISABLE_LS_COLORS="true"
6-
ENABLE_CORRECTION="false"
7-
SHOW_AWS_PROMPT="false"
8-
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
10-
source ${ZSH}/oh-my-zsh.sh
11-
121
### shell integration
2+
export ZSH_COMPDUMP="${HOME}/.cache/zcompdump/zcompdump-${ZSH_VERSION}"
133
export STARSHIP_CONFIG="${HOME}/.config/starship/starship.toml"
144
eval "$(starship init zsh)"
155
eval "$(zoxide init zsh)"
166
eval "$(atuin init zsh --disable-up-arrow)"
177
source ${HOMEBREW_PREFIX}/opt/git-extras/share/git-extras/git-extras-completion.zsh
188
source ${HOMEBREW_PREFIX}/share/zsh-autosuggestions/zsh-autosuggestions.zsh
199
source ${HOMEBREW_PREFIX}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
20-
21-
### terminal title
22-
case ${TERM} in
23-
xterm*)
24-
precmd () {print -Pn "\e]0;%~\a"}
25-
;;
26-
esac
10+
source ${HOME}/tools/zsh-plugins/alias.plugin.zsh
11+
source ${HOME}/tools/zsh-plugins/docker.plugin.zsh
12+
source ${HOME}/tools/zsh-plugins/docker-compose.plugin.zsh
13+
FPATH=${HOMEBREW_PREFIX}/share/zsh-completions:${FPATH}
14+
autoload -Uz compinit
15+
compinit -C
2716

2817
### variables
2918
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"
19+
export PATH="/opt/homebrew/opt/curl/bin:${PATH}"
3020
export PATH="/opt/homebrew/opt/llvm/bin:${PATH}"
3121
export PATH="${HOME}/go/bin:${PATH}"
3222
export PATH="${HOME}/.krew/bin:${PATH}"
3323
export JAVA_HOME="/Library/Java/JavaVirtualMachines/microsoft-21.jdk/Contents/Home"
3424
export GROOVY_HOME="/opt/homebrew/opt/groovysdk/libexec"
25+
export VCPKG_ROOT="${HOME}/tools/vcpkg"
3526

3627
### aliases
3728
alias ls="lsd"
@@ -40,20 +31,9 @@ alias vi="nvim"
4031
alias vim="nvim"
4132
alias vimdiff="nvim -d"
4233
alias cat="bat --style=plain --paging=never"
43-
alias vcpkg="${HOME}/tools/vcpkg/vcpkg"
4434
alias mysql="/opt/homebrew/opt/mysql-client@8.4/bin/mysql"
4535
alias mysqldump="/opt/homebrew/opt/mysql-client@8.4/bin/mysqldump"
4636

47-
### logging commands
48-
preexec() {
49-
local TARGET_COMMANDS="aws|bat|brew|curl|docker|fd|git|go|helm|http|jar|java|jcmd|jq|jstack|kubectl|kustomize|make|npm|perl|pip|poetry|python3|rg|sudo|tekton|vault|xargs|yarn|yq"
50-
local command=${1}
51-
local command_base=${command%% *}
52-
local command_rest=${command#"${command_base}"}
53-
local actual_command=$(whence -- "${command_base}" || echo "${command_base}")
54-
[[ ${actual_command} =~ ^($TARGET_COMMANDS) ]] && echo "+ ${actual_command}${command_rest}"
55-
}
56-
5737
function cddownloads() { DIRECTORY="${HOME}/Downloads"; echo "+ cd ${DIRECTORY}">&2; cd ${DIRECTORY} || exit; STATUS="${?}"; if [ "${STATUS}" -eq "0" ]; then lsd -alh; fi; }
5838
function cdrepos() { DIRECTORY="${HOME}/source/repos"; echo "+ cd ${DIRECTORY}">&2; cd ${DIRECTORY} || exit; STATUS="${?}"; if [ "${STATUS}" -eq "0" ]; then lsd -alh; fi; }
5939
function cdcoderepos() { DIRECTORY="${HOME}/source/coderepos"; echo "+ cd ${DIRECTORY}">&2; cd ${DIRECTORY} || exit; STATUS="${?}"; if [ "${STATUS}" -eq "0" ]; then lsd -alh; fi; }

0 commit comments

Comments
 (0)