Merge remote-tracking branch 'origin/master' into clacla

7 files changed, 29 insertions, 51 deletions

diff --git a/X11/xinitrc b/X11/xinitrc
index 534bfc6..e949fbc 100755
--- a/X11/xinitrc
+++ b/X11/xinitrc
@@ -1,5 +1,10 @@
 #!/bin/sh
 [ -x ~/.screenlayout/layout.sh ] && ~/.screenlayout/layout.sh
+xwallpaper --zoom ~/Pictures/background.png &
+picom &
 setxkbmap -option "caps:escape" &
-xrdb ~/.Xresources
-exec awesome
+systemctl --user start dunst &
+sxhkd &
+xss-lock slockd &
+xrdb ~/.config/X11/xresources
+exec dwm
diff --git a/X11/xresources b/X11/xresources
index 7d2525a..2624d72 100644
--- a/X11/xresources
+++ b/X11/xresources
@@ -1,6 +1,13 @@
 !! dmenu
 
-dmenu.font: JetBrainsMono Nerd Font:size=24
+dmenu.font: JetBrainsMono Nerd Font:size=15
+
+dmenu.selbackground: #198844
+dmenu.selforeground: #000000
+dmenu.hibackground: #000000
+dmenu.hiforeground: #39c1ed
+dmenu.selhibackground: #198844
+dmenu.selhiforeground: #39c1ed
 
 !! dwm
 
@@ -413,54 +420,11 @@ rofi.color-window: #1d1f21,     #101010, #000000
 ! "Accept hovered row with custom action" Set from: Default
 ! rofi.me-accept-custom:               Control+MouseDPrimary
 
-!! special
-!*.foreground:   #c5c8c6
-!*.background:   #1d1f21
-!*.cursorColor:  #c5c8c6
-!
-!! black
-!*.color0:       #282a2e
-!*.color8:       #373b41
-!
-!! red
-!*.color1:       #a54242
-!*.color9:       #cc6666
-!
-!! green
-!*.color2:       #8c9440
-!*.color10:      #b5bd68
-!
-!! yellow
-!*.color3:       #de935f
-!*.color11:      #f0c674
-!
-!! blue
-!*.color4:       #5f819d
-!*.color12:      #81a2be
-!
-!! magenta
-!*.color5:       #85678f
-!*.color13:      #b294bb
-!
-!! cyan
-!*.color6:       #5e8d87
-!*.color14:      #8abeb7
-!
-!! white
-!*.color7:       #707880
-!*.color15:      #c5c8c6
-!
-!! special
+! special
 *.foreground:   #c5c8c6
 *.background:   #000000
 *.cursorColor:  #c5c8c6
 *.reverseCursor: #333536
-dmenu.selbackground: #39c1ed
-dmenu.selforeground: #000000
-dmenu.hibackground: #000000
-dmenu.hiforeground: #198844
-dmenu.selhibackground: #39c1ed
-dmenu.selhiforeground: #198844
 
 ! black
 *.color0:       #1b1d1c
diff --git a/X11/xserverrc b/X11/xserverrc
new file mode 100755
index 0000000..c96ab6d
--- /dev/null
+++ b/X11/xserverrc
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec /usr/bin/Xorg -nolisten tcp "$@" vt$XDG_VTNR
diff --git a/dwm/autostart.sh b/dwm/autostart.sh
new file mode 100755
index 0000000..07f82d1
--- /dev/null
+++ b/dwm/autostart.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+pgrep -x slstatus || slstatus
diff --git a/mpd/mpd.conf b/mpd/mpd.conf
index 755f1c8..6fdf1b0 100644
--- a/mpd/mpd.conf
+++ b/mpd/mpd.conf
@@ -79,7 +79,7 @@ sticker_file			"~/.config/mpd/sticker.sql"
 # systemd socket activiation is in use.
 #
 # For network
-# bind_to_address		"127.0.0.1"
+bind_to_address		"127.0.0.1"
 #
 # And for Unix Socket
 bind_to_address		"~/.config/mpd/socket"
diff --git a/sh/profile b/sh/profile
index 3f5ac0e..845b559 100644
--- a/sh/profile
+++ b/sh/profile
@@ -49,7 +49,7 @@ export NOTMUCH_CONFIG="$XDG_CONFIG_HOME"/notmuch/notmuchrc
 export NMBGIT="$XDG_DATA_HOME"/notmuch/nmbug
 export WINEROOT="$XDG_DATA_HOME"/wineprefixes
 export WINEPREFIX="$WINEROOT"/default
-export MPD_HOST="$XDG_CONFIG_HOME/mpd/socket"
+export MPD_HOST="127.0.0.1"
 export GTK2_RC_FILES="$XDG_CONFIG_HOME"/gtk-2.0/gtkrc
 export RENPY_PATH_TO_SAVES="$XDG_DATA_HOME"
 export XINITRC="$XDG_CONFIG_HOME"/X11/xinitrc
diff --git a/sxhkd/sxhkdrc b/sxhkd/sxhkdrc
index 96ca393..125f8fe 100755
--- a/sxhkd/sxhkdrc
+++ b/sxhkd/sxhkdrc
@@ -12,11 +12,15 @@ super + Escape
 
 # program launcher
 super + d
-        dmenu_run -i -l 15 -h 36 -fn 'JetBrainsMono Nerd Font' -nb '#000' -nf '#c5c8c6' -sb '#198844' -sf '#000'
+        dmenu_run -l 15
 
 # desktop application launcher
+super + e
+        j4-dmenu-desktop --dmenu="dmenu -l 15"
+
+# dmenu prompt to restart programs
 super + r
-        j4-dmenu-desktop --dmenu="dmenu -i -l 15 -h 36 -fn 'JetBrainsMono Nerd Font' -nb '#000' -nf '#c5c8c6' -sb '#198844' -sf '#000'"
+        rs
 
 # dmenu prompt for recording
 super + control + r