move all xrelated settings to startdwm script

3 files changed, 9 insertions, 14 deletions

diff --git a/dotfiles/system/.local/bin/startdwm b/dotfiles/system/.local/bin/startdwm
index 68d7c91..57b3e5c 100755
--- a/dotfiles/system/.local/bin/startdwm
+++ b/dotfiles/system/.local/bin/startdwm
@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 # Craig Jennings <c@cjennings.net>
+
 # starts the dwm process for a login manager
 # saves the logfile of any output to a logfile
 
@@ -12,8 +13,12 @@ if ! [ -d "$logdir" ]; then
     mkdir -p "$logdir"
 fi
 
+# X Org
+export XAUTHORITY=$HOME/.Xauthority
+export DISPLAY=:0.0
+
 # allow sudo use of display
-xhost si:localuser:root
+xhost +si:localuser:root
 
 # merge local configuration for X client aplications
 [ -f ~/.Xresources ] && xrdb -merge -I $HOME ~/.Xresources
@@ -27,6 +32,9 @@ xhost si:localuser:root
 # make short-pressed Ctrl behave like Escape
 xcape -e 'Control_L=Escape' &
 
+# make CapsLock behave like Ctrl:
+setxkbmap -option ctrl:nocaps
+
 xautolock -time 5 -locker slock &
 # picom &
 sxhkd &
diff --git a/dotfiles/system/.profile b/dotfiles/system/.profile
index 94b4993..0a67605 100644
--- a/dotfiles/system/.profile
+++ b/dotfiles/system/.profile
@@ -11,10 +11,6 @@ fi
 ## ENVIRONMENT VARIABLES
 ##
 
-# X Org
-export XAUTHORITY=$HOME/.Xauthority
-export DISPLAY=:0
-
 # Locale
 export LANG=en_US.UTF-8
 export LANGUAGE=en_US.UTF-8
diff --git a/dotfiles/system/.profile.d/capslock.sh b/dotfiles/system/.profile.d/capslock.sh
deleted file mode 100644
index 1754225..0000000
--- a/dotfiles/system/.profile.d/capslock.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-# capslock.sh
-# Craig Jennings <c@cjennings.net>
-# remap capslock for control
-
-# make CapsLock behave like Ctrl:
-setxkbmap -option ctrl:nocaps
-