diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..5f9b1ec --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +*.gif filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text diff --git a/assets/media/lidm.gif b/assets/media/lidm.gif index 562243b..897f68e 100644 Binary files a/assets/media/lidm.gif and b/assets/media/lidm.gif differ diff --git a/themes/README.md b/themes/README.md index 93955bb..578b33e 100644 --- a/themes/README.md +++ b/themes/README.md @@ -1,5 +1,21 @@ # Themes +## catppuccin-frappe.ini + +![catppuccin-frappe.ini theme](./screenshots/catppuccin-frappe.png) + +## catppuccin-latte.ini + +![catppuccin-latte.ini theme](./screenshots/catppuccin-latte.png) + +## catppuccin-macchiato.ini + +![catppuccin-macchiato.ini theme](./screenshots/catppuccin-macchiato.png) + +## catppuccin-mocha.ini + +![catppuccin-mocha.ini theme](./screenshots/catppuccin-mocha.png) + ## cherry.ini ![cherry.ini theme](./screenshots/cherry.png) diff --git a/themes/screenshots/catppuccin-frappe.png b/themes/screenshots/catppuccin-frappe.png new file mode 100644 index 0000000..11cb2b5 --- /dev/null +++ b/themes/screenshots/catppuccin-frappe.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0704a1aadffee71bc0753c861d8ac8b8588aae76ad8cdcb4f2c2700b98ec095c +size 23814 diff --git a/themes/screenshots/catppuccin-latte.png b/themes/screenshots/catppuccin-latte.png new file mode 100644 index 0000000..8f621f4 --- /dev/null +++ b/themes/screenshots/catppuccin-latte.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:58d56d6e16e14f0eddaa8a11e8bf238f2056e784b9c7c46d88aa8ff2d948355e +size 23110 diff --git a/themes/screenshots/catppuccin-macchiato.png b/themes/screenshots/catppuccin-macchiato.png new file mode 100644 index 0000000..cd0d25b --- /dev/null +++ b/themes/screenshots/catppuccin-macchiato.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:225dba8cf87de1ae7118bfd98a1966fdb92cc826418dd9ef7dda5ee77ae8d0f3 +size 23886 diff --git a/themes/screenshots/catppuccin-mocha.png b/themes/screenshots/catppuccin-mocha.png new file mode 100644 index 0000000..77d3a7d --- /dev/null +++ b/themes/screenshots/catppuccin-mocha.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0c8269cc55fdc26bfff240b3dccd94ffab6400b33c049af23912b74a62247943 +size 23826 diff --git a/themes/screenshots/cherry.png b/themes/screenshots/cherry.png index e64f8eb..345cd85 100644 Binary files a/themes/screenshots/cherry.png and b/themes/screenshots/cherry.png differ diff --git a/themes/screenshots/default.png b/themes/screenshots/default.png index fbd4127..a8f6eab 100644 Binary files a/themes/screenshots/default.png and b/themes/screenshots/default.png differ diff --git a/themes/screenshots/kanagawa-dragon.png b/themes/screenshots/kanagawa-dragon.png index 89d5ddc..26de3d0 100644 Binary files a/themes/screenshots/kanagawa-dragon.png and b/themes/screenshots/kanagawa-dragon.png differ diff --git a/themes/screenshots/kanagawa-wave.png b/themes/screenshots/kanagawa-wave.png index 3d16a9b..796e6ac 100644 Binary files a/themes/screenshots/kanagawa-wave.png and b/themes/screenshots/kanagawa-wave.png differ diff --git a/themes/screenshots/minimal.png b/themes/screenshots/minimal.png index 24d82ec..09fbd6d 100644 Binary files a/themes/screenshots/minimal.png and b/themes/screenshots/minimal.png differ diff --git a/themes/screenshots/nature.png b/themes/screenshots/nature.png index 9de460b..9d08863 100644 Binary files a/themes/screenshots/nature.png and b/themes/screenshots/nature.png differ diff --git a/themes/screenshots/nord.png b/themes/screenshots/nord.png index 9977487..6f3f9a8 100644 Binary files a/themes/screenshots/nord.png and b/themes/screenshots/nord.png differ diff --git a/themes/screenshots/nothing.png b/themes/screenshots/nothing.png index 7308489..a2c4968 100644 Binary files a/themes/screenshots/nothing.png and b/themes/screenshots/nothing.png differ diff --git a/themes/screenshots/old-blue.png b/themes/screenshots/old-blue.png index 868e60b..305d449 100644 Binary files a/themes/screenshots/old-blue.png and b/themes/screenshots/old-blue.png differ diff --git a/themes/screenshots/tasteless.png b/themes/screenshots/tasteless.png index d4c866c..00dc64f 100644 Binary files a/themes/screenshots/tasteless.png and b/themes/screenshots/tasteless.png differ diff --git a/themes/take-screenshots.sh b/themes/take-screenshots.sh index e1db83d..46a51c1 100755 --- a/themes/take-screenshots.sh +++ b/themes/take-screenshots.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash + set -e MYSELF=$(realpath "$0") @@ -16,7 +17,7 @@ if [[ -z "$IM_FLOATING" ]]; then # 12 pts ≈ 16 px exec hyprctl dispatch exec \ "[float; size $((COLS*16)) $((ROWS*16))]" \ - "kitty --override font_size=12.0 --override background_opacity=1 --override cursor_trail=0 --override cursor_shape=beam --override cursor_blink_interval=0 bash -c 'cd \"$PWD\" && IM_FLOATING=1 LIDM_PATH=\"$LIDM_PATH\" LIDM_SCR_TTY=\"$(tty)\" LIDM_SESSIONS_N=\"$LIDM_SESSIONS_N\" \"$MYSELF\"'" + "kitty --override font_size=12.0 --override background_opacity=1 --override cursor_trail=0 --override cursor_shape=beam --override cursor_blink_interval=0 bash -c 'cd \"$PWD\" && IM_FLOATING=1 LIDM_PATH=\"$LIDM_PATH\" LIDM_SCR_TTY=\"$(tty)\" LIDM_SESSIONS_N=\"$LIDM_SESSIONS_N\" bash -i \"$MYSELF\"'" fi LIDM_PATH=${LIDM_PATH:-$(command which lidm)} @@ -44,23 +45,26 @@ printf '\033]4;0;rgb:%s\007' "${BG:0:2}/${BG:2:2}/${BG:4:2}" PRAD=$(hyprctl getoption decoration:rounding | rg int | cut -d' ' -f2) hyprctl keyword decoration:rounding 0 -tty=$(tty) for theme in "$MYDIR"/*.ini; do - LIDM_CONF="$theme" "$LIDM_PATH" <"$tty" & + LIDM_CONF="$theme" "$LIDM_PATH" & LIDM_PID=$! - sleep .2 - for n in $(seq "$LIDM_SESSIONS_N"); do - GEOMETRY=$( - hyprctl -j activewindow | \ - jq -r '(.at[0]|tostring) + "," + (.at[1]|tostring) + " " + (.size[0]|tostring) + "x" + (.size[1]|tostring)' - ) - grim -g "$GEOMETRY" - > "$MYDIR/screenshots/$(basename "$theme" | cut -d. -f1)-$n.png" - notify-send "$n taken" - wtype -k right - sleep .5 - done - kill -15 $LIDM_PID + ( + sleep .2 + for n in $(seq "$LIDM_SESSIONS_N"); do + GEOMETRY=$( + hyprctl -j activewindow | \ + jq -r '(.at[0]|tostring) + "," + (.at[1]|tostring) + " " + (.size[0]|tostring) + "x" + (.size[1]|tostring)' + ) + grim -g "$GEOMETRY" - > "$MYDIR/screenshots/$(basename "$theme" | cut -d. -f1)-$n.png" + notify-send "$n taken" + wtype -k right + sleep .5 + done + kill -15 $LIDM_PID + ) & + + fg %- sleep .5 done @@ -68,9 +72,9 @@ gifski \ -Q 95 --fps 4 \ -W $((COLS*32)) \ -o "$MYDIR/../assets/media/lidm.gif" \ - "$MYDIR"/screenshots/*.png &> "$LIDM_SCR_TTY" + "$MYDIR"/screenshots/*-?.png &> "$LIDM_SCR_TTY" -for screenshot in "$MYDIR"/screenshots/*"-1.png"; do +for screenshot in "$MYDIR"/screenshots/*"-2.png"; do # shellcheck disable=SC2001 mv "$screenshot" "$(sed 's/-[0-9]\.png/.png/' <<<"$screenshot")"