Skip to content

Commit 807f9d9

Browse files
committed
Update
1 parent 0321723 commit 807f9d9

File tree

22 files changed

+376
-278
lines changed

22 files changed

+376
-278
lines changed

alacritty/alacritty.toml

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
working_directory = "None"
2+
3+
[colors]
4+
draw_bold_text_with_bright_colors = true
5+
indexed_colors = []
6+
7+
[colors.bright]
8+
black = "0x666666"
9+
blue = "0x7aa6da"
10+
cyan = "0x54ced6"
11+
green = "0x9ec400"
12+
magenta = "0xb77ee0"
13+
red = "0xff3334"
14+
white = "0xffffff"
15+
yellow = "0xe7c547"
16+
17+
[colors.normal]
18+
black = "0x000000"
19+
blue = "0x7aa6da"
20+
cyan = "0x70c0ba"
21+
green = "0xb9ca4a"
22+
magenta = "0xc397d8"
23+
red = "0xd54e53"
24+
white = "0xeaeaea"
25+
yellow = "0xe6c547"
26+
27+
[colors.primary]
28+
background = "0x000000"
29+
foreground = "0xeaeaea"
30+
31+
[debug]
32+
log_level = "Warn"
33+
persistent_logging = true
34+
print_events = false
35+
render_timer = false
36+
37+
[env]
38+
TERM_PROGRAM = "Alacritty"
39+
40+
[font]
41+
size = 17.0
42+
43+
[font.bold]
44+
family = "Hack Nerd Font Mono"
45+
style = "Bold"
46+
47+
[font.italic]
48+
family = "Hack Nerd Font Mono"
49+
style = "Italic"
50+
51+
[font.normal]
52+
family = "Hack Nerd Font Mono"
53+
style = "Regular"
54+
55+
[[keyboard.bindings]]
56+
chars = "\u001Bb"
57+
key = "Left"
58+
mods = "Alt"
59+
60+
[[keyboard.bindings]]
61+
chars = "\u001Bf"
62+
key = "Right"
63+
mods = "Alt"
64+
65+
[mouse]
66+
hide_when_typing = true
67+
68+
# [mouse.hints]
69+
# launcher = "open"
70+
# modifiers = "Command|Shift"
71+
72+
[scrolling]
73+
history = 50000
74+
multiplier = 3
75+
76+
[selection]
77+
save_to_clipboard = true
78+
semantic_escape_chars = ",│`|:\"' ()[]{}<>"
79+
80+
[shell]
81+
args = ["--login"]
82+
program = "/opt/homebrew/bin/fish"
83+
84+
[window]
85+
decorations = "full"
86+
dynamic_padding = false
87+
dynamic_title = true
88+
option_as_alt = "OnlyLeft"
89+
startup_mode = "Maximized"
90+
91+
[window.padding]
92+
x = 3
93+
y = 3

alacritty/alacritty.yml

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

brew/Brewfile

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1+
tap 'hashicorp/tap'
12

2-
brew 'asciidoctor'
33
brew 'asciinema'
44
brew 'autoconf'
55
brew 'automake'
@@ -10,7 +10,6 @@ brew 'helm'
1010
brew 'pyenv'
1111
brew 'bash'
1212
brew 'bat'
13-
brew 'black'
1413
brew 'blueutil'
1514
brew 'clojure'
1615
brew 'starship'
@@ -22,9 +21,8 @@ brew 'cowsay'
2221
brew 'curl'
2322
brew 'diff-so-fancy'
2423
brew 'docker-credential-helper-ecr'
25-
brew 'dog'
26-
brew 'exa'
27-
brew 'fasd'
24+
brew 'doggo'
25+
brew 'eza'
2826
brew 'fd'
2927
brew 'fdupes'
3028
brew 'ffmpeg'
@@ -66,7 +64,6 @@ brew 'jrnl'
6664
brew 'kubectx'
6765
brew 'kubernetes-cli'
6866
brew 'kubespy'
69-
brew 'lastpass-cli'
7067
brew 'ldns'
7168
brew 'leiningen'
7269
brew 'lesspipe'
@@ -78,16 +75,13 @@ brew 'lsd'
7875
brew 'luajit'
7976
brew 'moreutils'
8077
brew 'mysql-client'
81-
brew 'mysql@5.7'
8278
brew 'ncdu'
8379
brew 'neofetch'
8480
brew 'nmap'
8581
brew 'ocaml'
8682
brew 'openssh'
8783
brew 'openssl'
88-
brew 'openvpn'
8984
brew 'pandoc'
90-
brew 'pass'
9185
brew 'pinentry-mac'
9286
brew 'pipx'
9387
brew 'pkg-config'
@@ -122,10 +116,12 @@ brew 'webkit2png'
122116
brew 'webp'
123117
brew 'wget'
124118
brew 'yamllint'
125-
brew 'youtube-dl'
126119
brew 'zlib'
127120
brew 'zsh'
128121

