diff --git a/.bashrc b/.bashrc index 8931dce..1e69673 100644 --- a/.bashrc +++ b/.bashrc @@ -51,6 +51,20 @@ if [ -d "$HOME/Applications" ] ; then PATH="$HOME/Applications:$PATH" fi +### SETTING OTHER ENVIRONMENT VARIABLES +if [ -z "$XDG_CONFIG_HOME" ] ; then + export XDG_CONFIG_HOME="$HOME/.config" +fi +if [ -z "$XDG_DATA_HOME" ] ; then + export XDG_DATA_HOME="$HOME/.local/share" +fi +if [ -z "$XDG_CACHE_HOME" ] ; then + export XDG_CACHE_HOME="$HOME/.cache" +fi +export XMONAD_CONFIG_DIR="${XDG_CONFIG_HOME:-$HOME/.config}/xmonad" # xmonad.hs is expected to stay here +export XMONAD_DATA_DIR="${XDG_DATA_HOME:-$HOME/.local/share}/xmonad" +export XMONAD_CACHE_DIR="${XDG_CACHE_HOME:-$HOME/.cache}/xmonad" + ### CHANGE TITLE OF TERMINALS case ${TERM} in xterm*|rxvt*|Eterm*|aterm|kterm|gnome*|alacritty|st|konsole*) diff --git a/.xmonad/README.org b/.config/xmonad/README.org similarity index 100% rename from .xmonad/README.org rename to .config/xmonad/README.org diff --git a/.xmonad/lib/Colors/DoomOne.hs b/.config/xmonad/lib/Colors/DoomOne.hs similarity index 100% rename from .xmonad/lib/Colors/DoomOne.hs rename to .config/xmonad/lib/Colors/DoomOne.hs diff --git a/.xmonad/lib/Colors/Dracula.hs b/.config/xmonad/lib/Colors/Dracula.hs similarity index 100% rename from .xmonad/lib/Colors/Dracula.hs rename to .config/xmonad/lib/Colors/Dracula.hs diff --git a/.xmonad/lib/Colors/GruvboxDark.hs b/.config/xmonad/lib/Colors/GruvboxDark.hs similarity index 100% rename from .xmonad/lib/Colors/GruvboxDark.hs rename to .config/xmonad/lib/Colors/GruvboxDark.hs diff --git a/.xmonad/lib/Colors/MonokaiPro.hs b/.config/xmonad/lib/Colors/MonokaiPro.hs similarity index 100% rename from .xmonad/lib/Colors/MonokaiPro.hs rename to .config/xmonad/lib/Colors/MonokaiPro.hs diff --git a/.xmonad/lib/Colors/Nord.hs b/.config/xmonad/lib/Colors/Nord.hs similarity index 100% rename from .xmonad/lib/Colors/Nord.hs rename to .config/xmonad/lib/Colors/Nord.hs diff --git a/.xmonad/lib/Colors/OceanicNext.hs b/.config/xmonad/lib/Colors/OceanicNext.hs similarity index 100% rename from .xmonad/lib/Colors/OceanicNext.hs rename to .config/xmonad/lib/Colors/OceanicNext.hs diff --git a/.xmonad/lib/Colors/Palenight.hs b/.config/xmonad/lib/Colors/Palenight.hs similarity index 100% rename from .xmonad/lib/Colors/Palenight.hs rename to .config/xmonad/lib/Colors/Palenight.hs diff --git a/.xmonad/lib/Colors/SolarizedDark.hs b/.config/xmonad/lib/Colors/SolarizedDark.hs similarity index 100% rename from .xmonad/lib/Colors/SolarizedDark.hs rename to .config/xmonad/lib/Colors/SolarizedDark.hs diff --git a/.xmonad/lib/Colors/SolarizedLight.hs b/.config/xmonad/lib/Colors/SolarizedLight.hs similarity index 100% rename from .xmonad/lib/Colors/SolarizedLight.hs rename to .config/xmonad/lib/Colors/SolarizedLight.hs diff --git a/.xmonad/lib/Colors/TomorrowNight.hs b/.config/xmonad/lib/Colors/TomorrowNight.hs similarity index 100% rename from .xmonad/lib/Colors/TomorrowNight.hs rename to .config/xmonad/lib/Colors/TomorrowNight.hs diff --git a/.xmonad/pacman-hooks/recompile-xmonad.hook b/.config/xmonad/pacman-hooks/recompile-xmonad.hook similarity index 100% rename from .xmonad/pacman-hooks/recompile-xmonad.hook rename to .config/xmonad/pacman-hooks/recompile-xmonad.hook diff --git a/.xmonad/pacman-hooks/recompile-xmonadh.hook b/.config/xmonad/pacman-hooks/recompile-xmonadh.hook similarity index 100% rename from .xmonad/pacman-hooks/recompile-xmonadh.hook rename to .config/xmonad/pacman-hooks/recompile-xmonadh.hook diff --git a/.xmonad/xmonad-example-configs/xmonad-example-polybar-treeselect-workspaces.hs b/.config/xmonad/xmonad-example-configs/xmonad-example-polybar-treeselect-workspaces.hs similarity index 100% rename from .xmonad/xmonad-example-configs/xmonad-example-polybar-treeselect-workspaces.hs rename to .config/xmonad/xmonad-example-configs/xmonad-example-polybar-treeselect-workspaces.hs diff --git a/.xmonad/xmonad-example-configs/xmonad-example-xmobar-clickable-workspaces.hs b/.config/xmonad/xmonad-example-configs/xmonad-example-xmobar-clickable-workspaces.hs similarity index 100% rename from .xmonad/xmonad-example-configs/xmonad-example-xmobar-clickable-workspaces.hs rename to .config/xmonad/xmonad-example-configs/xmonad-example-xmobar-clickable-workspaces.hs diff --git a/.xmonad/xmonad-example-configs/xmonad-example-xmobar-non-clickable.hs b/.config/xmonad/xmonad-example-configs/xmonad-example-xmobar-non-clickable.hs similarity index 100% rename from .xmonad/xmonad-example-configs/xmonad-example-xmobar-non-clickable.hs rename to .config/xmonad/xmonad-example-configs/xmonad-example-xmobar-non-clickable.hs diff --git a/.xmonad/xmonad-example-configs/xmonad-example-xmobar-treeselect-workspaces.hs b/.config/xmonad/xmonad-example-configs/xmonad-example-xmobar-treeselect-workspaces.hs similarity index 100% rename from .xmonad/xmonad-example-configs/xmonad-example-xmobar-treeselect-workspaces.hs rename to .config/xmonad/xmonad-example-configs/xmonad-example-xmobar-treeselect-workspaces.hs diff --git a/.xmonad/xmonad.hs b/.config/xmonad/xmonad.hs similarity index 99% rename from .xmonad/xmonad.hs rename to .config/xmonad/xmonad.hs index 4f81f36..e8a0d04 100644 --- a/.xmonad/xmonad.hs +++ b/.config/xmonad/xmonad.hs @@ -683,7 +683,7 @@ main = do xmproc1 <- spawnPipe ("xmobar -x 1 $HOME/.config/xmobar/" ++ colorScheme ++ "-xmobarrc") xmproc2 <- spawnPipe ("xmobar -x 2 $HOME/.config/xmobar/" ++ colorScheme ++ "-xmobarrc") -- the xmonad, ya know...what the WM is named after! - xmonad $ addDescrKeys' ((mod4Mask, xK_F1), showKeybindings) myKeys $ ewmh $ docks $ def + xmonad $ addDescrKeys' ((mod4Mask, xK_F1), showKeybindings) myKeys $ ewmh $ ewmhFullscreen $ docks $ def -- Just remove $ ewmhFullscreen if YouTube fullscreen doesn't work { manageHook = myManageHook <+> manageDocks --, handleEventHook = docks -- Uncomment this line to enable fullscreen support on things like YouTube/Netflix. diff --git a/.xmonad/xmonad_keys.sh b/.config/xmonad/xmonad_keys.sh similarity index 100% rename from .xmonad/xmonad_keys.sh rename to .config/xmonad/xmonad_keys.sh diff --git a/.xmonad/xmonadctl.hs b/.config/xmonad/xmonadctl.hs similarity index 100% rename from .xmonad/xmonadctl.hs rename to .config/xmonad/xmonadctl.hs diff --git a/.xmonad/xpm/calendar-clock-icon_20.xpm b/.config/xmonad/xpm/calendar-clock-icon_20.xpm similarity index 100% rename from .xmonad/xpm/calendar-clock-icon_20.xpm rename to .config/xmonad/xpm/calendar-clock-icon_20.xpm diff --git a/.xmonad/xpm/cpu_20.xpm b/.config/xmonad/xpm/cpu_20.xpm similarity index 100% rename from .xmonad/xpm/cpu_20.xpm rename to .config/xmonad/xpm/cpu_20.xpm diff --git a/.xmonad/xpm/harddisk-icon_20.xpm b/.config/xmonad/xpm/harddisk-icon_20.xpm similarity index 100% rename from .xmonad/xpm/harddisk-icon_20.xpm rename to .config/xmonad/xpm/harddisk-icon_20.xpm diff --git a/.xmonad/xpm/haskell_20.xpm b/.config/xmonad/xpm/haskell_20.xpm similarity index 100% rename from .xmonad/xpm/haskell_20.xpm rename to .config/xmonad/xpm/haskell_20.xpm diff --git a/.xmonad/xpm/memory-icon_20.xpm b/.config/xmonad/xpm/memory-icon_20.xpm similarity index 100% rename from .xmonad/xpm/memory-icon_20.xpm rename to .config/xmonad/xpm/memory-icon_20.xpm diff --git a/.xmonad/xpm/net_down_20.xpm b/.config/xmonad/xpm/net_down_20.xpm similarity index 100% rename from .xmonad/xpm/net_down_20.xpm rename to .config/xmonad/xpm/net_down_20.xpm diff --git a/.xmonad/xpm/net_up_20.xpm b/.config/xmonad/xpm/net_up_20.xpm similarity index 100% rename from .xmonad/xpm/net_up_20.xpm rename to .config/xmonad/xpm/net_up_20.xpm diff --git a/.zshrc b/.zshrc index b1c6ca8..602d08c 100644 --- a/.zshrc +++ b/.zshrc @@ -43,6 +43,20 @@ if [ -d "$HOME/Applications" ] ; then PATH="$HOME/Applications:$PATH" fi +### SETTING OTHER ENVIRONMENT VARIABLES +if [ -z "$XDG_CONFIG_HOME" ] ; then + export XDG_CONFIG_HOME="$HOME/.config" +fi +if [ -z "$XDG_DATA_HOME" ] ; then + export XDG_DATA_HOME="$HOME/.local/share" +fi +if [ -z "$XDG_CACHE_HOME" ] ; then + export XDG_CACHE_HOME="$HOME/.cache" +fi +export XMONAD_CONFIG_DIR="${XDG_CONFIG_HOME:-$HOME/.config}/xmonad" # xmonad.hs is expected to stay here +export XMONAD_DATA_DIR="${XDG_DATA_HOME:-$HOME/.local/share}/xmonad" +export XMONAD_CACHE_DIR="${XDG_CACHE_HOME:-$HOME/.cache}/xmonad" + ### CHANGE TITLE OF TERMINALS case ${TERM} in xterm*|rxvt*|Eterm*|aterm|kterm|gnome*|alacritty|st|konsole*)