Skip to content

Commit 8d58d87

Browse files
committed
Merge branch 'develop'
2 parents fe929f2 + 8c5e5ef commit 8d58d87

File tree

8 files changed

+186
-21
lines changed

8 files changed

+186
-21
lines changed

linux/alacritty /alacritty.toml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
[font]
2+
size = 13.0
3+
offset.y = 1
4+
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"
16+
17+
[font.italic]
18+
family = "Hack Nerd Font"
19+
style = "Italic"

linux/hyper/.hyper.js

Lines changed: 158 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
File renamed without changes.
File renamed without changes.
File renamed without changes.

linux/putty/putty-commands.sh

Lines changed: 0 additions & 11 deletions
This file was deleted.

macos/zsh/.zprofile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
eval "$(/opt/homebrew/bin/brew shellenv)"
22

3-
export LANG=en_US.UTF-8
3+
export LANG="en_US.UTF-8"
44
export GPG_TTY="$(tty)"
55

66
# Added by Toolbox App

macos/zsh/.zshrc

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,14 @@ plugins=(aliases brew copypath docker docker-compose dotnet forklift fzf gh git
99
fpath+=${ZSH_CUSTOM:-${ZSH:-~/.oh-my-zsh}/custom}/plugins/zsh-completions/src
1010
source ${ZSH}/oh-my-zsh.sh
1111

12-
### starship
12+
### shell integration
1313
export STARSHIP_CONFIG="${HOME}/.config/starship/starship.toml"
1414
eval "$(starship init zsh)"
15+
eval "$(zoxide init zsh)"
16+
eval "$(atuin init zsh --disable-up-arrow)"
17+
source ${HOMEBREW_PREFIX}/opt/git-extras/share/git-extras/git-extras-completion.zsh
18+
source ${HOMEBREW_PREFIX}/share/zsh-autosuggestions/zsh-autosuggestions.zsh
19+
source ${HOMEBREW_PREFIX}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
1520

1621
### terminal title
1722
case ${TERM} in
@@ -25,8 +30,6 @@ export LS_COLORS="di=36:ln=38;5;210:or=31:so=32:pi=33:ex=32:bd=34;46:cd=34;43:su
2530
export PATH="/opt/homebrew/opt/llvm/bin:${PATH}"
2631
export PATH="${HOME}/go/bin:${PATH}"
2732
export PATH="${HOME}/.krew/bin:${PATH}"
28-
export LDFLAGS="-L/opt/homebrew/opt/llvm/lib"
29-
export CPPFLAGS="-I/opt/homebrew/opt/llvm/include"
3033
export JAVA_HOME="/Library/Java/JavaVirtualMachines/microsoft-21.jdk/Contents/Home"
3134
export GROOVY_HOME="/opt/homebrew/opt/groovysdk/libexec"
3235

@@ -36,25 +39,21 @@ alias ll="lsd -alh"
3639
alias vi="nvim"
3740
alias vim="nvim"
3841
alias vimdiff="nvim -d"
39-
alias bat="bat --style=plain --paging=never"
42+
alias cat="bat --style=plain --paging=never"
4043
alias vcpkg="${HOME}/tools/vcpkg/vcpkg"
4144
alias mysql="/opt/homebrew/opt/mysql-client@8.4/bin/mysql"
4245
alias mysqldump="/opt/homebrew/opt/mysql-client@8.4/bin/mysqldump"
4346

4447
### logging commands
4548
preexec() {
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"
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"
4750
local command=${1}
4851
local command_base=${command%% *}
4952
local command_rest=${command#"${command_base}"}
5053
local actual_command=$(whence -- "${command_base}" || echo "${command_base}")
5154
[[ ${actual_command} =~ ^($TARGET_COMMANDS) ]] && echo "+ ${actual_command}${command_rest}"
5255
}
5356

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
57-
5857
function cddownloads() { DIRECTORY="${HOME}/Downloads"; echo "+ cd ${DIRECTORY}">&2; cd ${DIRECTORY} || exit; STATUS="${?}"; if [ "${STATUS}" -eq "0" ]; then lsd -alh; fi; }
5958
function cdrepos() { DIRECTORY="${HOME}/source/repos"; echo "+ cd ${DIRECTORY}">&2; cd ${DIRECTORY} || exit; STATUS="${?}"; if [ "${STATUS}" -eq "0" ]; then lsd -alh; fi; }
6059
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)