.chezmoi.yaml.tmpl

@@ -1,4 +0,0 @@
-sourceDir: ~/repos/dotfiles
-merge:
-  command: vim
-  args: "-d"

.chezmoiignore

@@ -1,6 +0,0 @@
-{{- if eq .chezmoi.hostname "WGC1065CTK7C3" }}
-.config/beets
-.config/sway
-.config/waybar
-.config/kitty
-{{- end }}

dot_config/environment

@@ -1,5 +1,3 @@
-# icky, but necessary since this might inject the needed XDG vars
-. "$HOME/.config/environment.local"
 . "$XDG_DATA_HOME/cargo/env"
 
 # editor

dot_config/zsh/dot_zshrc

@@ -4,7 +4,6 @@
 #
 # Lines configured by zsh-newuser-install
 export HISTFILE="$XDG_STATE_HOME"/zsh/history
-mkdir -p "$(dirname $HISTFILE)"
 HISTSIZE=1000
 SAVEHIST=1000
 setopt autocd
@@ -42,22 +41,18 @@ alias bt='bluetoothctl'
 alias c='clear'
 alias daybreak='mosh daybreak -p 60101'
 alias epoch='mosh epoch -p 60104'
-alias grc='gridcoinresearchd'
 alias l='exa -lh --git --all --octal-permissions'
 alias ls='exa'
 alias lsa='exa -a'
 alias lss='exa -a'
 alias xrm='sudo xbps-remove'
+alias grc='gridcoinresearchd'
+alias keychain='keychain --dir "$XDG_RUNTIME_DIR" --absolute'
 
 # GPG setup (and SSH)
-if command -v keychain; then
+eval `keychain --quiet --eval --agents gpg D7F966B85D985743C76A17AC5A9572AE7B2E7E1C`
-	alias keychain='keychain --dir "$XDG_RUNTIME_DIR" --absolute'
+SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)"
-	eval `keychain --quiet --eval --agents gpg D7F966B85D985743C76A17AC5A9572AE7B2E7E1C`
+export SSH_AUTH_SOCK
-fi
-if command -v gpgconf; then
-	SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)"
-	export SSH_AUTH_SOCK
-fi
 ### End user configuration
 
 ### hooks/includes