aboutsummaryrefslogtreecommitdiff
path: root/x
diff options
context:
space:
mode:
Diffstat (limited to 'x')
-rw-r--r--x/.xinitrc26
1 files changed, 14 insertions, 12 deletions
diff --git a/x/.xinitrc b/x/.xinitrc
index 85323f7..f81a47c 100644
--- a/x/.xinitrc
+++ b/x/.xinitrc
@@ -1,8 +1,4 @@
#!/bin/sh
-# executed by startx-not-docked
-# for use when dingo is NOT docked
-export DOCKED=false
-
# load xinitrc.d stuff
userresources=$HOME/.Xresources
@@ -43,20 +39,19 @@ fi
# start picom compositor
picom --config ~/.config/picom.conf &
-#spotifyd &
-
# add network, battery, date and time to xsetroot
-slstatus &
+# slstatus &
# reset backlight
-light -S 30 &
+# light -S 30 &
# set default audio device to be laptop speakers
# pacmd set-default-sink alsa_output.pci-0000_03_00.6.HiFi__hw_Generic_1__sink &
# pacmd set-sink-volume alsa_output.pci-0000_03_00.6.HiFi__hw_Generic_1__sink 0 &
# set up wallpaper
-feh --bg-fill ~/Pictures/Wallpapers/solid-gruvbox.png &
+feh --bg-fill ~/Pictures/Wallpapers/solid-gruvbox-2.png &
+# sleep 1 && feh --bg-fill ~/Pictures/Wallpapers/solid-gruvbox-2.png &
# apply Xresources
xrdb -merge ~/.Xresources
@@ -65,7 +60,7 @@ xrdb -merge ~/.Xresources
xbanish &
# turn tearfree on
-xrandr --output eDP --auto --set TearFree on --output HDMI-A-0 --set TearFree on &
+xrandr --output eDP --auto & #--set TearFree on --output HDMI-A-0 --set TearFree on &
# run battery checker
~/bin/battery &
@@ -73,6 +68,9 @@ xrandr --output eDP --auto --set TearFree on --output HDMI-A-0 --set TearFree on
# start keepassxc for passwords
keepassxc ~/.passwords/Passwords.kdbx &
+# start emacs daemon
+emacs --daemon &
+
# if logitech keyboard detected, turn alt into super
if $(lsusb | grep -qi "Logitech Mechanical Keyboard"); then
xmodmap -e "remove mod1 = Alt_L"
@@ -81,9 +79,13 @@ if $(lsusb | grep -qi "Logitech Mechanical Keyboard"); then
xmodmap -e "add mod4 = Alt_L"
fi
-# start dwm
+# lock screen and suspend after 20 minutes of inactivity
+xautolock -time 20 -locker slock -secure &
+
+# start xmonad
redshift &
xmobar &
xset r rate 300 80
-#exec /home/bryson/bin/startdwm
+# exec /home/bryson/bin/startdwm
exec $HOME/.cache/xmonad/xmonad-x86_64-linux
+# exec qtile start