122+
brew 'hashicorp/tap/vault'
123+
124+
cask 'font-hack-nerd-font'
129125
cask 'alacritty'
130126
cask 'alfred'
131127
cask 'clipgrab'
@@ -140,9 +136,7 @@ cask 'karabiner-elements'
140136
cask 'keepassxc'
141137
cask 'keybase'
142138
cask 'plex-media-server'
143-
cask 'robo-3t'
144139
cask 'rstudio'
145-
cask 'sequel-pro'
146140
cask 'signal'
147141
cask 'skitch'
148142
cask 'skype'
@@ -161,6 +155,7 @@ cask 'keepingyouawake'
161155
cask 'pants'
162156
cask 'telegram'
163157
cask 'whatsapp'
158+
164159
# cask 'yubico-authenticator'
165160
# cask 'yubico-yubikey-manager'
166161

fish/completions/docker.fish

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ function __fish_print_docker_repositories --description 'Print a list of docker
8282
end
8383

8484
# common options
85-
complete -c docker -f -n '__fish_docker_no_subcommand' -l api-cors-header -d "Set CORS headers in the Engine API. Default is cors disabled"
8685
complete -c docker -f -n '__fish_docker_no_subcommand' -s b -l bridge -d 'Attach containers to a pre-existing network bridge'
8786
complete -c docker -f -n '__fish_docker_no_subcommand' -l bip -d "Use this CIDR notation address for the network bridge's IP, not compatible with -b"
8887
complete -c docker -f -n '__fish_docker_no_subcommand' -s D -l debug -d 'Enable debug mode'
@@ -178,6 +177,7 @@ complete -c docker -A -f -n '__fish_seen_subcommand_from cp' -l help -d 'Print u
178177
# create
179178
complete -c docker -f -n '__fish_docker_no_subcommand' -a create -d 'Create a new container'
180179
complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l add-host -d 'Add a custom host-to-IP mapping (host:ip)'
180+
complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l annotation -d 'Add an annotation to the container (passed through to the OCI runtime)'
181181
complete -c docker -A -f -n '__fish_seen_subcommand_from create' -s a -l attach -d 'Attach to STDIN, STDOUT or STDERR.'
182182
complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l blkio-weight -d 'Block IO (relative weight), between 10 and 1000, or 0 to disable (default 0)'
183183
complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l blkio-weight-device -d 'Block IO weight (relative device weight)'
@@ -453,6 +453,7 @@ complete -c docker -A -f -n '__fish_seen_subcommand_from rmi' -a '(__fish_print_
453453

454454
# run
455455
complete -c docker -f -n '__fish_docker_no_subcommand' -a run -d 'Create and run a new container from an image'
456+
complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l annotation -d 'Add an annotation to the container (passed through to the OCI runtime)'
456457
complete -c docker -A -f -n '__fish_seen_subcommand_from run' -s a -l attach -d 'Attach to STDIN, STDOUT or STDERR.'
457458
complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l add-host -d 'Add a custom host-to-IP mapping (host:ip)'
458459
complete -c docker -A -f -n '__fish_seen_subcommand_from run' -s c -l cpu-shares -d 'CPU shares (relative weight)'

