yoshie
/
dotfiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

chore(nvim): format zsh, bash

main
sudo pacman -Syu 2024-04-04 17:04:12 +07:00
parent 71b56ea1b6
commit 2c9b782535
2 changed files with 50 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/nvim/init.lua
View File

@ -429,6 +429,7 @@ require("lazy").setup({
local conform = require("conform") local conform = require("conform")
conform.setup({ conform.setup({
formatters_by_ft = { formatters_by_ft = {
bash = { "shfmt" },
go = { "gofumpt" }, go = { "gofumpt" },
javascript = { "deno_fmt" }, javascript = { "deno_fmt" },
json = { "deno_fmt" }, json = { "deno_fmt" },
@ -437,6 +438,7 @@ require("lazy").setup({
python = { "ruff_format" }, python = { "ruff_format" },
sh = { "shfmt" }, sh = { "shfmt" },
toml = { "taplo" }, toml = { "taplo" },
zsh = { "shfmt" },
}, },
formatters = { formatters = {
gofumpt = { gofumpt = {

95
data/zsh/bottom-zshrc
View File

@ -27,11 +27,11 @@ export LESS="-RF -i -K -s -x2 --wordwrap"
# nvim # nvim
if command -v nvim &>/dev/null; then if command -v nvim &>/dev/null; then
export EDITOR=nvim export EDITOR=nvim
export VISUAL=nvim export VISUAL=nvim
export GIT_EDITOR=nvim export GIT_EDITOR=nvim
alias vi="nvim" alias vi="nvim"
alias vim="nvim" alias vim="nvim"
fi fi
# go # go
@ -44,97 +44,98 @@ export PATH=$PATH:$GOPATH/bin
# fzf # fzf
# https://github.com/junegunn/fzf # https://github.com/junegunn/fzf
if command -v fzf &>/dev/null; then if command -v fzf &>/dev/null; then
export FZF_COMPLETION_TRIGGER='~~' export FZF_COMPLETION_TRIGGER='~~'
if command -v fd &>/dev/null; then if command -v fd &>/dev/null; then
_fzf_compgen_path() { _fzf_compgen_path() {
fd --type file . "$1" fd --type file . "$1"
} }
_fzf_compgen_dir() { _fzf_compgen_dir() {
fd --type directory . "$1" fd --type directory . "$1"
} }
export FZF_DEFAULT_COMMAND="fd --type file --color=always" export FZF_DEFAULT_COMMAND="fd --type file --color=always"
export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND" export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND"
export FZF_ALT_C_COMMAND="fd --type directory --color=always" export FZF_ALT_C_COMMAND="fd --type directory --color=always"
fi fi
export FZF_DEFAULT_OPTS="\ # https://github.com/catppuccin/fzf
export FZF_DEFAULT_OPTS="\
--ansi \ --ansi \
--pointer='🔫' --prompt='🪓 ' \ --pointer='🔫' --prompt='🪓 ' \
--color=bg+:#313244,bg:#1e1e2e,spinner:#f5e0dc,hl:#f38ba8 \ --color=bg+:#313244,bg:#1e1e2e,spinner:#f5e0dc,hl:#f38ba8 \
--color=fg:#cdd6f4,header:#f38ba8,info:#cba6f7,pointer:#f5e0dc \ --color=fg:#cdd6f4,header:#f38ba8,info:#cba6f7,pointer:#f5e0dc \
--color=marker:#f5e0dc,fg+:#cdd6f4,prompt:#cba6f7,hl+:#f38ba8" --color=marker:#f5e0dc,fg+:#cdd6f4,prompt:#cba6f7,hl+:#f38ba8"
if command -v bat &>/dev/null; then if command -v bat &>/dev/null; then
export FZF_CTRL_T_OPTS="--preview 'bat --color=always --line-range=:500 {}'" export FZF_CTRL_T_OPTS="--preview 'bat --color=always --line-range=:500 {}'"
fi fi
if command -v eza &>/dev/null; then if command -v eza &>/dev/null; then
export FZF_ALT_C_OPTS="--preview 'eza --tree --level 1 {}'" export FZF_ALT_C_OPTS="--preview 'eza --tree --level 1 {}'"
fi fi
fi fi
# https://github.com/BurntSushi/ripgrep # https://github.com/BurntSushi/ripgrep
if command -v rg &>/dev/null; then if command -v rg &>/dev/null; then
export RIPGREP_CONFIG_PATH="$HOME/.config/ripgrep/ripgreprc" export RIPGREP_CONFIG_PATH="$HOME/.config/ripgrep/ripgreprc"
fi fi
# https://github.com/eza-community/eza # https://github.com/eza-community/eza
if command -v eza &>/dev/null; then if command -v eza &>/dev/null; then
alias ls="eza" alias ls="eza"
alias la="eza -la" alias la="eza -la"
alias lt="eza --tree" alias lt="eza --tree"
fi fi
# https://github.com/wilfred/difftastic # https://github.com/wilfred/difftastic
if command -v difft &>/dev/null; then if command -v difft &>/dev/null; then
export DFT_DISPLAY=inline export DFT_DISPLAY=inline
export DFT_TAB_WIDTH=2 export DFT_TAB_WIDTH=2
fi fi
# https://restic.readthedocs.io/en/latest/manual_rest.html # https://restic.readthedocs.io/en/latest/manual_rest.html
if command -v restic &>/dev/null; then if command -v restic &>/dev/null; then
export RESTIC_PASSWORD_FILE=$HOME/.restic_password_file export RESTIC_PASSWORD_FILE=$HOME/.restic_password_file
fi fi
# https://github.com/sharkdp/vivid # https://github.com/sharkdp/vivid
if command -v vivid &>/dev/null; then if command -v vivid &>/dev/null; then
export LS_COLORS="$(vivid generate catppuccin-mocha)" export LS_COLORS="$(vivid generate catppuccin-mocha)"
fi fi
# https://github.com/ajeetdsouza/zoxide # https://github.com/ajeetdsouza/zoxide
if command -v zoxide &>/dev/null; then if command -v zoxide &>/dev/null; then
eval "$(zoxide init zsh)" eval "$(zoxide init zsh)"
fi fi
# https://github.com/walles/moar # https://github.com/walles/moar
if command -v moar &>/dev/null; then if command -v moar &>/dev/null; then
export MOAR="-no-linenumbers -no-statusbar -quit-if-one-screen -wrap" export MOAR="-no-linenumbers -no-statusbar -quit-if-one-screen -wrap"
export PAGER=moar export PAGER=moar
fi fi
# https://github.com/atuinsh/atuin # https://github.com/atuinsh/atuin
if command -v atuin &>/dev/null; then if command -v atuin &>/dev/null; then
eval "$(atuin init zsh --disable-up-arrow)" eval "$(atuin init zsh --disable-up-arrow)"
fi fi
# https://github.com/extrawurst/gitui # https://github.com/extrawurst/gitui
if command -v gitui &>/dev/null; then if command -v gitui &>/dev/null; then
alias gu="gitui" alias gu="gitui"
fi fi
# https://github.com/Schniz/fnm # https://github.com/Schniz/fnm
if command -v fnm &>/dev/null; then if command -v fnm &>/dev/null; then
eval "$(fnm env --use-on-cd)" eval "$(fnm env --use-on-cd)"
fi fi
# https://github.com/pyenv/pyenv # https://github.com/pyenv/pyenv
if command -v pyenv &>/dev/null; then if command -v pyenv &>/dev/null; then
export PYENV_ROOT="$HOME/.pyenv" export PYENV_ROOT="$HOME/.pyenv"
[[ -d $PYENV_ROOT/bin ]] && export PATH="$PYENV_ROOT/bin:$PATH" [[ -d $PYENV_ROOT/bin ]] && export PATH="$PYENV_ROOT/bin:$PATH"
eval "$(pyenv init -)" eval "$(pyenv init -)"
fi fi
# Depend on your company # Depend on your company
@ -145,15 +146,15 @@ export JIRA_AUTH_TYPE=bearer
# https://github.com/talwat/pokeget-rs # https://github.com/talwat/pokeget-rs
rand_poke=$((RANDOM % 6)) rand_poke=$((RANDOM % 6))
if [[ $rand_poke -eq 0 ]]; then if [[ $rand_poke -eq 0 ]]; then
cat ~/.config/pokeget/pikachu.txt cat ~/.config/pokeget/pikachu.txt
elif [[ $rand_poke -eq 1 ]]; then elif [[ $rand_poke -eq 1 ]]; then
cat ~/.config/pokeget/clefairy.txt cat ~/.config/pokeget/clefairy.txt
elif [[ $rand_poke -eq 2 ]]; then elif [[ $rand_poke -eq 2 ]]; then
cat ~/.config/pokeget/ditto.txt cat ~/.config/pokeget/ditto.txt
elif [[ $rand_poke -eq 3 ]]; then elif [[ $rand_poke -eq 3 ]]; then
cat ~/.config/pokeget/chikorita.txt cat ~/.config/pokeget/chikorita.txt
elif [[ $rand_poke -eq 4 ]]; then elif [[ $rand_poke -eq 4 ]]; then
cat ~/.config/pokeget/eevee.txt cat ~/.config/pokeget/eevee.txt
elif [[ $rand_poke -eq 5 ]]; then elif [[ $rand_poke -eq 5 ]]; then
cat ~/.config/pokeget/squirtle.txt cat ~/.config/pokeget/squirtle.txt
fi fi