summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.config/user-dirs.dirs2
-rw-r--r--.xinitrc22
-rwxr-xr-xprograms/my_scripts/set_dwm_status_bar.sh5
3 files changed, 15 insertions, 14 deletions
diff --git a/.config/user-dirs.dirs b/.config/user-dirs.dirs
index 344d2dcd..12d8d297 100644
--- a/.config/user-dirs.dirs
+++ b/.config/user-dirs.dirs
@@ -5,7 +5,7 @@
# homedir-relative path, or XDG_xxx_DIR="/yyy", where /yyy is an
# absolute path. No other format is supported.
-XDG_DESKTOP_DIR="$HOME"
+XDG_DESKTOP_DIR="$HOME/desktop"
XDG_DOWNLOAD_DIR="$HOME/downloads"
XDG_TEMPLATES_DIR="$HOME"
XDG_PUBLICSHARE_DIR="$HOME"
diff --git a/.xinitrc b/.xinitrc
index cc64533c..364a097a 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -8,35 +8,39 @@ sysmodmap=/etc/X11/xinit/.Xmodmap
# merge in defaults and keymaps
if [ -f $sysresources ]; then
- xrdb -merge $sysresources
+ xrdb -merge $sysresources
fi
if [ -f $sysmodmap ]; then
- xmodmap $sysmodmap
+ xmodmap $sysmodmap
fi
if [ -f "$userresources" ]; then
- xrdb -merge "$userresources"
+ xrdb -merge "$userresources"
fi
if [ -f "$usermodmap" ]; then
- xmodmap "$usermodmap"
+ xmodmap "$usermodmap"
fi
# start some nice programs
if [ -d /etc/X11/xinit/xinitrc.d ] ; then
- for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do
- [ -x "$f" ] && . "$f"
- done
- unset f
+ for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do
+ [ -x "$f" ] && . "$f"
+ done
+ unset f
fi
export GTK_IM_MODULE=fcitx
export QT_IM_MODULE=fcitx
export XMODIFIERS=@im=fcitx
-$HOME/programs/my_scripts/set_dwm_status_bar.sh &
+while true; do
+ $HOME/programs/my_scripts/set_dwm_status_bar.sh
+ sleep 1
+done &
+
dunst &
fcitx5 -d &
redshift &
diff --git a/programs/my_scripts/set_dwm_status_bar.sh b/programs/my_scripts/set_dwm_status_bar.sh
index a3845d20..035adff4 100755
--- a/programs/my_scripts/set_dwm_status_bar.sh
+++ b/programs/my_scripts/set_dwm_status_bar.sh
@@ -1,9 +1,6 @@
-while true; do
- xsetroot -name "$(date "+%a %m/%d %H:%M") \
+xsetroot -name "$(date "+%a %m/%d %H:%M") \
| $(if xset q | grep -q "Caps Lock: *on"; then echo A; else echo a; fi) \
| $(cat /sys/class/net/wlp6s0/operstate) \
| $(free -h | awk '(NR==2){ print $4 }') \
| $(sed 's/000$/°C/' /sys/class/thermal/thermal_zone0/temp) \
| $(cat /sys/class/power_supply/BAT1/capacity)%"
- sleep 1
-done