dotfiles

commit d880ed2d3700381f32272533fb126af94b669910
parent 1cd80d4abbc7b931bdf562e44485860aa306a9ee
Author: FIGBERT <figbert@figbert.com>
Date:   Sat,  5 Feb 2022 18:40:25 -0800

Move from zsh to fish

Diffstat:
A
dot_config/private_fish/config.fish.tmpl
 | 
32
++++++++++++++++++++++++++++++++
D
dot_zshrc.tmpl
 | 
48
------------------------------------------------

2 files changed, 32 insertions(+), 48 deletions(-)
diff --git a/dot_config/private_fish/config.fish.tmpl b/dot_config/private_fish/config.fish.tmpl
@@ -0,0 +1,32 @@
+if status is-interactive
+    # path
+    {{ if eq .chezmoi.os "darwin" -}}
+    fish_add_path /usr/local/opt/openssl@1.1/bin
+    {{ end -}}
+    fish_add_path ~/.cargo/bin
+    fish_add_path ~/go/bin
+    fish_add_path ~/.local/bin
+    fish_add_path ~/.nimble/bin
+    # variables
+    set -x BW_SESSION {{ .shell.bw }}
+    set -x EDITOR nvim
+    set -x XDG_CONFIG_HOME {{ .chezmoi.homeDir }}/.config
+    # aliases
+    alias vi="nvim"
+    alias vim="nvim"
+    alias i2p="i2prouter"
+    alias ghidra="ghidraRun"
+    alias m2h="mosh -p 60000 home"
+    alias rsync="rsync --progress"
+    alias l="exa -la --group-directories-first"
+    alias lv="exa -l --group-directories-first"
+    alias wordle="rg '^[a-z]{5}\$' /usr/share/dict/words"
+    {{ if eq .chezmoi.os "darwin" -}}
+    alias fix-damaged="xattr -cr"
+    alias cordless="cordless -config-dir ~/.config/cordless"
+    alias godot="/Applications/Godot.app/Contents/MacOS/Godot"
+    {{ end -}}
+    # evals
+    starship init fish | source
+    zoxide init fish | source
+end
diff --git a/dot_zshrc.tmpl b/dot_zshrc.tmpl
@@ -1,48 +0,0 @@
-# variables
-export PATH="{{ if eq .chezmoi.os "darwin" }}/usr/local/opt/openssl@1.1/bin:{{ end }}${HOME}/.cargo/bin:${HOME}/go/bin:${HOME}/.local/bin:${PATH}"
-export BW_SESSION="{{ .zsh.bw }}"
-export PYENV_VIRTUALENV_DISABLE_PROMPT=1
-export EDITOR="nvim"
-export ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="fg=8"
-export XDG_CONFIG_HOME="{{ .chezmoi.homeDir }}/.config"
-{{ if eq .chezmoi.hostname "voidbert" -}}
-export XDG_RUNTIME_DIR="/run/user/figbert"
-export GPG_TTY="$(tty)"
-source {{ .chezmoi.homeDir }}/.ssh/agent > /dev/null
-{{ end -}}
-{{ if eq .chezmoi.os "darwin" -}}
-# zsh autosuggestions
-source /usr/local/share/zsh-autosuggestions/zsh-autosuggestions.zsh
-{{ end -}}
-# fzf configuration
-[ -f ~/.config/fzf/fzf.zsh ] && source ~/.config/fzf/fzf.zsh
-# aliases
-alias vi="nvim"
-alias vim="nvim"
-alias i2p="i2prouter"
-alias ghidra="ghidraRun"
-alias m2h="mosh -p 60000 home"
-alias rsync="rsync --progress"
-alias l="exa -la --group-directories-first"
-alias lv="exa -l --group-directories-first"
-{{ if eq .chezmoi.os "darwin" -}}
-alias fix-damaged="xattr -cr"
-alias cordless="cordless -config-dir ~/.config/cordless"
-alias godot="/Applications/Godot.app/Contents/MacOS/Godot"
-{{ else if eq .chezmoi.hostname "voidbert" -}}
-alias pvpn="sudo protonvpn"
-alias spt="spotify-tui"
-{{ end -}}
-# evals
-eval "$(starship init zsh)"
-eval "$(zoxide init zsh)"
-{{ if eq .chezmoi.os "darwin" -}}
-eval "$(pyenv init -)"
-#eval "$(pyenv virtualenv-init -)"
-{{ end -}}
-{{ if eq .chezmoi.hostname "voidbert" -}}
-# sway
-if [ "$(tty)" = "/dev/tty1" ]; then
-  exec sway
-fi
-{{ end -}}