Merge branch 'master' into cla

10 files changed, 23 insertions, 9 deletions

diff --git a/.gitignore b/.gitignore
index 76e77d4..522e3d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -61,6 +61,7 @@ galculator/
 gamescope/
 ghb/
 GIMP/
+git/
 glib-2.0/
 gnome-control-center/
 gnome-initial-setup-done
@@ -222,6 +223,7 @@ solaar/
 spotifyd/
 spotify-tui/
 straw-viewer/
+subversion/
 SUPERHOT/
 switcher/
 syncthing/
@@ -248,6 +250,8 @@ unity3d/
 Valve Corporation/
 vdirsyncer/
 VeraCrypt/
+vim/
+!vim/vimrc
 VirtualBox/
 vlc/vlc-qt-interface.conf
 waybar/config-dwl-*
diff --git a/X11/Xresources b/X11/xresources
index d5c4550..d5c4550 100644
--- a/X11/Xresources
+++ b/X11/xresources
diff --git a/autostart.sh b/autostart.sh
index 311953f..3616220 100755
--- a/autostart.sh
+++ b/autostart.sh
@@ -25,7 +25,7 @@ if [ -n "${WAYLAND_DISPLAY}${DISPLAY}" ]; then
   import-gsettings gtk-theme 'Flat-Remix-GTK-Green-Darkest-Solid'
   import-gsettings icon-theme 'Mint-X-Grey'
   import-gsettings cursor-theme 'Adwaita'
-  xrdb ~/.Xresources
+  xrdb "$XDG_CONFIG_HOME/X11/xresources"
 fi
 
 [ -x "$XDG_CONFIG_HOME/computerrc.sh" ] && "$XDG_CONFIG_HOME/computerrc.sh"
diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf
index 76d647e..4824e6f 100644
--- a/hypr/hyprland.conf
+++ b/hypr/hyprland.conf
@@ -21,7 +21,7 @@ exec-once = systemctl --user start dunst
 exec-once = import-gsettings gtk-theme 'Flat-Remix-GTK-Green-Darkest-Solid'
 exec-once = import-gsettings icon-theme 'Mint-X-Grey'
 exec-once = import-gsettings cursor-theme 'Breeze'
-exec-once = xrdb ~/.Xresources
+exec-once = xrdb -load "$XDG_CONFIG_HOME"/X11/xresources
 exec-once = com.github.wwmm.easyeffects
 exec-once = mpd
 exec-once = systemctl --user import-environment DISPLAY
@@ -31,9 +31,9 @@ exec-once = systemctl --user import-environment WAYLAND_DISPLAY
 #{{{ env
 # Environment variables set at launch
 env = HYPRCURSOR_THEME,BreezeHypr
-env = HYPRCURSOR_SIZE,36
+env = HYPRCURSOR_SIZE,32
 env = XCURSOR_THEME,BreezeX-Black
-env = XCURSOR_SIZE,36
+env = XCURSOR_SIZE,32
 #}}}
 
 # Source a file (multi-file configs)
diff --git a/qt5ct/qt5ct.conf b/qt5ct/qt5ct.conf
index bf4c0e0..516eaab 100644
--- a/qt5ct/qt5ct.conf
+++ b/qt5ct/qt5ct.conf
@@ -2,7 +2,7 @@
 color_scheme_path=/usr/share/qt5ct/colors/darker.conf
 custom_palette=false
 icon_theme=Mint-X-Grey
-standard_dialogs=gtk2
+standard_dialogs=xdgdesktopportal
 style=gtk2
 
 [Fonts]
diff --git a/qt6ct/qt6ct.conf b/qt6ct/qt6ct.conf
index 29cd0a9..810fb94 100644
--- a/qt6ct/qt6ct.conf
+++ b/qt6ct/qt6ct.conf
@@ -2,7 +2,7 @@
 color_scheme_path=/usr/share/qt6ct/colors/airy.conf
 custom_palette=false
 icon_theme=Mint-X
-standard_dialogs=default
+standard_dialogs=xdgdesktopportal
 style=qt6gtk2
 
 [Fonts]
