Skip to content

Commit

Permalink
switch from alacritty.yml to alacritty.toml
Browse files Browse the repository at this point in the history
  • Loading branch information
Aleksandr Fofanov committed Apr 4, 2024
1 parent 7b33d2c commit dd560e4
Show file tree
Hide file tree
Showing 4 changed files with 97 additions and 107 deletions.
2 changes: 1 addition & 1 deletion Makefile.macos
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ install-tmux:
install-alacritty:
brew install --cask alacritty
mkdir -p ${HOME}/.config/alacritty
ln -sf ${SDIR}/alacritty/alacritty.yml ${HOME}/.alacritty.yml
ln -sf ${SDIR}/alacritty/.alacritty.toml ${HOME}/.alacritty.toml
82 changes: 82 additions & 0 deletions alacritty/.alacritty.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
[window]
decorations = "Full"
startup_mode = "Maximized"
opacity = 1.0
dynamic_padding = true
dynamic_title = true

[scrolling]
history = 10000

[font]
size = 10.0

[font.normal]
family = "MesloLGS NF"
style = "Regular"

[font.bold]
family = "MesloLGS NF"
style = "Bold"

[font.italic]
family = "MesloLGS NF"
style = "Italic"


# https://github.com/arcticicestudio/nord-alacritty

[colors.primary]
background = "#2e3440"
foreground = "#d8dee9"
dim_foreground = "#a5abb6"

[colors.cursor]
text = "#2e3440"
cursor = "#d8dee9"

[colors.vi_mode_cursor]
text = "#2e3440"
cursor = "#d8dee9"

[colors.selection]
text = "CellForeground"
background = "#4c566a"

[colors.search.matches]
foreground = "CellBackground"
background = "#88c0d0"

[colors.search.focused_match]
background = "#434c5e"
foreground = "#d8dee9"

[colors.normal]
black = "#3b4252"
red = "#bf616a"
green = "#a3be8c"
yellow = "#ebcb8b"
blue = "#81a1c1"
magenta = "#b48ead"
cyan = "#88c0d0"
white = "#e5e9f0"

[colors.bright]
black = "#4c566a"
red = "#bf616a"
green = "#a3be8c"
yellow = "#ebcb8b"
blue = "#81a1c1"
magenta = "#b48ead"
cyan = "#8fbcbb"
white = "#eceff4"

[colors.dim]
black = "#373e4d"
red = "#94545d"
green = "#809575"
yellow = "#b29e75"
blue = "#68809a"
magenta = "#8c738c"
cyan = "#6d96a5"
white = "#aeb3bb"
80 changes: 0 additions & 80 deletions alacritty/alacritty.yml

This file was deleted.

40 changes: 14 additions & 26 deletions zsh/.zshrc
Original file line number Diff line number Diff line change
Expand Up @@ -95,44 +95,22 @@ source $ZSH/oh-my-zsh.sh

# export MANPATH="/usr/local/man:$MANPATH"

# Completions

source <(aws-vault --completion-script-zsh)
source <(fluxctl completion zsh)
source <(flux completion zsh)
complete -C '/usr/local/bin/aws_completer' aws


# The next line updates PATH for the Google Cloud SDK.
if [ -f '/home/rockwell/google-cloud-sdk/path.zsh.inc' ]; then . '/home/rockwell/google-cloud-sdk/path.zsh.inc'; fi

# The next line enables shell command completion for gcloud.
if [ -f '/home/rockwell/google-cloud-sdk/completion.zsh.inc' ]; then . '/home/rockwell/google-cloud-sdk/completion.zsh.inc'; fi

export NVM_DIR="$HOME/.nvm"
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm
[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion

# You may need to manually set your language environment
export LANG=en_US.UTF-8

# Other user-specific environment variables

export EDITOR=/bin/nano
export KUBECONFIG=~/.kube/config:~/.kube/microk8s
export KUBECONFIG=$(for i in $(find ~/.kube/ -maxdepth 1 -type f) ; do echo -n ":$i"; done | cut -c 2-)
export GOROOT=/usr/local/go
export PATH=/home/rockwell/go/bin:$GOROOT/bin:/home/rockwell/.linkerd2/bin:$PATH
export PATH=/home/rockwell/go/bin:$GOROOT/bin:/home/rockwell/.ones/:/home/rockwell/bin/:$PATH
export PATH=$PATH:$(go env GOPATH)/bin
export AWS_ASSUME_ROLE_TTL=1h
export AWS_SESSION_TTL=1h
export AWS_FEDERATION_TOKEN_TTL=1h
export CHAMBER_KMS_KEY_ALIAS=aws/ssm
export FLUX_FORWARD_NAMESPACE=fluxcd
export DOCKER_BUILDKIT=1

export SPEEDCTL_HOME=/home/rockwell/.speedscale
export PATH=$SPEEDCTL_HOME:$PATH

# Nordic colors
test -r ~/.dir_colors && eval $(dircolors ~/.dir_colors)

Expand All @@ -156,7 +134,7 @@ test -r ~/.dir_colors && eval $(dircolors ~/.dir_colors)
# alias ohmyzsh="mate ~/.oh-my-zsh"

alias tmux='TERM=xterm-256color tmux'
alias winbox='wine /usr/local/bin/winbox64.exe'
alias winbox='wine /home/rockwell/winbox64.exe'
alias kc='kubectl'
alias btest='wine /usr/local/bin/btest.exe'
alias gitsquash_dev='git reset $(git merge-base dev $(git rev-parse --abbrev-ref HEAD))'
Expand All @@ -165,7 +143,8 @@ alias laws='aws --endpoint-url=http://localhost:4566 --profile=localstack'
alias pbcopy='xclip -selection clipboard'
alias pbpaste='xclip -selection clipboard -o'
alias mkctl="microk8s kubectl"
alias ls='exa'
alias ls='eza'
alias krueger='docker compose run --rm krueger'

# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh
Expand All @@ -174,6 +153,15 @@ alias ls='exa'
autoload -U +X bashcompinit && bashcompinit
autoload -U compinit && compinit

# Completions

source <(aws-vault --completion-script-zsh)
source <(flux completion zsh)
source <(buf completion zsh)
onesctl completion zsh > "${fpath[1]}/_onesctl"

complete -C '/usr/local/bin/aws_completer' aws

# Enable direnv
eval "$(direnv hook $SHELL)"

Expand Down

0 comments on commit dd560e4

Please sign in to comment.