Zander671/zsh-config
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make machine specific config better

Browse Source
This commit is contained in:
Alexander Rosenberg 2023-09-15 14:55:47 -07:00
parent 8f63b3227b
commit 481ff81c65
Signed by: Zander671
GPG Key ID: 5FD0394ADBD72730
2 changed files with 37 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
init.zsh
View File

@ -18,11 +18,17 @@ function cmd_exists {
[[ -v ZSH_USER_DIR ]] || ZSH_USER_DIR="${HOME}/.zsh.d" [[ -v ZSH_USER_DIR ]] || ZSH_USER_DIR="${HOME}/.zsh.d"
# source_user_file <name> # source_user_file <name>
function source_user_file { function source_user_file {
[ -e "${ZSH_USER_DIR}/${1}" ] && source "${ZSH_USER_DIR}/${1}" local machine_specific="${ZSH_CONFIG_DIR}/local/${1}.${HOST}.zsh"
local default="${ZSH_CONFIG_DIR}/local/${1}.zsh"
if [ -e "${machine_specific}" ]; then
source "${machine_specific}"
elif [ -e "${default}" ]; then
source "${default}"
fi
} }
# Load user early init file # Load user early init file
source_user_file "early-init.zsh" source_user_file "early-init"
# Some options # Some options
setopt autocd extendedglob rm_star_silent completealiases setopt autocd extendedglob rm_star_silent completealiases
@ -249,7 +255,7 @@ zstyle ':fzf-tab:*' switch-group 'ctrl-h' 'ctrl-l'
zstyle ':fzf-tab:*' fzf-bindings 'ctrl-a:toggle-all' zstyle ':fzf-tab:*' fzf-bindings 'ctrl-a:toggle-all'
# Load user init file # Load user init file
source_user_file 'local.zsh' source_user_file 'init'
# THE FOLLOWING PLUGINS MUST COME LAST # THE FOLLOWING PLUGINS MUST COME LAST

28
local/early-init.alexanders-desktop.zsh Normal file
View File

@ -0,0 +1,28 @@
# Some extra environment variables
export PATH="${HOME}/.local/bin:${PATH}"
export JDK_JAVA_OPTIONS="-Dawt.useSystemAAFontSettings=on -Dswing.aatext=true -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel -Dsun.java2d.opengl=true -Dsun.java2d.uiScale=3"
export _JAVA_AWT_WM_NONREPARENTING=1
add_ssh_keys() {
pass show ssh/personal_gitea | ssh-add ~/.ssh/personal_gitea
pass show ssh/personal_server | ssh-add ~/.ssh/personal_server
pass show ssh/gandi_vps | ssh-add ~/.ssh/gandi_vps
pass show ssh/notabug | ssh-add ~/.ssh/notabug
pass show ssh/aur | ssh-add ~/.ssh/aur
pass show ssh/github | ssh-add ~/.ssh/github
}
# Because I use zsh to start X11
if [[ -o login ]]; then
export LC_ALL=en_US.UTF-8
eval "$(gnome-keyring-daemon --start 2>/dev/null)"
eval "$(ssh-agent)"
SSH_ASKPASS_REQUIRE="force" \
SSH_ASKPASS="/usr/local/bin/ssh-askpass-cat.sh" \
add_ssh_keys &
if ! [[ -v DISPLAY ]] && [ "${XDG_VTNR}" -eq 1 ]; then
exec startx
fi
fi