From 3a4ed65e66a20b9e15e93f4f73cf8496b493c633 Mon Sep 17 00:00:00 2001 From: Benjamin Chausse Date: Thu, 8 Aug 2024 21:07:31 -0400 Subject: Massive step towards wayland migration --- .config/foot/foot.ini | 2 +- .config/lf/scope | 39 ++++++++------------------------ .config/mimeapps.list | 1 + .config/shortcutrc | 1 + .config/wallpapers/default.jpg | Bin 3587324 -> 4714793 bytes .config/xdg-desktop-portal/portals.conf | 5 ++++ .local/bin/dropdowntoggle | 2 +- .local/bin/makewall | 7 +++--- .local/share/applications/text.desktop | 2 +- .profile | 2 +- 10 files changed, 24 insertions(+), 37 deletions(-) create mode 100644 .config/xdg-desktop-portal/portals.conf diff --git a/.config/foot/foot.ini b/.config/foot/foot.ini index 9d486a5..6331160 100644 --- a/.config/foot/foot.ini +++ b/.config/foot/foot.ini @@ -6,7 +6,7 @@ term=foot # (or xterm-256color if built with -Dterminfo=disabled) app-id=foot # globally set wayland app-id. Default values are "foot" and "footclient" for desktop and server mode title=foot -# locked-title=no +locked-title=no font=monospace:size=8 # font-bold= diff --git a/.config/lf/scope b/.config/lf/scope index 15d5796..e2a77f7 100755 --- a/.config/lf/scope +++ b/.config/lf/scope @@ -8,23 +8,7 @@ PREVIEW_DIR="${XDG_CACHE_HOME:-$HOME/.cache}/lf" PREVIEW_WIDTH=600 # px chafafunc() { - chafa -f sixel -O 0 --polite on -c full --color-space din99d -w 9 -t 0.8 --size "$(($1 -2))"x -} - -# PrefixGen: generates a hash prefix for the given file -# This is a unique identifier for the file to preview -PrefixGen() { - # The file path is hashed instead of the file itself since large files - # can take a long time to hash and the file path is usually enough to - # uniquely identify the file. Also, the suffix is used to determine if - # the preview is outdated (which removes the need to hash the file). - readlink -f "$1" | sha256sum | cut -d' ' -f1 -} - -# SuffixGen: generates a hash suffix for the given file -# This suffix is used to determine if the preview is outdated -SuffixGen() { - stat -Lc "%Y" "$1" + chafa -f sixel -O 0 --polite on -c full --color-space din99d -w 9 -t 0.8 --size "$1"x } # Prevent recursive thumbnails (if the file ends in .six) @@ -49,34 +33,31 @@ abcdefghijklmnopqrstuvwxyz\n""\ 1234567890\n""\ !@#$\%(){}[]-+=_\`~" - convert -size "600x412" xc:'#ffffff' \ - -gravity center -pointsize 28 \ + convert -size "1920x1080" xc:'#ffffff' \ + -gravity center -pointsize 76 \ -font "$1" \ -fill '#000000' \ -annotate +0+0 "$PREVIEW_TEXT" \ - -flatten tiff:- | chafafunc $4 + -flatten jpeg:- | chafafunc $2 ;; image/vnd.djvu) djvused "$1" -e 'select 1; save-page-with /dev/stdout' | - convert djvu:- jpeg:- | chafafunc $4 + convert djvu:- jpeg:- | chafafunc $2 ;; image/webp) - dwebp "$1" -tiff -o - | chafafunc $4 + dwebp "$1" -tiff -o - | chafafunc $2 ;; image/heic) - convert "$1" jpeg:- | chafafunc $4 + convert "$1" jpeg:- | chafafunc $2 ;; image/*) - cat "$1" | chafafunc $4 + cat "$1" | chafafunc $2 ;; */pdf) - pdftocairo -singlefile -scale-to-x $PREVIEW_WIDTH -scale-to-y -1 -jpeg "$1" - | chafafunc $4 + pdftocairo -singlefile -scale-to-x $PREVIEW_WIDTH -scale-to-y -1 -jpeg "$1" - | chafafunc $2 ;; video/*) - prefix="$(PrefixGen "$1")" - suffix="$(SuffixGen "$1")" - filename="$prefix-$suffix" - ffmpegthumbnailer -i "$1" -s 0 -c jpeg -f -o - | chafafunc $4 + ffmpegthumbnailer -i "$1" -s 0 -c jpeg -f -o - | chafafunc $2 ;; application/*zip) atool --list -- "$1" diff --git a/.config/mimeapps.list b/.config/mimeapps.list index 34ceddb..0a6cf5a 100644 --- a/.config/mimeapps.list +++ b/.config/mimeapps.list @@ -4,6 +4,7 @@ x-scheme-handler/magnet=torrent.desktop; application/x-bittorrent=torrent.desktop; x-scheme-handler/mailto=mail.desktop; text/plain=text.desktop; +text/html=text.desktop; application/postscript=pdf.desktop; application/pdf=pdf.desktop; image/png=img.desktop; diff --git a/.config/shortcutrc b/.config/shortcutrc index fdcfbc7..099d2c8 100644 --- a/.config/shortcutrc +++ b/.config/shortcutrc @@ -36,6 +36,7 @@ Neovim, vi, ~/.config/nvim OrgMode, om, ~/Dropbox/org School, sf, ~/Dropbox/A/scholar/sherbrooke/24-05-T2 Scripts, sc, ~/.local/bin +Screenshots, ss, ~/Pictures/captures Wallpapers, wp, ~/Pictures/wallpapers Website, ww, ~/Workspace/chausse.xyz WindowManager, wm, ~/.local/src/dwl diff --git a/.config/wallpapers/default.jpg b/.config/wallpapers/default.jpg index 8986a3b..6a7c1b5 100644 Binary files a/.config/wallpapers/default.jpg and b/.config/wallpapers/default.jpg differ diff --git a/.config/xdg-desktop-portal/portals.conf b/.config/xdg-desktop-portal/portals.conf new file mode 100644 index 0000000..4209507 --- /dev/null +++ b/.config/xdg-desktop-portal/portals.conf @@ -0,0 +1,5 @@ +[preferred] +default=wlr +max-fps=60 +chooser_type=simple +chooser_cmd=slurp -B00000000 -f %o -or diff --git a/.local/bin/dropdowntoggle b/.local/bin/dropdowntoggle index 11f5521..e1f98fb 100755 --- a/.local/bin/dropdowntoggle +++ b/.local/bin/dropdowntoggle @@ -24,7 +24,7 @@ case "$TERMINAL" in ;; *foot) classflag="-a" - titleflag="-T" + titleflag="--title" cmdflag="-e" esac diff --git a/.local/bin/makewall b/.local/bin/makewall index 9edd3c2..991fa11 100755 --- a/.local/bin/makewall +++ b/.local/bin/makewall @@ -1,12 +1,11 @@ #!/bin/sh -# NOTE: (for wayland migration) -# wlr-randr --json | jq -r '.[] | select(.enabled) | .name' - wallDir="$XDG_CONFIG_HOME/wallpapers" +# Reset any existing wallpapers +killall swaybg + # Acquire the list of connected displays -# displays=$(xrandr | grep " connected" | sed 's/^\([a-Z,0-9,-]*\).*/\1/') displays="$(wlr-randr --json | jq -r '.[] | select(.enabled) | .name')" echo "$displays" diff --git a/.local/share/applications/text.desktop b/.local/share/applications/text.desktop index 41ee05f..948407b 100644 --- a/.local/share/applications/text.desktop +++ b/.local/share/applications/text.desktop @@ -1,4 +1,4 @@ [Desktop Entry] Type=Application Name=Text editor -Exec=/usr/local/bin/st -e nvim %u +Exec=/usr/bin/foot -e nvim %u diff --git a/.profile b/.profile index 5ddc883..e9d6b92 100644 --- a/.profile +++ b/.profile @@ -78,7 +78,7 @@ if test -z "$XDG_RUNTIME_DIR"; then fi startw(){ - dbus-run-session sh -c 'dwl' + dbus-launch --exit-with-session dwl } # Start Desktop Environment if on the main TTY -- cgit v1.2.3