commit 0512d7e6ee62a8e121b6721be7c58d6f4a1c40b0
parent cfc538d37cbc44693df1384046c48e5e41010846
Author: Oscar Benedito <oscar@oscarbenedito.com>
Date:   Wed, 12 May 2021 21:22:32 +0200

Use xinitrc instead of autostart

Diffstat:

A.config/xinitrc | 18++++++++++++++++++


D.local/share/dwm/autostart.sh | 25-------------------------


M.profile | 3+--


3 files changed, 19 insertions(+), 27 deletions(-)

diff --git a/.config/xinitrc b/.config/xinitrc
@@ -0,0 +1,18 @@
+/home/oscar/.local/bin/configure-monitors
+xrdb ~/.config/Xresources
+xwallpaper --zoom "${XDG_DATA_HOME:-$HOME/.local/share}/dwm/wallpaper.png" &
+xautolock -detectsleep -corners 0-00 -time 5 \
+    -locker "slock" \
+    -notify 30 \
+    -notifier "notify-send -u critical -t 10000 'Locking screen in 30 seconds'" &
+pulseaudio --start --exit-idle-time=-1
+dunst &
+setxkbmap -option 'caps:super' &    # use caps as super
+xcape -e 'Super_L=Escape' &         # tap caps for escape (hold down for super)
+xsetroot -name " $(date +"%a %d %b, %H:%M")" &
+dwmblocks &
+nm-applet &
+
+exec dwm
+
+# vim: ft=sh
diff --git a/.local/share/dwm/autostart.sh b/.local/share/dwm/autostart.sh
@@ -1,25 +0,0 @@
-#!/bin/sh
-
-xautolock -detectsleep -corners 0-00 -time 5 \
-  -locker "slock" \
-  -notify 30 \
-  -notifier "notify-send -u critical -t 10000 'Locking screen in 30 seconds'" &
-
-# set wallpaper
-xwallpaper --zoom "${XDG_DATA_HOME:-$HOME/.local/share}/dwm/wallpaper.png" &
-
-# use caps as super
-setxkbmap -option 'caps:super' &
-
-# tap caps for escape (hold down for super)
-xcape -e 'Super_L=Escape' &
-
-# activate num lock
-numlockx &
-
-# configure monitors
-$HOME/.local/bin/configure-monitors &
-
-xsetroot -name " $(date +"%a %d %b, %H:%M")" &
-dwmblocks &
-nm-applet &
diff --git a/.profile b/.profile
@@ -1,7 +1,5 @@
 # vim: filetype=zsh
 
-xrdb "${XDG_CONFIG_HOME:-$HOME/.config}/Xresources" &
-
 # Local bin to path
 [ -d "$HOME/.local/bin" ] && \
   export PATH="$PATH:$(du "$HOME/.local/bin/" | cut -f2 | sed 's/\/$//g' | paste -sd ':')"
@@ -23,6 +21,7 @@ export GTK2_RC_FILES="$XDG_CONFIG_HOME"/gtk-2.0/gtkrc
 export ICEAUTHORITY="$XDG_CACHE_HOME/ICEauthority"
 export RXVT_SOCKET="$XDG_RUNTIME_DIR/urxvtd"
 export LESSHISTFILE="-"
+export XINITRC="$XDG_CONFIG_HOME/xinitrc"
 
 # Environment variables
 export VISUAL="nvim"