diff --git a/.config/foot/foot.ini b/.config/foot/foot.ini deleted file mode 100644 index b46f8f9..0000000 --- a/.config/foot/foot.ini +++ /dev/null @@ -1,36 +0,0 @@ -font=JetBrains Mono:style=Regular:size=9 -font-bold=JetBrains Mono:style=Bold:size=9 -font-italic=JetBrains Mono:style=Italic:size=9 -font-bold-italic=JetBrains Mono:style=Bold Italic:size=9 - -pad=5x5 - -# Selenized black -[cursor] -color = 181818 56d8c9 - -[colors] -background= 181818 -foreground= b9b9b9 -alpha = 0.9 - -regular0= 252525 -regular1= ed4a46 -regular2= 70b433 -regular3= dbb32d -regular4= 368aeb -regular5= eb6eb7 -regular6= 3fc5b7 -regular7= 777777 - -bright0= 3b3b3b -bright1= ff5e56 -bright2= 83c746 -bright3= efc541 -bright4= 4f9cfe -bright5= ff81ca -bright6= 56d8c9 -bright7= dedede - -[scrollback] -lines = 10000 diff --git a/.config/river/colors b/.config/river/colors deleted file mode 100644 index bc3320f..0000000 --- a/.config/river/colors +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh - -# theme="$(cat ~/.theme)" - -# if test "$theme" = dark; then -# # Rose Pine -# export bg=191724 -# export bg2=26233a -# export fg=e0def4 -# export fg2=6e6a86 -# export hl=c4a7e7 -# else -# # Rose Pine Dawn -# export bg=faf4ed -# export bg2=f2e9de -# export fg=575279 -# export fg2=6e6a86 -# export hl=907aa9 -# fi - -# Selenized Black -# https://github.com/jan-warchol/selenized/blob/e93e0d9fb47c7485f18fa16f9bdb70c2ee7fb5db/the-values.md -export bg_0=181818 -export bg_1=252525 -export bg_2=3b3b3b -export dim_0=777777 -export fg_0=b9b9b9 -export fg_1=dedede -export fg_accent=368aeb - -# solarized light -# export bg=fdf6e3 -# export bg2=eee8d5 -# export fg=657b83 -# export fg2=93a1a1 -# export hl=d33682 - -# gruvbox dark -# export bg=282828 -# export bg2=3c3836 -# export fg=ebdbb2 -# export hl=83a598 diff --git a/.config/river/init b/.config/river/init index e5cd87c..fcd4dd7 100755 --- a/.config/river/init +++ b/.config/river/init @@ -19,8 +19,6 @@ riverctl spawn "pgrep -x river-tag-overl || river-tag-overlay --anchors=1:0:0:0" # yambar spawned by load-colors riverctl spawn "pgrep -x kanshi || kanshi" -# riverctl spawn "swaybg -m fill -i ~/Pictures/flower.jpg" - riverctl set-repeat 30 190 riverctl xcursor-theme Adwaita diff --git a/.config/river/load-colors b/.config/river/load-colors index 5d3691d..3f889c0 100755 --- a/.config/river/load-colors +++ b/.config/river/load-colors @@ -1,8 +1,14 @@ #!/bin/sh . ~/.config/river/colors -riverctl background-color 0x$bg_0 -riverctl border-color-focused 0x$fg_1 -riverctl border-color-unfocused 0x$dim_0 +riverctl background-color 0x$background +riverctl border-color-focused 0x$border_focused +riverctl border-color-unfocused 0x$border_unfocused riverctl border-width 2 -riverctl spawn yambar-run +riverctl spawn 'killall yambar ; yambar' +if $dark; then + riverctl spawn 'killall swaybg ; swaybg -m fill -i ~/.config/river/windows-11-wallpapers/win21.jpg' +else + riverctl spawn 'killall swaybg ; swaybg -m fill -i ~/.config/river/windows-11-wallpapers/win13.jpg' +fi + diff --git a/.config/themer/foot.ini.sh b/.config/themer/foot.ini.sh new file mode 100755 index 0000000..ed6c1b6 --- /dev/null +++ b/.config/themer/foot.ini.sh @@ -0,0 +1,74 @@ +#!/bin/sh +set -e + +# https://github.com/jan-warchol/selenized/blob/e93e0d9fb47c7485f18fa16f9bdb70c2ee7fb5db/the-values.md + +echo "# Autogenerated by ~/.config/themer/foot.ini.sh +font=JetBrains Mono:style=Regular:size=9 +font-bold=JetBrains Mono:style=Bold:size=9 +font-italic=JetBrains Mono:style=Italic:size=9 +font-bold-italic=JetBrains Mono:style=Bold Italic:size=9 + +pad=5x5 + +[scrollback] +lines = 10000 +" > ~/.config/foot/foot.ini + +rose_pine () { + if $dark; then + alpha=0.8 + else + alpha=1 + fi + echo " + [cursor] + color = $inactive $text + + [colors] + background = $base + foreground = $text + alpha = $alpha + + selection-foreground = $text + selection-background = $highlight + + urls = $iris + + regular0 = $overlay + regular1 = $love + regular2 = $pine + regular3 = $gold + regular4 = $foam + regular5 = $iris + regular6 = $rose + regular7 = $text + + bright0 = $subtle + bright1 = $love + bright2 = $pine + bright3 = $gold + bright4 = $foam + bright5 = $iris + bright6 = $rose + bright7 = $text + " >> ~/.config/foot/foot.ini +} + +if test "$1" = rose-pine; then + . ~/.config/themer/themes/rose-pine.sh + rose_pine +elif test "$1" = rose-pine-dawn; then + . ~/.config/themer/themes/rose-pine-dawn.sh + rose_pine +elif test "$1" = rose-pine-moon; then + . ~/.config/themer/themes/rose-pine-moon.sh + rose_pine +else + if test -n "$1"; then + echo "I don't know that theme" + else + echo "No theme specified" + fi + exit 1 +fi diff --git a/.config/themer/fuzzel.sh b/.config/themer/fuzzel.sh new file mode 100755 index 0000000..f6d66cb --- /dev/null +++ b/.config/themer/fuzzel.sh @@ -0,0 +1,47 @@ +#!/bin/sh +set -e + +echo "#!/bin/sh +# Autogenerated by ~/.config/themer/fuzzel.sh +" > ~/.local/bin/fuzzel-run + +rose_pine () { + echo " +export background=$base +export foreground=$text +export selection_background=$highlight +export selection_foreground=$text +export border=$text +export accent=$iris +" >> ~/.local/bin/fuzzel-run +} + +if test "$1" = rose-pine; then + . ~/.config/themer/themes/rose-pine.sh + rose_pine +elif test "$1" = rose-pine-dawn; then + . ~/.config/themer/themes/rose-pine-dawn.sh + rose_pine +elif test "$1" = rose-pine-moon; then + . ~/.config/themer/themes/rose-pine-moon.sh + rose_pine +else + if test -n "$1"; then + echo "I don't know that theme" + else + echo "No theme specified" + fi + exit 1 +fi + +echo " +exec fuzzel --terminal=footclient --font='Inter:style=Bold:size=11' \ +--prompt='➦ ' \ +--no-icons \ +--width=20 \ +--background=\${background}ff --text-color=\${foreground}ff \ +--match-color=\${accent}ff \ +--selection-color=\${selection_background}ff --selection-text-color=\${selection_foreground}ff \ +--horizontal-pad=12 \ +--border-width=1 --border-color=\${border}ff --border-radius=2 \"\$@\" +" >> ~/.local/bin/fuzzel-run diff --git a/.config/themer/gtk.sh b/.config/themer/gtk.sh new file mode 100755 index 0000000..1f9c8df --- /dev/null +++ b/.config/themer/gtk.sh @@ -0,0 +1,37 @@ +#!/bin/sh +set -e + +rose_pine () { + if "$dark"; then + gsettings set org.gnome.desktop.interface gtk-theme Adwaita + # gsettings set org.freedesktop.appearance color-scheme 1 + echo '# Autogenerated by ~/.config/themer/gtk.sh +gtk-theme-name="Adwaita-dark"' > ~/.gtkrc-2.0 + else + gsettings set org.gnome.desktop.interface gtk-theme Adwaita-light + # gsettings set org.freedesktop.appearance color-scheme 2 + echo '# Autogenerated by ~/.config/themer/gtk.sh +gtk-theme-name="Adwaita"' > ~/.gtkrc-2.0 + fi + echo "# Autogenerated by ~/.config/themer/gtk.sh +[Settings] +gtk-application-prefer-dark-theme = $dark +gtk-decoration-layout=menu:" > ~/.config/gtk-3.0/settings.ini +} +if test "$1" = rose-pine; then + . ~/.config/themer/themes/rose-pine.sh + rose_pine +elif test "$1" = rose-pine-dawn; then + . ~/.config/themer/themes/rose-pine-dawn.sh + rose_pine +elif test "$1" = rose-pine-moon; then + . ~/.config/themer/themes/rose-pine-moon.sh + rose_pine +else + if test -n "$1"; then + echo "I don't know that theme" + else + echo "No theme specified" + fi + exit 1 +fi diff --git a/.config/themer/lock.sh b/.config/themer/lock.sh new file mode 100755 index 0000000..888bdf2 --- /dev/null +++ b/.config/themer/lock.sh @@ -0,0 +1,28 @@ +#!/bin/sh +set -e + +rose_pine () { + echo "#!/bin/sh +# Autogenerated by ~/.config/themer/lock.sh +setsid -f swaylockd --color $base \ + --show-failed-attempts +sleep 1 +" > ~/.local/bin/lock +} +if test "$1" = rose-pine; then + . ~/.config/themer/themes/rose-pine.sh + rose_pine +elif test "$1" = rose-pine-dawn; then + . ~/.config/themer/themes/rose-pine-dawn.sh + rose_pine +elif test "$1" = rose-pine-moon; then + . ~/.config/themer/themes/rose-pine-moon.sh + rose_pine +else + if test -n "$1"; then + echo "I don't know that theme" + else + echo "No theme specified" + fi + exit 1 +fi diff --git a/.config/themer/river-colors.sh b/.config/themer/river-colors.sh new file mode 100755 index 0000000..ec21876 --- /dev/null +++ b/.config/themer/river-colors.sh @@ -0,0 +1,40 @@ +#!/bin/sh +set -e + +echo "#!/bin/sh +# Autogenerated by ~/.config/themer/river-colors.sh +" > ~/.config/river/colors + +rose_pine () { + if $dark; then + border_focused=$iris + border_unfocused=$inactive + else + border_focused=$subtle + border_unfocused=$surface + fi + echo " + export background=$base + export border_focused=$border_focused + export border_unfocused=$border_unfocused + export dark=$dark + " >> ~/.config/river/colors +} + +if test "$1" = rose-pine; then + . ~/.config/themer/themes/rose-pine.sh + rose_pine +elif test "$1" = rose-pine-dawn; then + . ~/.config/themer/themes/rose-pine-dawn.sh + rose_pine +elif test "$1" = rose-pine-moon; then + . ~/.config/themer/themes/rose-pine-moon.sh + rose_pine +else + if test -n "$1"; then + echo "I don't know that theme" + else + echo "No theme specified" + fi + exit 1 +fi diff --git a/.config/themer/themes/rose-pine-dawn.sh b/.config/themer/themes/rose-pine-dawn.sh new file mode 100644 index 0000000..9f7ceec --- /dev/null +++ b/.config/themer/themes/rose-pine-dawn.sh @@ -0,0 +1,17 @@ +#!/bin/sh +export base=faf4ed +export surface=fffaf3 +export overlay=f2e9de +export inactive=9893a5 +export subtle=6e6a86 +export text=575279 +export love=b4637a +export gold=ea9d34 +export rose=d7827e +export pine=286983 +export foam=56949f +export iris=907aa9 +export highlight=eee9e6 +export highlightInactive=f2ede9 +export highlightOverlay=e4dfde +export dark=false diff --git a/.config/themer/themes/rose-pine-moon.sh b/.config/themer/themes/rose-pine-moon.sh new file mode 100644 index 0000000..2e26dae --- /dev/null +++ b/.config/themer/themes/rose-pine-moon.sh @@ -0,0 +1,17 @@ +#!/bin/sh +export base=232136 +export surface=2a273f +export overlay=393552 +export inactive=59546d +export subtle=817c9c +export text=e0def4 +export love=eb6f92 +export gold=f6c177 +export rose=ea9a97 +export pine=3e8fb0 +export foam=9ccfd8 +export iris=c4a7e7 +export highlight=312f44 +export highlightInactive=2a283d +export highlightOverlay=3f3c53 +export dark=true diff --git a/.config/themer/themes/rose-pine.sh b/.config/themer/themes/rose-pine.sh new file mode 100644 index 0000000..af5334e --- /dev/null +++ b/.config/themer/themes/rose-pine.sh @@ -0,0 +1,17 @@ +#!/bin/sh +export base=191724 +export surface=1f1d2e +export overlay=26233a +export inactive=555169 +export subtle=6e6a86 +export text=e0def4 +export love=eb6f92 +export gold=f6c177 +export rose=ebbcba +export pine=31748f +export foam=9ccfd8 +export iris=c4a7e7 +export highlight=2a2837 +export highlightInactive=211f2d +export highlightOverlay=3a384a +export dark=true diff --git a/.config/themer/waylock.sh b/.config/themer/waylock.sh new file mode 100755 index 0000000..33840ec --- /dev/null +++ b/.config/themer/waylock.sh @@ -0,0 +1,28 @@ +#!/bin/sh +set -e + +rose_pine () { + echo "# Autogenerated by ~/.config/themer/waylock.sh +[colors] +init_color = 0x$base +input_color = 0x$pine +fail_color = 0x$love +" > ~/.config/waylock/waylock.toml +} +if test "$1" = rose-pine; then + . ~/.config/themer/themes/rose-pine.sh + rose_pine +elif test "$1" = rose-pine-dawn; then + . ~/.config/themer/themes/rose-pine-dawn.sh + rose_pine +elif test "$1" = rose-pine-moon; then + . ~/.config/themer/themes/rose-pine-moon.sh + rose_pine +else + if test -n "$1"; then + echo "I don't know that theme" + else + echo "No theme specified" + fi + exit 1 +fi diff --git a/.config/themer/yambar.sh b/.config/themer/yambar.sh new file mode 100755 index 0000000..028348b --- /dev/null +++ b/.config/themer/yambar.sh @@ -0,0 +1,30 @@ +#!/bin/sh +set -e + +rose_pine () { + echo "# Autogenerated by ~/.config/themer/yambar.sh +background: &bg ${base}dd +background2: &bg2 ${surface}ff +foreground: &fg ${text}ff +accent: &accent ${iris}ff +" > ~/.config/yambar/config.yml +} +if test "$1" = rose-pine; then + . ~/.config/themer/themes/rose-pine.sh + rose_pine +elif test "$1" = rose-pine-dawn; then + . ~/.config/themer/themes/rose-pine-dawn.sh + rose_pine +elif test "$1" = rose-pine-moon; then + . ~/.config/themer/themes/rose-pine-moon.sh + rose_pine +else + if test -n "$1"; then + echo "I don't know that theme" + else + echo "No theme specified" + fi + exit 1 +fi + +cat ~/.config/yambar/real-config.yml >> ~/.config/yambar/config.yml diff --git a/.config/yambar/config.yml b/.config/yambar/real-config.yml similarity index 98% rename from .config/yambar/config.yml rename to .config/yambar/real-config.yml index b5873ef..c99fc56 100644 --- a/.config/yambar/config.yml +++ b/.config/yambar/real-config.yml @@ -1,12 +1,8 @@ nerd: &nerd Overpass Nerd Font:size=16 -# Automatically set by yambar-run -# background: &bg 1f1d2eff -# foreground: &fg e0def4ff - bar: - height: 28 - location: bottom + height: 24 + location: top layer: top spacing: 8 right-margin: 8 diff --git a/.local/bin/fuzzel-run b/.local/bin/fuzzel-run deleted file mode 100755 index b8efda1..0000000 --- a/.local/bin/fuzzel-run +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -. ~/.config/river/colors - -exec fuzzel --terminal=footclient --font='Inter:style=Bold:size=11' \ ---prompt="➦ " \ ---no-icons \ ---width=20 \ ---background=${bg_0}ff --text-color=${fg_0}ff \ ---match-color=${fg_accent}ff \ ---selection-color=${bg_1}ff --selection-text-color=${fg_0}ff \ ---horizontal-pad=12 \ ---border-width=1 --border-color=${fg_0}ff --border-radius=2 diff --git a/.local/bin/lock b/.local/bin/lock deleted file mode 100755 index d7cbca4..0000000 --- a/.local/bin/lock +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -. ~/.config/river/colors -setsid -f swaylockd --color "$bg_0" -sleep 1 diff --git a/.local/bin/themer b/.local/bin/themer new file mode 100755 index 0000000..9e4c67c --- /dev/null +++ b/.local/bin/themer @@ -0,0 +1,16 @@ +#!/bin/sh +set -e + +if test -n "$1"; then + ~/.config/themer/river-colors.sh "$1" + ~/.config/themer/foot.ini.sh "$1" + ~/.config/themer/yambar.sh "$1" + ~/.config/themer/fuzzel.sh "$1" + ~/.config/themer/lock.sh "$1" + ~/.config/themer/waylock.sh "$1" + ~/.config/themer/gtk.sh "$1" + ~/.config/river/load-colors +else + echo "No theme specified" + exit 1 +fi diff --git a/.local/bin/yambar-run b/.local/bin/yambar-run deleted file mode 100755 index c5d5048..0000000 --- a/.local/bin/yambar-run +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh -. ~/.config/river/colors -killall yambar - -config="$(mktemp)" - -echo "background: &bg ${bg_0}ff -background2: &bg2 ${bg_1}ff -foreground: &fg ${fg_0}ff -foreground2: &fg2 ${fg_1}ff -accent: &accent ${fg_accent}ff -" > "$config" -cat ~/.config/yambar/config.yml >> "$config" - -yambar --config="$config" - -rm "$config"