diff --git a/sh/aliases b/sh/aliases
index a930a47..1537161 100644
--- a/sh/aliases
+++ b/sh/aliases
@@ -77,3 +77,6 @@ alias s='sudo systemctl'
 
 ## Runit
 #alias ursm='env SVDIR="$HOME/.local/sv/" rsm'
+
+# XDG dirs fix
+alias svn="svn --config-dir \"$XDG_CONFIG_HOME\"/subversion"
diff --git a/sh/profile b/sh/profile
index e5c38b2..b18500d 100644
--- a/sh/profile
+++ b/sh/profile
@@ -7,6 +7,7 @@ export XDG_CURRENT_DESKTOP="i3"
 export XDG_DOCUMENTS_DIR=${HOME}/Documents
 export XDG_DOWNLOAD_DIR=${HOME}/Downloads
 export XDG_DESKTOP_DIR=${HOME}/Desktop
+export XDG_STATE_HOME="${HOME}/.local/state"
 export XDG_VIDEOS_DIR=${HOME}/Videos
 
 export XDG_DATA_DIRS="${XDG_DATA_DIRS}:$HOME/.nix-profile/share"
@@ -37,6 +38,7 @@ export _JAVA_OPTIONS=-Djava.util.prefs.userRoot="$XDG_CONFIG_HOME"/java
 export GTK2_RC_FILES="$XDG_CONFIG_HOME"/gtk-2.0/gtkrc
 export ZDOTDIR=$HOME/.config/zsh
 export CARGO_HOME="$XDG_DATA_HOME"/cargo
+export RUSTUP_HOME="$XDG_DATA_HOME"/rustup
 export WEECHAT_HOME="$XDG_CONFIG_HOME"/weechat
 export PASSWORD_STORE_DIR="$XDG_DATA_HOME"/pass
 export NOTMUCH_CONFIG="$XDG_CONFIG_HOME"/notmuch/notmuchrc
@@ -44,6 +46,11 @@ export NMBGIT="$XDG_DATA_HOME"/notmuch/nmbug
 export WINEROOT="$XDG_DATA_HOME"/wineprefixes
 export WINEPREFIX="$WINEROOT"/default
 export MPD_HOST="$XDG_CONFIG_HOME/mpd/socket"
+export GTK2_RC_FILES="$XDG_CONFIG_HOME"/gtk-2.0/gtkrc
+export RENPY_PATH_TO_SAVES="$XDG_DATA_HOME"
+export XINITRC="$XDG_CONFIG_HOME"/X11/xinitrc
+export XAUTHORITY="$XDG_RUNTIME_DIR"/X11/Xauthority
+export VIMINIT="set nocp | source ${XDG_CONFIG_HOME:-$HOME.config}/vim/vimrc"
 
 # Scaling
 export QT_AUTO_SCREEN_SCALE_FACTOR=0
diff --git a/xsettingsd/xsettingsd.conf b/xsettingsd/xsettingsd.conf
index 8fa8d9b..27d09c3 100644
--- a/xsettingsd/xsettingsd.conf
+++ b/xsettingsd/xsettingsd.conf
@@ -1,6 +1,6 @@
 Net/ThemeName "Flat-Remix-GTK-Green-Darkest-Solid"
 Net/IconThemeName "Mint-X"
-Gtk/CursorThemeName "Adwaita"
+Gtk/CursorThemeName "BreezeX-Black"
 Net/EnableEventSounds 1
 EnableInputFeedbackSounds 0
 Xft/Antialias 1
diff --git a/zsh/.zshenv b/zsh/.zshenv
index 1740c82..b8c9d48 100644
--- a/zsh/.zshenv
+++ b/zsh/.zshenv
@@ -1,4 +1,4 @@
 # ZSH SPECIFIC CONFIGS
 unset HISTFILE
-[ -f "$HOME/.profile" ] && . "$HOME/.profile"
-export ZDOTDIR=$HOME/.config/zsh
+export XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}"
+[ -f "$XDG_CONFIG_HOME/sh/profile" ] && . "$XDG_CONFIG_HOME/sh/profile"