commit 6b81d7498fa44def726cb2d8e0bafee930f7276b
parent 4a4af4f70cf90a84c590806e8528dc69537b03e8
Author: Matthew Carlson <matt@mcarlson.xyz>
Date: Fri, 23 Jul 2021 22:01:48 -0400
changed colors around and fixed some aliases
Diffstat:
5 files changed, 58 insertions(+), 46 deletions(-)
diff --git a/.config/mutt/muttrc b/.config/mutt/muttrc
@@ -45,6 +45,7 @@ color index_number color4 default
color index_size color4 default
color indicator bold default color4
color markers color4 default
+color normal color6 default
color quoted color4 default
color quoted1 color37 default
color quoted2 color38 default
diff --git a/.config/sh/aliasrc b/.config/sh/aliasrc
@@ -65,8 +65,8 @@ alias dots='/usr/bin/git --git-dir=${HOME}/.dots/ --work-tree=${HOME}'
# youtube
alias \
- yt='youtube-dl -i -o \"${DOWNLOADS_DIR}/%(uploader)s/%(title)s.%(ext)s\" --add-metadata' \
+ yt="youtube-dl -i -o \"${DOWNLOADS_DIR}/%(uploader)s/%(title)s.%(ext)s\" --add-metadata" \
yta='yt -f bestaudio/best -x' \
- ytp='youtube-dl -i -o \"${DOWNLOADS_DIR}/%(uploader)s/%(playlist_index)s-%(title)s.%(ext)s\" --add-metadata' \
+ ytp="youtube-dl -i -o \"${DOWNLOADS_DIR}/%(uploader)s/%(playlist_index)s-%(title)s.%(ext)s\" --add-metadata" \
ytpa='ytp -f bestaudio/best -x' \
ytall='yt -cw -f best'
diff --git a/.config/sh/profile b/.config/sh/profile
@@ -67,7 +67,7 @@ export FFF_COL1=4
export FFF_COL2=4
export FFF_COL3=1
export FFF_COL4=4
-export FFF_COL5=7
+export FFF_COL5=6
export FFF_HIDDEN=1
export FFF_LS_COLORS=1
export FFF_OPENER="xdg-open"
diff --git a/.config/x/xresources b/.config/x/xresources
@@ -1,45 +1,26 @@
! colors
-! #define col0 #282828
-! #define col1 #cc241d
-! #define col2 #98971a
-! #define col3 #d79921
-! #define col4 #458588
-! #define col5 #b16286
-! #define col6 #689d6a
-! #define col7 #a89984
-! #define col8 #928374
-! #define col9 #fb4934
-! #define col10 #b8bb26
-! #define col11 #fabd2f
-! #define col12 #83a598
-! #define col13 #d3869b
-! #define col14 #8ec07c
-! #define col15 #ebdbb2
-
-! colors
-#define col0 #1b1d1e
-#define col1 #ff0044
-#define col2 #82b414
-#define col3 #fd971f
-#define col4 #266c98
-#define col5 #ac0cb1
-#define col6 #ae81ff
-#define col7 #cccccc
-#define col8 #808080
-#define col9 #f92672
-#define col10 #a6e22e
-#define col11 #e6db74
-#define col12 #7070f0
-#define col13 #d63ae1
-#define col14 #66d9ef
+#define col0 #0f1317
+#define col1 #d99433
+#define col2 #3b3c82
+#define col3 #35538f
+#define col4 #465298
+#define col5 #49649e
+#define col6 #aabed4
+#define col7 #768594
+#define col8 #d99433
+#define col9 #d3b555
+#define col10 #3b3c82
+#define col11 #35538f
+#define col12 #465298
+#define col13 #49649e
+#define col14 #aabed4
#define col15 #f8f8f2
! dwm
dwm.font : monospace:size=16
-dwm.font2 : monospace:size=16
dwm.normbgcolor : col0
-dwm.normbordercolor : col7
-dwm.normfgcolor : col7
+dwm.normbordercolor : col0
+dwm.normfgcolor : col6
dwm.selbgcolor : col4
dwm.selbordercolor : col4
dwm.selfgcolor : col15
@@ -65,7 +46,7 @@ dwm.ulineall : 0
! dmenu
dmenu.font : monospace:size=16
-dmenu.normfgcolor : col7
+dmenu.normfgcolor : col6
dmenu.normbgcolor : col0
dmenu.selfgcolor : col15
dmenu.selbgcolor : col4
@@ -77,7 +58,7 @@ dmenu.border_width : 3
! herbe
herbe.background_color : col0
herbe.border_color : col4
-herbe.font_color : col7
+herbe.font_color : col6
herbe.font_pattern : monospace:size=16
herbe.line_spacing : 5
herbe.padding : 5
@@ -95,12 +76,11 @@ slock.failed : col1
slock.caps : col9
slock.failonclear : 1
slock.message : Type password to unlock
-slock.text_color : col7
+slock.text_color : col6
slock.font_name : monospace:size=16
! st
st.font : monospace:size=16
-st.font2 : monospace:size=16
st.color0 : col0
st.color1 : col1
st.color2 : col2
@@ -127,7 +107,7 @@ st.maxlatency : 33
st.blinktimeout : 800
st.bellvolume : 0
st.tabspaces : 8
-st.borderpx : 2
+st.borderpx : 15
st.cwscale : 1.0
st.chscale : 1.0
st.doubleclicktimeout : 300
diff --git a/.local/bin/wp.sh b/.local/bin/wp.sh
@@ -2,7 +2,10 @@
#
# wp
-WP_DIR="${XDG_DATA_HOME:-${HOME}/.local/share}/wp"
+WP="${XDG_DATA_HOME:-${HOME}/.local/share}/wp"
+COLORS="${XDG_CACHE_HOME:-${HOME}/.cache}/wal/colors.sh"
+DEFAULTBG=259
+XRESOURCES="${XDG_CONFIG_HOME:-${HOME}/.config}/x/xresources"
get_rand_file() {
flag=1
@@ -55,7 +58,35 @@ check_file () {
}
wp () {
- feh --no-fehbg --bg-scale "${1}"
+ ln -sf "${file}" "${WP}"
+ feh --no-fehbg --bg-scale "${WP}"
+ command -v wal >/dev/null && theme
+}
+
+theme() {
+ wal -c && wal -i "${WP}"
+ [ -f "${COLORS}" ] && . "${COLORS}"
+
+ set -- ${color0} ${color1} ${color3} ${color4} ${color5} ${color6} ${color7} ${color8} \
+ ${color9} ${color10} ${color11} ${color12} ${color13} ${color14} ${color15}
+
+ i=0
+ for color in "${@}"; do
+ color="$(printf '%s' "${color}" | tr '[:upper:]' '[:lower:]')"
+ sed -i "s/#define col${i} .*/#define col${i} ${color}/" "${XRESOURCES}"
+ i=$((i+1))
+ [ ${i} -eq 16 ] && break
+ done
+
+ xrdb -merge "${XRESOURCES}"
+
+ kill -s USR1 $(pidof st)
+
+ for tty in $(ls /dev/pts/ | egrep -i '[1-9][0-9]*'); do
+ printf "\033]4;${DEFAULTBG};${color0}\007" > "/dev/pts/${tty}" 2>/dev/null
+ done
+
+ dwmc reload
}
{ [ -d "${1}" ] && get_rand_file "${1}" && flag=${?} ; } || { [ -f "${1}" ] && check_file "${1}" && flag=${?} ; }
