fix rofi theme foreground/background; fix alacritty default loading order

bin/altaria/xorg.zsh

@@ -30,7 +30,7 @@ XRANDR_SET() {
 
 	local COMPOSITING=enable
 	local SCREEN_BLANK=enable
-	local BACKGROUND=purple.jpg
+	local BACKGROUND=$(scwrypts -n get theme).jpg
 	local SOUND_EFFECT=login
 	local XRANDR_ARGS=()
 
@@ -71,7 +71,7 @@ XRANDR_SET() {
 	sleep 1
 
 	scwrypts desktop screen blank      -- $SCREEN_BLANK
-	scwrypts desktop i3 set background -- $BACKGROUND
+	scwrypts desktop i3 set background -- $BACKGROUND || scwrypts desktop i3 set background -- purple.jpg
 	$DOTWRYN/bin/polybar
 	scwrypts desktop play sound        -- $SOUND_EFFECT
 }

colorschemes/active/alacritty.toml

@@ -1,28 +1,30 @@
 # do not edit; generated by scwrypts
-# theme : main
+# theme : spring-sunset
 [colors.cursor]
-cursor = '0xeeddff'
+cursor = '0xfdfbe7'
 
 [colors.primary]
-background = '0x000505'
+background = '0x0b1e32'
-foreground = '0xd0f0f0'
+foreground = '0xe8eaf7'
 
 [colors.normal]
 black   = '0x000505'
-red     = '0xc80064'
+red     = '0xf12875'
-green   = '0x11bb98'
+green   = '0x5c68c4'
-yellow  = '0x6911aa'
+yellow  = '0xf2e044'
-blue    = '0x2262bb'
+blue    = '0x5ab5e0'
-magenta = '0x9922dd'
+magenta = '0xf5e878'
-cyan    = '0x22ccba'
+cyan    = '0x7983ce'
 white   = '0xd0f0f0'
 
 [colors.bright]
 black   = '0x424253'
-red     = '0xff44ff'
+red     = '0xf694bc'
-green   = '0x44dddd'
+green   = '0x9fa6dc'
-yellow  = '0xaa44ff'
+yellow  = '0xf8ef9e'
-blue    = '0x229df6'
+blue    = '0xb9e5f4'
-magenta = '0xdd88ff'
+magenta = '0xfbf5c4'
-cyan    = '0x88ffff'
+cyan    = '0xc5c9ea'
 white   = '0x7e707e'
+[window]
+opacity = 0.85

colorschemes/active/alacritty.yaml

@@ -1,27 +1,29 @@
 ---   # yamllint disable rule:colons
 # do not edit; generated by scwrypts
-# theme : main
+# theme : spring-sunset
 colors:
   primary:
-    background: '0x000505'
+    background: '0x0b1e32'
-    foreground: '0xd0f0f0'
+    foreground: '0xe8eaf7'
   cursor:
-    cursor: '0xeeddff'
+    cursor: '0xfdfbe7'
   normal:
     black:   '0x000505'
-    red:     '0xc80064'
+    red:     '0xf12875'
-    green:   '0x11bb98'
+    green:   '0x5c68c4'
-    yellow:  '0x6911aa'
+    yellow:  '0xf2e044'
-    blue:    '0x2262bb'
+    blue:    '0x5ab5e0'
-    magenta: '0x9922dd'
+    magenta: '0xf5e878'
-    cyan:    '0x22ccba'
+    cyan:    '0x7983ce'
     white:   '0xd0f0f0'
   bright:
     black:   '0x424253'
-    red:     '0xff44ff'
+    red:     '0xf694bc'
-    green:   '0x44dddd'
+    green:   '0x9fa6dc'
-    yellow:  '0xaa44ff'
+    yellow:  '0xf8ef9e'
-    blue:    '0x229df6'
+    blue:    '0xb9e5f4'
-    magenta: '0xdd88ff'
+    magenta: '0xfbf5c4'
-    cyan:    '0x88ffff'
+    cyan:    '0xc5c9ea'
     white:   '0x7e707e'
+window:
+  opacity: 0.8

colorschemes/active/default.yaml

@@ -38,7 +38,7 @@ material:
       secondary: .material.foreground.secondary.500
       error:     .material.foreground.error.500
 
-  foreground:
+  foreground:  # default (50-400 = black) (500-900 = white)
     primary:
       50: .ansi.gray.black
       100: .ansi.gray.black

colorschemes/active/getty.sh

@@ -1,11 +1,11 @@
 #!/bin/sh
 # do not edit; generated by scwrypts
-# theme : main
+# theme : spring-sunset
 #
 # source this file to apply colorscheme to linux getty
 #
 [[ "$TERM" =~ ^linux$ ]] || return 0
-/bin/echo -e " ]P0000505 ]P1c80064 ]P211bb98 ]P36911aa ]P42262bb ]P59922dd ]P622ccba ]P7d0f0f0 ]P8ff44ff ]P944dddd ]PAaa44ff ]PB229df6 ]PCdd88ff ]PD88ffff ]PEd0f0f0 ]PF7e707e "
+/bin/echo -e " ]P00b1e32 ]P1f12875 ]P25c68c4 ]P3f2e044 ]P45ab5e0 ]P5f5e878 ]P67983ce ]P7e8eaf7 ]P8f694bc ]P99fa6dc ]PAf8ef9e ]PBb9e5f4 ]PCfbf5c4 ]PDc5c9ea ]PEd0f0f0 ]PF7e707e "
 [ ! $NO_CLEAR ] && clear
 return 0
  sed $d

colorschemes/active/kitty.conf

@@ -1,23 +1,23 @@
 # do not edit; generated by scwrypts
-# theme : main
+# theme : spring-sunset
 color0 #000505
-color1 #c80064
+color1 #f12875
-color2 #11bb98
+color2 #5c68c4
-color3 #6911aa
+color3 #f2e044
-color4 #2262bb
+color4 #5ab5e0
-color5 #9922dd
+color5 #f5e878
-color6 #22ccba
+color6 #7983ce
 color7 #d0f0f0
 color8 #424253
-color9 #ff44ff
+color9 #f694bc
-color10 #44dddd
+color10 #9fa6dc
-color11 #aa44ff
+color11 #f8ef9e
-color12 #229df6
+color12 #b9e5f4
-color13 #dd88ff
+color13 #fbf5c4
-color14 #88ffff
+color14 #c5c9ea
 color15 #7e707e
-cursor #eeddff
+cursor #fdfbe7
-background #000505
+background #0b1e32
-foreground #d0f0f0
+foreground #e8eaf7
 selection_background #
 selection_foreground #

colorschemes/active/name.txt

@@ -0,0 +1 @@
+spring-sunset

colorschemes/active/polybar.ini

@@ -1,10 +1,11 @@
 # do not edit; generated by scwrypts
-# theme : main
+# theme : spring-sunset
 [colors]
-background     = #000505
+background     = #0b1e32
-background-alt = #6911aa
+foreground     = #e8eaf7
-foreground     = #d0f0f0
+background-alt = #f2e044
-primary        = #6911aa
+foreground-alt = #000505
-secondary      = #11bb98
+primary        = #f2e044
-alert          = #c80064
+secondary      = #5c68c4
+alert          = #f12875
 disabled       = #424253

colorschemes/active/rofi.rasi

@@ -1,13 +1,14 @@
 /**
  * do not edit; generated by scwrypts
- * theme : main
+ * theme : spring-sunset
  **/
 
 *{
-	background:     #000505;
+	background:     #0b1e32;
 	foreground:     #d0f0f0;
-	background-alt: #9922dd;
+	background-alt: #f5e878;
+	foreground-alt: #000505;
 	selected:       #000505;
-	active:         #6911aa;
+	active:         #f2e044;
-	urgent:         #c80064;
+	urgent:         #f12875;
 }

colorschemes/active/source.yaml

@@ -1 +1 @@
-/home/w0ryn/.wryn/colorschemes/main.yaml
+/home/w0ryn/.wryn/colorschemes/spring-sunset.yaml

colorschemes/spring-sunset.yaml

@@ -0,0 +1,71 @@
+---   # yamllint disable rule:colons
+background: .material.secondary.900
+foreground: .material.secondary.50
+
+alacritty:
+  transparency: 0.85
+
+ansi:
+  blue:
+    regular: '#5ab5e0'
+    bright:  '#b9e5f4'
+
+  magenta:
+    regular: .material.primary.300
+    bright:  .material.primary.100
+
+  cyan:
+    regular: .material.secondary.300
+    bright:  .material.secondary.100
+
+material:
+  base:
+    secondary: .material.secondary.400
+    foreground:
+      secondary: .material.foreground.secondary.400
+
+  primary:  # replaces ANSI yellow
+    50:  '#fdfbe7'
+    100: '#fbf5c4'
+    200: '#f8ef9e'
+    300: '#f5e878'
+    400: '#f3e35d'
+    500: '#f2e044'
+    600: '#f0ce3f'
+    700: '#ecb737'
+    800: '#e9a02f'
+    900: '#e27a22'
+
+  secondary:  # replaces ANSI green
+    50:  '#e8eaf7'
+    100: '#c5c9ea'
+    200: '#9fa6dc'
+    300: '#7983ce'
+    400: '#5c68c4'
+    500: '#404db9'
+    600: '#3a45af'
+    700: '#313ba3'
+    800: '#293097'
+    900: '#0b1e32'
+
+  error:  # replaces ANSI red
+    50:  '#fce5ef'
+    100: '#f9bed7'
+    200: '#f694bc'
+    300: '#f468a1'
+    400: '#f2488b'
+    500: '#f12875'
+    600: '#e02671'
+    700: '#c9236b'
+    800: '#b32066'
+    900: '#8d1b5c'
+
+  foreground:
+    primary:
+      500: .ansi.gray.black
+      600: .ansi.gray.black
+      700: .ansi.gray.black
+      800: .ansi.gray.black
+      900: .ansi.gray.black
+    secondary:
+      400: .ansi.gray.white

config/alacritty.default.toml

@@ -0,0 +1,15 @@
+[font.bold]
+family = "Monaspace Argon"
+
+[font.glyph_offset]
+x = 0
+y = 1
+
+[font.italic]
+family = "Monaspace Radon"
+
+[font.normal]
+family = "Monaspace Neon"
+
+[window]
+opacity = 0.8

config/alacritty.toml

@@ -1,20 +1,5 @@
 import = [
+	"/home/w0ryn/.config/alacritty/default.toml",
 	"/home/w0ryn/.config/alacritty/theme.toml",
 	"/home/w0ryn/.config/alacritty/local.toml",
 	]
-
-[font.bold]
-family = "Monaspace Argon"
-
-[font.glyph_offset]
-x = 0
-y = 1
-
-[font.italic]
-family = "Monaspace Radon"
-
-[font.normal]
-family = "Monaspace Neon"
-
-[window]
-opacity = 0.8

config/polybar.ini

@@ -49,6 +49,7 @@ type = internal/xworkspaces
 
 label-active = %name%
 label-active-background = ${colors.background-alt}
+label-active-foreground = ${colors.foreground-alt}
 label-active-padding = 1
 
 label-occupied = %name%

config/rofi.theme.rasi

@@ -29,18 +29,19 @@ configuration {
     background-colour:           var(background);
     foreground-colour:           var(foreground);
     alternate-background:        var(background-alt);
+    alternate-foreground:        var(selected);
     normal-background:           var(background);
     normal-foreground:           var(foreground);
     urgent-background:           var(urgent);
     urgent-foreground:           var(background);
     active-background:           var(active);
     active-foreground:           var(background);
-    selected-normal-background:  var(selected);
+    selected-normal-background:  var(background-alt);
-    selected-normal-foreground:  var(background);
+    selected-normal-foreground:  var(selected);
-    selected-urgent-background:  var(active);
+    selected-urgent-background:  var(background-alt);
-    selected-urgent-foreground:  var(background);
+    selected-urgent-foreground:  var(selected);
     selected-active-background:  var(urgent);
-    selected-active-foreground:  var(background);
+    selected-active-foreground:  var(selected);
     alternate-normal-background: var(background);
     alternate-normal-foreground: var(foreground);
     alternate-urgent-background: var(urgent);
@@ -176,7 +177,7 @@ element normal.active {
 }
 element selected.normal {
     background-color:            var(alternate-background);
-    text-color:                  var(foreground-colour);
+    text-color:                  var(alternate-foreground);
 }
 element selected.urgent {
     background-color:            var(selected-urgent-background);

config/scwrypts/dotfiles.zsh

@@ -16,6 +16,7 @@ $DOTWRYN/colorschemes/active/alacritty.toml       alacritty/theme.toml
 $DOTWRYN/colorschemes/active/alacritty.yaml       alacritty/theme.yml
 $DOTWRYN/colorschemes/active/getty.sh             wryn/tty-colorscheme
 $DOTWRYN/config/alacritty.toml                    alacritty/alacritty.toml
+$DOTWRYN/config/alacritty.default.toml            alacritty/default.toml
 $DOTWRYN/config/alacritty.yaml                    alacritty/alacritty.yml
 $DOTWRYN/config/bat.conf                          bat/config
 $DOTWRYN/config/code-activator.conf               code-activator-zsh/settings.zsh

scwrypts/dotwryn/desktop/colorscheme/get-theme

@@ -0,0 +1,14 @@
+#!/bin/zsh
+use desktop/colorscheme --group dotwryn
+#####################################################################
+
+USAGE__description+='
+	output the name of the current system theme
+'
+
+#####################################################################
+
+MAIN() {
+	cat "$ACTIVE_THEME_PATH/name.txt" 2>/dev/null \
+		|| ERROR 'theme name not available'
+}

scwrypts/dotwryn/lib/desktop/colorscheme/alacritty.module.zsh

@@ -61,6 +61,14 @@ colors:
     cyan:    '0x$BRIGHT_CYAN'
     white:   '0x$BRIGHT_WHITE'
 " | sed '$d' > "$_COLORSCHEME_FILE__alacritty_yaml"
+
+	local TRANSPARENCY_OVERRIDE=$(cat "$SOURCE_THEME" | YQ -r '.alacritty.transparency' | grep -v '^null$')
+	[ $TRANSPARENCY_OVERRIDE ] && {
+		printf "[window]\nopacity = $TRANSPARENCY_OVERRIDE\n" >> "$_COLORSCHEME_FILE__alacritty_toml"
+		printf "window:\n  opacity: 0.8" >> "$_COLORSCHEME_FILE__alacritty_yaml"
+	}
+
+	return 0
 }
 
 _SET_THEME__alacritty() {

scwrypts/dotwryn/lib/desktop/colorscheme/colorscheme.module.zsh

@@ -226,7 +226,8 @@ SET_THEME() {
 			}
 	done
 
-	CHECK_ERRORS --no-usage
+	CHECK_ERRORS --no-usage \
+		&& echo "$THEME_NAME" > "$ACTIVE_THEME_PATH/name.txt"
 }
 
 #####################################################################

scwrypts/dotwryn/lib/desktop/colorscheme/polybar.module.zsh

@@ -5,8 +5,9 @@ _GENERATE_THEME__polybar() {
 # theme : $THEME_NAME
 [colors]
 background     = #$(_GET_HEX .polybar.background .background)
-background-alt = #$(_GET_HEX .polybar.background-alt .selection.background)
 foreground     = #$(_GET_HEX .polybar.foreground .foreground)
+background-alt = #$(_GET_HEX .polybar.background-alt .selection.background)
+foreground-alt = #$(_GET_HEX .polybar.foreground-alt .selection.foreground)
 primary        = #$(_GET_HEX .polybar.primary    .material.base.primary   .ansi.green.regular)
 secondary      = #$(_GET_HEX .polybar.secondary  .material.base.secondary .ansi.blue.regular)
 alert          = #$(_GET_HEX .polybar.alert      .material.base.error     .ansi.red.regular)

scwrypts/dotwryn/lib/desktop/colorscheme/rofi.module.zsh

@@ -7,9 +7,10 @@ _GENERATE_THEME__rofi() {
  **/
 
 *{
-	background:     #$(_GET_HEX .rofi.background      .background);
+	background:     #$(_GET_HEX .rofi.background      .material.secondary.900            .background);
-	foreground:     #$(_GET_HEX .rofi.foreground      .foreground);
+	foreground:     #$(_GET_HEX .rofi.foreground      .material.foreground.secondary.900 .foreground);
 	background-alt: #$(_GET_HEX .rofi.background-alt  .material.primary.300             .selection.background);
+	foreground-alt: #$(_GET_HEX .rofi.foreground-alt  .material.foreground.primary.300  .selection.foreground);
 	selected:       #$(_GET_HEX .rofi.selected        .material.foreground.primary.300  .selection.foreground);
 	active:         #$(_GET_HEX .rofi.active          .material.base.primary   .ansi.green.regular);
 	urgent:         #$(_GET_HEX .rofi.urgent          .material.base.error     .ansi.red.regular  );