diff --git a/dots/.config/kitty/kitty.conf b/dots/.config/kitty/kitty.conf index 008bbbe98..97473db05 100644 --- a/dots/.config/kitty/kitty.conf +++ b/dots/.config/kitty/kitty.conf @@ -1,3 +1,6 @@ +# Theming +include ~/.local/state/quickshell/user/generated/terminal/kitty-theme.conf + # Font font_family JetBrains Mono Nerd Font font_size 11.0 diff --git a/dots/.config/quickshell/ii/modules/ii/mediaControls/PlayerControl.qml b/dots/.config/quickshell/ii/modules/ii/mediaControls/PlayerControl.qml index f50769a51..a53255f11 100644 --- a/dots/.config/quickshell/ii/modules/ii/mediaControls/PlayerControl.qml +++ b/dots/.config/quickshell/ii/modules/ii/mediaControls/PlayerControl.qml @@ -77,7 +77,7 @@ Item { // Player instance id: coverArtDownloader property string targetFile: root.artUrl property string artFilePath: root.artFilePath - command: [ "bash", "-c", `[ -f ${artFilePath} ] || curl -sSL '${targetFile}' -o '${artFilePath}'` ] + command: [ "bash", "-c", `[ -f ${artFilePath} ] || curl -4 -sSL '${targetFile}' -o '${artFilePath}'` ] onExited: (exitCode, exitStatus) => { root.downloaded = true } diff --git a/dots/.config/quickshell/ii/scripts/colors/applycolor.sh b/dots/.config/quickshell/ii/scripts/colors/applycolor.sh index ddb93bd20..fd8651c73 100755 --- a/dots/.config/quickshell/ii/scripts/colors/applycolor.sh +++ b/dots/.config/quickshell/ii/scripts/colors/applycolor.sh @@ -27,7 +27,22 @@ IFS=$'\n' colorlist=($colornames) # Array of color names colorvalues=($colorstrings) # Array of color values -apply_term() { +apply_kitty() { + # Check if terminal escape sequence template exists + if [ ! -f "$SCRIPT_DIR/terminal/kitty-theme.conf" ]; then + echo "Template file not found for Kitty theme. Skipping that." + return + fi + # Copy template + mkdir -p "$STATE_DIR"/user/generated/terminal + cp "$SCRIPT_DIR/terminal/kitty-theme.conf" "$STATE_DIR"/user/generated/terminal/kitty-theme.conf + # Apply colors + for i in "${!colorlist[@]}"; do + sed -i "s/${colorlist[$i]} #/${colorvalues[$i]#\#}/g" "$STATE_DIR"/user/generated/terminal/kitty-theme.conf + done +} + +apply_anyterm() { # Check if terminal escape sequence template exists if [ ! -f "$SCRIPT_DIR/terminal/sequences.txt" ]; then echo "Template file not found for Terminal. Skipping that." @@ -52,6 +67,11 @@ apply_term() { done } +apply_term() { + apply_kitty + apply_anyterm +} + apply_qt() { sh "$CONFIG_DIR/scripts/kvantum/materialQT.sh" # generate kvantum theme python "$CONFIG_DIR/scripts/kvantum/changeAdwColors.py" # apply config colors diff --git a/dots/.config/quickshell/ii/scripts/colors/terminal/kitty-theme.conf b/dots/.config/quickshell/ii/scripts/colors/terminal/kitty-theme.conf new file mode 100644 index 000000000..2017b50f6 --- /dev/null +++ b/dots/.config/quickshell/ii/scripts/colors/terminal/kitty-theme.conf @@ -0,0 +1,27 @@ +background #$term0 # + +color0 #$term0 # +color1 #$term1 # +color2 #$term2 # +color3 #$term3 # +color4 #$term4 # +color5 #$term5 # +color6 #$term6 # +color7 #$term7 # +color8 #$term8 # +color9 #$term9 # +color10 #$term10 # +color11 #$term11 # +color12 #$term12 # +color13 #$term13 # +color14 #$term14 # +color15 #$term15 # + +color232 #$term7 # + +cursor #$term7 # + +foreground #$term7 # + +selection_background #$term7 # +selection_foreground #$term0 # diff --git a/dots/.config/quickshell/ii/scripts/thumbnails/generate-thumbnails-magick.sh b/dots/.config/quickshell/ii/scripts/thumbnails/generate-thumbnails-magick.sh index a5c858132..f109f90de 100755 --- a/dots/.config/quickshell/ii/scripts/thumbnails/generate-thumbnails-magick.sh +++ b/dots/.config/quickshell/ii/scripts/thumbnails/generate-thumbnails-magick.sh @@ -36,7 +36,7 @@ urlencode() { for ((i=0; i<${#str}; i++)); do c="${str:$i:1}" case "$c" in - [a-zA-Z0-9.~_-]|/) encoded+="$c" ;; + [a-zA-Z0-9.~_-]|/|'('|')'|'*') encoded+="$c" ;; *) printf -v hex '%%%02X' "'${c}'"; encoded+="$hex" ;; esac done