aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-x[-rw-r--r--]bashrc0
-rwxr-xr-x[-rw-r--r--]xinitrc31
2 files changed, 17 insertions, 14 deletions
diff --git a/bashrc b/bashrc
index 76343a9..76343a9 100644..100755
--- a/bashrc
+++ b/bashrc
diff --git a/xinitrc b/xinitrc
index e2ef55a..5cd03e3 100644..100755
--- a/xinitrc
+++ b/xinitrc
@@ -8,27 +8,24 @@ if [ -d /etc/X11/xinit/xinitrc.d ]; then
unset f
fi
+source $HOME/.config/shell/vars
#--- Settings
-# Make sure display is set
-systemctl --user import-environment DISPLAY
-
# turn off trackpad
-#xinput --disable 11
-xinput set-prop 11 172 0
-
-# X220 internal mic is crap
-# so use noise reduction filter
-pactl set-default-source rnnoise_source
+#xinput set-prop 11 172 0
+xinput --disable 11
#--- Services
+# start user services
+dinit -q &
+
# automount usb drives to /media with udev rule
udiskie &
# clipboard manager
-#clipmenud &
+clipmenud &
# pretty windows
picom -b &
@@ -36,9 +33,14 @@ picom -b &
# pretty screen
xscreensaver --no-splash &
+#
+~/.fehbg &
+
# pywal16 color theme matches wallpaper
wal -Rq
+xrdb ~/.Xresources &
+
# notification daemon
launch-dunst &
@@ -48,8 +50,9 @@ launch-dunst &
#conky -c .config/conky/conkyrc &
# status bar dwmblocks-async
-dwmblocks &
+/usr/local/bin/dwmblocks &
+
+# window manager
+# if dwm exits 0, restart -- this allows hot reloading of config.h
+while type dwm >/dev/null ; do dwm && continue || break ; done
-while true ; do
- /usr/local/bin/dwm 2> /dev/null
-done