fish/conf.d/00_global_vars.fish

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,13 +121,18 @@ set -gx LEIN_JVM_OPTS "-XX:+TieredCompilation -XX:TieredStopAtLevel=2"
121121

122122
set -gx ASDF_CONFIG_FILE "$XDG_CONFIG_HOME/asdf/.asdfrc"
123123

124+
set -gx MISE_FISH_AUTO_ACTIVATE 0
125+
124126

125127
fish_add_path --path \
126128
/usr/local/sbin \
129+
/opt/homebrew/sbin \
127130
$PIPX_BIN_DIR \
128131
$OPENSSL_PATH/bin \
129-
$BREW_PREFIX/mysql@5.7/bin \
130132
$GEM_HOME/bin \
131133
$BREW_PREFIX/tcl-tk/bin \
134+
$BREW_PREFIX/curl/bin \
132135
$GOBIN \
133-
$CARGOBIN
136+
$CARGOBIN \
137+
$XDG_DATA_HOME/npm-global-modules/bin
138+

fish/conf.d/07_pyenv.fish

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
if status --is-interactive; and type --query pyenv; and not set --query VIRTUAL_ENV
2-
set -gx PYENV_ROOT "$HOME/.pyenv"
3-
set -gx PATH $PATH "$PYENV_ROOT/bin"
4-
set -gx PYENV_VIRTUALENV_DISABLE_PROMPT 1
2+
#set -gx PYENV_ROOT "$HOME/.pyenv"
3+
# set -gx PATH $PATH "$PYENV_ROOT/bin"
4+
#set -gx PYENV_VIRTUALENV_DISABLE_PROMPT 1
55

66
# pyenv init --path | source
77
# pyenv virtualenv-init - | source

fish/conf.d/106_asdf.fish

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
set -l asdf_path $BREW_PREFIX/asdf/libexec/asdf.fish
2-
3-
if test -e "$asdf_path"
4-
source "$asdf_path"
5-
# Set JAVA_HOME
6-
. ~/.asdf/plugins/java/set-java-home.fish
7-
end
1+
# set -l asdf_path $BREW_PREFIX/asdf/libexec/asdf.fish
2+
#
3+
# if test -e "$asdf_path"
4+
# source "$asdf_path"
5+
# # Set JAVA_HOME
6+
# . ~/.asdf/plugins/java/set-java-home.fish
7+
# end

fish/conf.d/107_mise.fish

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
if status --is-interactive; and type --query mise
2+
mise activate fish | source
3+
end

fish/fishfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
11
edc/bass
22
jethrokuan/z
3-
evanlucas/fish-kubectl-completions
4-
# starship/starship

fish/functions/awslogin.fish

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,14 @@ function awslogin --description "AWS Login SSO script"
3636
set -Ux AWS_SESSION_TOKEN (echo $out | jq -r .Credentials.SessionToken)
3737

3838
echo "[default]
39-
aws_access_key_id=$AWS_ACCESS_KEY_ID
40-
aws_secret_access_key=$AWS_SECRET_ACCESS_KEY
41-
aws_session_token=$AWS_SESSION_TOKEN
42-
43-
[$AWS_PROFILE]
44-
aws_access_key_id=$AWS_ACCESS_KEY_ID
45-
aws_secret_access_key=$AWS_SECRET_ACCESS_KEY
46-
aws_session_token=$AWS_SESSION_TOKEN
47-
" > ~/.aws/credentials
39+
aws_access_key_id=$AWS_ACCESS_KEY_ID
40+
aws_secret_access_key=$AWS_SECRET_ACCESS_KEY
41+
aws_session_token=$AWS_SESSION_TOKEN
42+
43+
[$AWS_PROFILE]
44+
aws_access_key_id=$AWS_ACCESS_KEY_ID
45+
aws_secret_access_key=$AWS_SECRET_ACCESS_KEY
46+
aws_session_token=$AWS_SESSION_TOKEN" > ~/.aws/credentials
4847

4948
echo "Done"
5049
end

0 commit comments

Comments
 (0)