1

3 files changed, 29 insertions, 61 deletions

diff --git a/x11/.Xresources b/x11/.Xresources
deleted file mode 100644
index c449eb6..0000000
--- a/x11/.Xresources
+++ /dev/null
@@ -1,36 +0,0 @@
-! special
-*.foreground:   #e1a15b
-*.background:   #0e0a05
-*.cursorColor:  #e1a15b
-
-! black
-*.color0:       #222222
-*.color8:       #000000
-
-! red
-*.color1:       #e75c58
-*.color9:       #b22b31
-
-! green
-*.color2:       #00b800
-*.color10:      #008100
-
-! yellow
-*.color3:       #ebeb00
-*.color11:      #d3d300
-
-! blue
-*.color4:       #0082ff
-*.color12:      #0061c3
-
-! magenta
-*.color5:       #d160c4
-*.color13:      #a03196
-
-! cyan
-*.color6:       #009393
-*.color14:      #007e7e
-
-! white
-*.color7:       #d2d2d2
-*.color15:      #787878
diff --git a/x11/.config/x11/xprofile b/x11/.config/x11/xprofile
index a746216..da3bf16 100644
--- a/x11/.config/x11/xprofile
+++ b/x11/.config/x11/xprofile
@@ -1,33 +1,37 @@
-#!/bin/sh
+#!/bin/bash
 
 # This file runs when a DM logs you into a graphical session.
 # If you use startx/xinit like a Chad, this file will also be sourced.
-  "xrdb ${XDG_CACHE_HOME:-$HOME/.cache}/wal/colors.Xresources"
 
 autostart=(
-  "xrandr --dpi 96"
-  "xrdb $HOME/.Xresources"
-  "$HOME/.local/bin/setbg"
-  "$HOME/.local/bin/remaps"
-  "picom"
-  "mpd"
-  "dunst"
-  "unclutter"
-  "dwmblocks"
-  "gentoo-pipewire-launcher"
-  "syncthing --no-browser"
-  "redshift -l40:2")
-
-for program in "${autostart[@]}" ; do
-  pidof -s "${program%% *}" || setsid -f $program
-done >$XDG_CACHE_HOME/xprofile.errors 2>&1
-
-if [ -x /usr/bin/gpg-agent ]; then
-  eval "$(/usr/bin/gpg-agent --daemon)"
-fi
+	"xrdb $HOME/.Xresources"
+	"$HOME/.local/bin/setbg"
+	"$HOME/.local/bin/remaps"
+	"xcompmgr"
+	"mpd"
+	"dunst"
+	"unclutter"
+	"gentoo-pipewire-launcher"
+	"syncthing --no-browser"
+	"dwmblocks"
+	"redshift -l40:2")
+
+	for program in "${autostart[@]}" ; do
+		pidof -s "${program%% *}" || setsid -f $program
+	done >$XDG_CACHE_HOME/xprofile.errors 2>&1
+
+	if [ -x /usr/bin/gpg-agent ]; then
+		eval "$(/usr/bin/gpg-agent --daemon)"
+	fi
+
+# generate .Xresources
+$HOME/.local/bin/genxresources > $HOME/.Xresources
 
 # generate zathura config with colors from .Xresources
 mkdir -pv $HOME/.config/zathura && $HOME/.local/bin/genzathurarc > $HOME/.config/zathura/zathurarc
 
+# and dunst too
+mkdir -pv $HOME/.config/dunst && $HOME/.local/bin/gendunstrc > $HOME/.config/dunst/dunstrc
+
 # Ensure that xrdb has finished running before moving on to start the WM/DE.
 [ -n "$xrdbpid" ] && wait "$xrdbpid"
diff --git a/x11/.xinitrc b/x11/.xinitrc
index 6134ca3..57be318 100755
--- a/x11/.xinitrc
+++ b/x11/.xinitrc
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # xinitrc runs automatically when you run startx.
 
@@ -9,9 +9,9 @@
 # I source them here with the line below.
 
 if [ -f "${XDG_CONFIG_HOME:-$HOME/.config}/x11/xprofile" ]; then
-  . "${XDG_CONFIG_HOME:-$HOME/.config}/x11/xprofile"
+	. "${XDG_CONFIG_HOME:-$HOME/.config}/x11/xprofile"
 else
-  . "$HOME/.xprofile"
+	. "$HOME/.xprofile"
 fi
 
 ssh-agent "$(which dwm)"