mirror of
https://gitlab.com/dwt1/dotfiles.git
synced 2026-04-19 13:46:17 +10:00
Merge branch 'master' into 'master'
XDG Complaint XMonad See merge request dwt1/dotfiles!67
This commit is contained in:
14
.bashrc
14
.bashrc
@@ -51,6 +51,20 @@ if [ -d "$HOME/Applications" ] ;
|
|||||||
then PATH="$HOME/Applications:$PATH"
|
then PATH="$HOME/Applications:$PATH"
|
||||||
fi
|
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
|
### CHANGE TITLE OF TERMINALS
|
||||||
case ${TERM} in
|
case ${TERM} in
|
||||||
xterm*|rxvt*|Eterm*|aterm|kterm|gnome*|alacritty|st|konsole*)
|
xterm*|rxvt*|Eterm*|aterm|kterm|gnome*|alacritty|st|konsole*)
|
||||||
|
|||||||
@@ -683,7 +683,7 @@ main = do
|
|||||||
xmproc1 <- spawnPipe ("xmobar -x 1 $HOME/.config/xmobar/" ++ colorScheme ++ "-xmobarrc")
|
xmproc1 <- spawnPipe ("xmobar -x 1 $HOME/.config/xmobar/" ++ colorScheme ++ "-xmobarrc")
|
||||||
xmproc2 <- spawnPipe ("xmobar -x 2 $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!
|
-- 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
|
{ manageHook = myManageHook <+> manageDocks
|
||||||
--, handleEventHook = docks
|
--, handleEventHook = docks
|
||||||
-- Uncomment this line to enable fullscreen support on things like YouTube/Netflix.
|
-- Uncomment this line to enable fullscreen support on things like YouTube/Netflix.
|
||||||
14
.zshrc
14
.zshrc
@@ -43,6 +43,20 @@ if [ -d "$HOME/Applications" ] ;
|
|||||||
then PATH="$HOME/Applications:$PATH"
|
then PATH="$HOME/Applications:$PATH"
|
||||||
fi
|
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
|
### CHANGE TITLE OF TERMINALS
|
||||||
case ${TERM} in
|
case ${TERM} in
|
||||||
xterm*|rxvt*|Eterm*|aterm|kterm|gnome*|alacritty|st|konsole*)
|
xterm*|rxvt*|Eterm*|aterm|kterm|gnome*|alacritty|st|konsole*)
|
||||||
|
|||||||
Reference in New Issue
Block a user