From 309b32e5150a4d397369ce634da0d213715a8d14 Mon Sep 17 00:00:00 2001
From: Alexander Rosenberg <zanderpkg@pm.me>
Date: Tue, 21 Nov 2023 04:04:09 -0800
Subject: [PATCH] Reorganize files

---
 ...t.alexanders-desktop.zsh => early-init.zsh |  3 ---
 init.zsh                                      |  6 ++---
 local/early-init.alexanders-portable.zsh      | 24 -------------------
 3 files changed, 3 insertions(+), 30 deletions(-)
 rename local/early-init.alexanders-desktop.zsh => early-init.zsh (77%)
 delete mode 100644 local/early-init.alexanders-portable.zsh

diff --git a/local/early-init.alexanders-desktop.zsh b/early-init.zsh
similarity index 77%
rename from local/early-init.alexanders-desktop.zsh
rename to early-init.zsh
index 3bb5fb7..876d1c2 100644
--- a/local/early-init.alexanders-desktop.zsh
+++ b/early-init.zsh
@@ -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
diff --git a/init.zsh b/init.zsh
index 47ffb7e..706b621 100644
--- a/init.zsh
+++ b/init.zsh
@@ -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
 
diff --git a/local/early-init.alexanders-portable.zsh b/local/early-init.alexanders-portable.zsh
deleted file mode 100644
index 1510277..0000000
--- a/local/early-init.alexanders-portable.zsh
+++ /dev/null
@@ -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