Compare commits

...

10 Commits

24 changed files with 366 additions and 58 deletions
+52 -5
View File
@@ -13,9 +13,38 @@
border-radius: 8px; border-radius: 8px;
border: 2px solid alpha(@color4, 0.5); border: 2px solid alpha(@color4, 0.5);
padding: 8px 15px; padding: 8px 15px;
min-width: 300px;
font-family: "JetBrainsMono Nerd Font", sans-serif; font-family: "JetBrainsMono Nerd Font", sans-serif;
} }
.media-cover {
min-width: 64px;
min-height: 64px;
border-radius: 4px;
background-size: cover;
background-position: center;
}
.media-info-box {
margin-left: 10px;
}
.media-title {
color: @foreground;
font-size: 14px;
font-weight: bold;
}
.media-artist {
color: @foreground;
font-size: 13px;
opacity: 0.8;
}
.media-controls {
/* Box spacing is handled by the component */
}
.media-btn { .media-btn {
color: @color5; color: @color5;
font-size: 16px; font-size: 16px;
@@ -27,8 +56,26 @@
color: @color4; color: @color4;
} }
.media-text { .media-progress {
color: @foreground; min-height: 4px;
font-size: 14px; padding: 0;
margin-left: 10px; }
}
.media-progress trough {
min-height: 4px;
background-color: alpha(@foreground, 0.2);
border-radius: 4px;
}
.media-progress highlight {
background-color: @accent;
border-radius: 4px;
}
.media-progress slider {
background-color: transparent;
min-width: 0px;
min-height: 0px;
border: none;
box-shadow: none;
}
+82 -27
View File
@@ -6,9 +6,26 @@ import { createPoll } from "ags/time"
export default function Media(gdkmonitor: Gdk.Monitor) { export default function Media(gdkmonitor: Gdk.Monitor) {
const { TOP, LEFT } = Astal.WindowAnchor const { TOP, LEFT } = Astal.WindowAnchor
// Poll playerctl for metadata and status const pollCmd = "playerctl metadata -f '{{title}}|||{{artist}}|||{{mpris:artUrl}}|||{{status}}|||{{mpris:length}}|||{{position}}' 2>/dev/null || echo 'No Media||||||Stopped|||0|||0'";
const mediaInfo = createPoll("No Media Playing", 1000, 'sh -c "playerctl metadata -f \'{{title}} - {{artist}}\' 2>/dev/null || echo \'No Media Playing\'"')
const statusIcon = createPoll("▶", 1000, 'sh -c "s=\\$(playerctl status 2>/dev/null); if [ \\"\\$s\\" = \\"Playing\\" ]; then echo \\"⏸\\"; else echo \\"▶\\"; fi"') const mediaState = createPoll({
title: "No Media",
artist: "",
artUrl: "",
status: "Stopped",
length: 0,
position: 0
}, 1000, pollCmd, (stdout) => {
const parts = stdout.split("|||");
const title = parts[0]?.trim() || "No Media";
const artist = parts[1]?.trim() || "";
const rawUrl = parts[2]?.trim() || "";
const artUrl = rawUrl.replace(/^file:\/\//, '');
const status = parts[3]?.trim() || "Stopped";
const length = Number(parts[4]) || 0;
const position = Number(parts[5]) || 0;
return { title, artist, artUrl, status, length, position };
});
return ( return (
<window <window
@@ -20,30 +37,68 @@ export default function Media(gdkmonitor: Gdk.Monitor) {
margin={20} margin={20}
application={app} application={app}
> >
<box class="media-container" spacing={10}> <box class="media-container" css="min-width: 350px;" spacing={15}>
<button <box
class="media-btn" class="media-cover"
onClicked={() => execAsync("playerctl previous").catch(print)} css={mediaState.as(s => s.artUrl ? `background-image: url('${s.artUrl}'); min-width: 80px; min-height: 80px;` : 'min-width: 80px; min-height: 80px; background-color: alpha(@color0, 0.5);')}
halign={Gtk.Align.CENTER} />
>
<label label="⏮" /> <box vertical class="media-info-box" valign={Gtk.Align.CENTER} hexpand>
</button> <label
<button class="media-title"
class="media-btn" label={mediaState.as(s => s.title)}
onClicked={() => execAsync("playerctl play-pause").catch(print)} halign={Gtk.Align.FILL}
halign={Gtk.Align.CENTER} xalign={0}
> truncate
<label label={statusIcon} /> maxWidthChars={35}
</button> css="font-size: 15px;"
<button />
class="media-btn" <label
onClicked={() => execAsync("playerctl next").catch(print)} class="media-artist"
halign={Gtk.Align.CENTER} label={mediaState.as(s => s.artist)}
> halign={Gtk.Align.FILL}
<label label="⏭" /> xalign={0}
</button> truncate
<label class="media-text" label={mediaInfo} /> maxWidthChars={40}
css="font-size: 13px;"
/>
<slider
class="media-progress"
drawValue={false}
hexpand
min={0}
max={1}
value={mediaState.as(s => {
const len = s.length / 1000000;
return len > 0 ? Math.min(s.position / len, 1) : 0;
})}
marginTop={10}
marginBottom={10}
/>
<box class="media-controls" spacing={15} halign={Gtk.Align.CENTER}>
<button
class="media-btn"
onClicked={() => execAsync("playerctl previous").catch(print)}
>
<label label="" css="font-size: 18px;" />
</button>
<button
class="media-btn"
onClicked={() => execAsync("playerctl play-pause").catch(print)}
>
<label label={mediaState.as(s => s.status === "Playing" ? "" : "")} css="font-size: 22px;" />
</button>
<button
class="media-btn"
onClicked={() => execAsync("playerctl next").catch(print)}
>
<label label="" css="font-size: 18px;" />
</button>
</box>
</box>
</box> </box>
</window> </window>
) )
} }
Binary file not shown.

Before

Width:  |  Height:  |  Size: 89 KiB

After

Width:  |  Height:  |  Size: 79 KiB

@@ -0,0 +1,57 @@
Name = "blobBackgroundSelector"
NamePretty = "Blob's Background Selector"
Cache = false
HideFromProviderlist = true
SearchName = true
local function ShellEscape(s)
return "'" .. s:gsub("'", "'\\''") .. "'"
end
function FormatName(filename)
local name = filename:gsub("^%d+", ""):gsub("^%-", "")
name = name:gsub("%.[^%.]+$", "")
name = name:gsub("-", " ")
name = name:gsub("%S+", function(word)
return word:sub(1, 1):upper() .. word:sub(2):lower()
end)
return name
end
function GetEntries()
local entries = {}
local home = os.getenv("HOME")
local dirs = {
home .. "/wallpapers",
}
local seen = {}
for _, wallpaper_dir in ipairs(dirs) do
local handle = io.popen(
"find " .. ShellEscape(wallpaper_dir)
.. " -maxdepth 1 -type f \\( -name '*.jpg' -o -name '*.jpeg' -o -name '*.png' -o -name '*.gif' -o -name '*.bmp' -o -name '*.webp' \\) 2>/dev/null | sort"
)
if handle then
for background in handle:lines() do
local filename = background:match("([^/]+)$")
if filename and not seen[filename] then
seen[filename] = true
table.insert(entries, {
Text = FormatName(filename),
Value = filename,
Actions = {
activate = "blob_wallpaper " .. ShellEscape(background),
},
Preview = background,
PreviewType = "file",
})
end
end
handle:close()
end
end
return entries
end
+5
View File
@@ -104,6 +104,9 @@ install_dependencies() {
if ! command -v magick &> /dev/null && ! command -v convert &> /dev/null; then if ! command -v magick &> /dev/null && ! command -v convert &> /dev/null; then
deps_needed+=("imagemagick") deps_needed+=("imagemagick")
fi fi
if ! command -v awww &> /dev/null; then
deps_needed+=("awww")
fi
if [ ${#deps_needed[@]} -gt 0 ]; then if [ ${#deps_needed[@]} -gt 0 ]; then
echo "Installing missing dependencies: ${deps_needed[*]}" echo "Installing missing dependencies: ${deps_needed[*]}"
@@ -134,6 +137,7 @@ check_file "$SCRIPT_DIR/ags/app.ts" "$HOME_DIR/.config/ags/app.ts" "ags/app.ts"
check_file "$SCRIPT_DIR/ags/style.css" "$HOME_DIR/.config/ags/style.css" "ags/style.css" || check_status=1 check_file "$SCRIPT_DIR/ags/style.css" "$HOME_DIR/.config/ags/style.css" "ags/style.css" || check_status=1
check_file "$SCRIPT_DIR/ags/widget/Media.tsx" "$HOME_DIR/.config/ags/widget/Media.tsx" "ags/widget/Media.tsx" || check_status=1 check_file "$SCRIPT_DIR/ags/widget/Media.tsx" "$HOME_DIR/.config/ags/widget/Media.tsx" "ags/widget/Media.tsx" || check_status=1
check_file "$SCRIPT_DIR/waybar/style.css" "$HOME_DIR/.config/waybar/style.css" "waybar/style.css" || check_status=1 check_file "$SCRIPT_DIR/waybar/style.css" "$HOME_DIR/.config/waybar/style.css" "waybar/style.css" || check_status=1
check_file "$SCRIPT_DIR/elephant/menus/blob_background_selector.lua" "$HOME_DIR/.config/elephant/menus/blob_background_selector.lua" "elephant/menus/blob_background_selector.lua" || check_status=1
check_file "$SCRIPT_DIR/branding/about.txt" "$HOME_DIR/.config/omarchy/branding/about.txt" "branding/about.txt" || check_status=1 check_file "$SCRIPT_DIR/branding/about.txt" "$HOME_DIR/.config/omarchy/branding/about.txt" "branding/about.txt" || check_status=1
check_file "$SCRIPT_DIR/branding/screensaver.txt" "$HOME_DIR/.config/omarchy/branding/screensaver.txt" "branding/screensaver.txt" || check_status=1 check_file "$SCRIPT_DIR/branding/screensaver.txt" "$HOME_DIR/.config/omarchy/branding/screensaver.txt" "branding/screensaver.txt" || check_status=1
@@ -168,6 +172,7 @@ backup_and_copy "$SCRIPT_DIR/waybar" "$HOME_DIR/.config/waybar" "Waybar config"
backup_and_copy "$SCRIPT_DIR/ags" "$HOME_DIR/.config/ags" "AGS config" backup_and_copy "$SCRIPT_DIR/ags" "$HOME_DIR/.config/ags" "AGS config"
backup_and_copy "$SCRIPT_DIR/hypr" "$HOME_DIR/.config/hypr" "Hyprland config" backup_and_copy "$SCRIPT_DIR/hypr" "$HOME_DIR/.config/hypr" "Hyprland config"
backup_and_copy "$SCRIPT_DIR/branding" "$HOME_DIR/.config/omarchy/branding" "Branding files" backup_and_copy "$SCRIPT_DIR/branding" "$HOME_DIR/.config/omarchy/branding" "Branding files"
backup_and_copy "$SCRIPT_DIR/elephant" "$HOME_DIR/.config/elephant" "Elephant configs"
backup_and_copy "$SCRIPT_DIR/omarchy/hooks" "$HOME_DIR/.config/omarchy/hooks" "Omarchy hooks" backup_and_copy "$SCRIPT_DIR/omarchy/hooks" "$HOME_DIR/.config/omarchy/hooks" "Omarchy hooks"
backup_and_copy "$SCRIPT_DIR/wallpapers" "$HOME_DIR/wallpapers" "Custom wallpapers" backup_and_copy "$SCRIPT_DIR/wallpapers" "$HOME_DIR/wallpapers" "Custom wallpapers"
+133
View File
@@ -0,0 +1,133 @@
#!/usr/bin/env python3
"""
blob_color_fixer.py — Detects monotone/bland wal color palettes and replaces
accent colors with vibrant, harmonically-spread alternatives.
"""
import sys
import math
import colorsys
from dataclasses import dataclass
MIN_SATURATION = 0.65
MIN_LIGHTNESS = 0.40
MAX_LIGHTNESS = 0.70
HUE_THRESHOLD = 0.15
SAT_THRESHOLD = 0.35
HUE_VARIANCE_THRESHOLD = 0.15
ACCENT_SLICE = slice(1, 7)
BRIGHT_OFFSET = 8
HUE_SHIFTS: list[float] = [
0.0,
0.5,
0.083,
-0.083,
0.416,
-0.416,
]
@dataclass(frozen=True)
class HLS:
h: float
l: float
s: float
def hex_to_rgb(hex_str: str) -> tuple[float, float, float]:
hex_str = hex_str.lstrip("#")
return tuple(int(hex_str[i : i + 2], 16) / 255.0 for i in (0, 2, 4)) # type: ignore[return-value]
def rgb_to_hex(r: float, g: float, b: float) -> str:
return "#{:02x}{:02x}{:02x}".format(int(r * 255), int(g * 255), int(b * 255))
def hex_to_hls(hex_str: str) -> HLS:
h, l, s = colorsys.rgb_to_hls(*hex_to_rgb(hex_str))
return HLS(h, l, s)
def vibrant_shift(hex_str: str, hue_shift: float) -> str:
"""Return *hex_str* with its hue rotated by *hue_shift* and vibrancy enforced."""
hls = hex_to_hls(hex_str)
h = (hls.h + hue_shift) % 1.0
s = max(hls.s, MIN_SATURATION)
l = min(max(hls.l, MIN_LIGHTNESS), MAX_LIGHTNESS)
return rgb_to_hex(*colorsys.hls_to_rgb(h, l, s))
def palette_is_bland(accents: list[str]) -> bool:
"""Return True when accent colors are too similar, clustered, or too desaturated."""
stats = [hex_to_hls(c) for c in accents]
hues = [hls.h for hls in stats]
sats = [hls.s for hls in stats]
raw_spread = max(hues) - min(hues)
hue_spread = min(raw_spread, 1.0 - raw_spread)
avg_sat = sum(sats) / len(sats)
if hue_spread < HUE_THRESHOLD or avg_sat < SAT_THRESHOLD:
return True
mean_sin = sum(math.sin(2 * math.pi * h) for h in hues) / len(hues)
mean_cos = sum(math.cos(2 * math.pi * h) for h in hues) / len(hues)
hue_variance = 1.0 - math.sqrt(mean_sin ** 2 + mean_cos ** 2)
if hue_variance < HUE_VARIANCE_THRESHOLD:
return True
return False
def most_saturated(accents: list[str]) -> str:
return max(accents, key=lambda c: hex_to_hls(c).s)
def load_colors(filepath: str) -> list[str]:
try:
with open(filepath) as f:
colors = [line.strip() for line in f if line.strip()]
except OSError as exc:
sys.exit(f"Error reading '{filepath}': {exc}")
if len(colors) < 16:
sys.exit(f"Expected ≥ 16 colors in '{filepath}', found {len(colors)}.")
return colors
def save_colors(filepath: str, colors: list[str]) -> None:
try:
with open(filepath, "w") as f:
f.write("\n".join(colors) + "\n")
except OSError as exc:
sys.exit(f"Error writing '{filepath}': {exc}")
def main() -> None:
if len(sys.argv) < 2:
sys.exit("Usage: blob_color_fixer.py <path_to_wal_colors>")
filepath = sys.argv[1]
colors = load_colors(filepath)
accents = colors[ACCENT_SLICE]
if not palette_is_bland(accents):
print("Palette is already vibrant and diverse — nothing to do.")
return
print("Monotone / bland palette detected. Generating vibrant harmony…")
base = most_saturated(accents)
new_accents = [vibrant_shift(base, shift) for shift in HUE_SHIFTS]
for i, color in enumerate(new_accents):
colors[i + 1] = color
colors[i + 1 + BRIGHT_OFFSET] = color
save_colors(filepath, colors)
print("Done — colors enhanced and written back to file.")
if __name__ == "__main__":
main()
+37 -26
View File
@@ -8,32 +8,9 @@ mkdir -p "$WALLPAPER_DIR"
mkdir -p "$THEME_DIR/backgrounds" mkdir -p "$THEME_DIR/backgrounds"
if [ -z "$1" ]; then if [ -z "$1" ]; then
echo "Available wallpapers in $WALLPAPER_DIR:" # Use walker dmenu for GUI selection
omarchy-launch-walker -m menus:blobBackgroundSelector --width 800 --minheight 400 -p "Select Wallpaper…"
# Read files into an array exit 0
mapfile -t files < <(ls -1 "$WALLPAPER_DIR" 2>/dev/null)
if [ ${#files[@]} -eq 0 ]; then
echo "No wallpapers found."
exit 1
fi
# Print the menu
for i in "${!files[@]}"; do
printf "%3d. %s\n" "$((i+1))" "${files[$i]}"
done
echo ""
read -p "Select a wallpaper number (1-${#files[@]}): " selection
# Validate selection
if ! [[ "$selection" =~ ^[0-9]+$ ]] || [ "$selection" -lt 1 ] || [ "$selection" -gt "${#files[@]}" ]; then
echo "Invalid selection."
exit 1
fi
SELECTED_FILE="${files[$((selection-1))]}"
IMAGE_PATH=$(realpath "$WALLPAPER_DIR/$SELECTED_FILE")
else else
# Check if the argument is a file in the wallpapers directory # Check if the argument is a file in the wallpapers directory
if [ -f "$WALLPAPER_DIR/$1" ]; then if [ -f "$WALLPAPER_DIR/$1" ]; then
@@ -50,6 +27,9 @@ fi
echo "Extracting colors using Pywal..." echo "Extracting colors using Pywal..."
wal -i "$IMAGE_PATH" -n -q 2> >(grep -v "deprecated in IMv7" >&2) wal -i "$IMAGE_PATH" -n -q 2> >(grep -v "deprecated in IMv7" >&2)
# Enhance colors if the palette is too monotone
python3 "$HOME/scripts/blob_color_fixer.py" "$HOME/.cache/wal/colors"
# Clear old backgrounds and copy the new one into the dynamic theme # Clear old backgrounds and copy the new one into the dynamic theme
rm -f "$THEME_DIR/backgrounds/"* rm -f "$THEME_DIR/backgrounds/"*
cp "$IMAGE_PATH" "$THEME_DIR/backgrounds/" cp "$IMAGE_PATH" "$THEME_DIR/backgrounds/"
@@ -81,8 +61,39 @@ color14 = "$(sed -n '15p' ~/.cache/wal/colors)"
color15 = "$(sed -n '16p' ~/.cache/wal/colors)" color15 = "$(sed -n '16p' ~/.cache/wal/colors)"
EOF EOF
# Write neovim.lua to satisfy LazyVim's theme symlink requirement
cat <<EOF > "$THEME_DIR/neovim.lua"
return {
{
"LazyVim/LazyVim",
opts = {
colorscheme = "tokyonight",
},
},
}
EOF
# Apply the Blob-Dynamic theme # Apply the Blob-Dynamic theme
# omarchy-theme-set manages the background and reloads waybar and AGS # omarchy-theme-set manages the background and reloads waybar and AGS
omarchy-theme-set "blob-dynamic" omarchy-theme-set "blob-dynamic"
# If it's a GIF, override swaybg with awww (swww replacement)
if [[ "${IMAGE_PATH,,}" == *.gif ]]; then
echo "GIF detected, switching to awww..."
pkill -x swaybg
# Start awww daemon if not running
if ! pgrep -x awww-daemon >/dev/null; then
awww-daemon >/dev/null 2>&1 &
sleep 1
fi
awww img "$IMAGE_PATH"
else
# Ensure awww is stopped for static wallpapers so swaybg can render them
if pgrep -x awww-daemon >/dev/null; then
pkill -x awww-daemon
fi
fi
echo "Wallpaper and dynamic theme applied successfully: $IMAGE_PATH" echo "Wallpaper and dynamic theme applied successfully: $IMAGE_PATH"
Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 49 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 475 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 192 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 663 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 347 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.8 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 327 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.3 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 95 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 502 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 47 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 37 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 61 KiB