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

Reorganize files

Browse Source
This commit is contained in:
Alexander Rosenberg 2023-11-21 04:04:09 -08:00
parent f1e1c5ddb3
commit 309b32e515
Signed by: Zander671
GPG Key ID: 5FD0394ADBD72730
3 changed files with 3 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
local/early-init.alexanders-desktop.zsh → early-init.zsh
View File

@ -1,7 +1,5 @@
# 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
@ -20,7 +18,6 @@ if [[ -o login ]]; then
SSH_ASKPASS="/usr/local/bin/ssh-askpass-cat.sh" \
add_ssh_keys &
if ! [[ -v WAYLAND_DISPLAY ]] && [ "${XDG_VTNR}" -eq 1 ]; then
exec Hyprland
fi

6
init.zsh
View File

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

24
local/early-init.alexanders-portable.zsh
View File

@ -1,24 +0,0 @@
# 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=2"
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
}
# Because I use zsh to start graphical sessions
if [[ -o login ]]; then
export LC_ALL=en_US.UTF-8
eval "$(gnome-keyring-daemon --start 2>/dev/null)"
export SSH_AUTH_SOCK
SSH_ASKPASS_REQUIRE="force" SSH_ASKPASS="/usr/local/bin/ssh-askpass-cat.sh" add_ssh_keys &
if ! [[ -v WAYLAND_DISPLAY ]] && [ "${XDG_VTNR}" -eq 1 ]; then
exec Hyprland
fi
fi