lots of small things

6 files changed, 20 insertions, 8 deletions

diff --git a/.config/git/config b/.config/git/config
index 5370deb..50ffd01 100644
--- a/.config/git/config
+++ b/.config/git/config
@@ -98,7 +98,7 @@
     root = "rev-parse --show-toplevel"
     trailer = "!f() { trailer=${1:-}; ref=${2:-HEAD}; mode='--amend'; [ $ref != 'HEAD' ] && mode='--fixup=$ref'; msg=$(git rev-parse --show-toplevel)/LAST_COMMIT_MSG; git log -1 --format=%B $ref > $msg; git interpret-trailers --in-place --trailer $trailer $msg; git commit --allow-empty --no-verify --only --edit --file $msg $mode; rm $msg; }; f"
     a = add --patch
-    edit = !bash -c 'set -x && git rbi "${1:-HEAD}"^' -
+    edit = !bash -c 'set -x && git ri "${1:-HEAD}"^' -
     oldest-ancestor = !bash -c 'diff -u <(git rev-list --first-parent ${1:-master}) <(git rev-list --first-parent ${2:-HEAD}) | sed -ne \"s/^ //p\" | head -1'
     rebase-onto = !bash -c 'git rebase --onto ${1} `git oldest-ancestor ${2} ${3}` ${3}' -
     find-by-subject = "!f() { set -ex; s=`git log -1 --format=%s ${1}`; git --no-pager log -1 --grep=\"^${s}$\" --no-merges ${2}; }; f"
diff --git a/.config/newsboat/config b/.config/newsboat/config
index 972b390..641cfb2 100644
--- a/.config/newsboat/config
+++ b/.config/newsboat/config
@@ -1,6 +1,6 @@
 article-sort-order date-asc
 auto-reload yes
-browser firefox-nightly-bin
+browser firefox
 
 unbind-key l
 bind-key L toggle-show-read-feeds
diff --git a/.config/newsboat/urls b/.config/newsboat/urls
index 72a49f8..d54ea73 100644
--- a/.config/newsboat/urls
+++ b/.config/newsboat/urls
@@ -9,7 +9,12 @@ https://emersion.fr/blog/rss.xml dev
 https://hacktivis.me/feed.atom dev
 https://wolf480pl.github.io/feed.xml dev
 https://cli.fan/posts/index.xml dev
-https://blog.jessfraz.com/index.xml dev
+# https://blog.jessfraz.com/index.xml dev
 
 https://git.sr.ht/~sircmpwn/aerc/log/rss.xml dev repos
 https://git.sr.ht/~emersion/soju/log/rss.xml dev repos
+
+https://blog.kobol.io/feed.xml
+https://nitter.net/kobol_io/rss
+
+https://torrentfreak.com/feed/
diff --git a/bin/firefox b/bin/firefox
index ed3ddb9..79b3c23 100755
--- a/bin/firefox
+++ b/bin/firefox
@@ -2,15 +2,18 @@
 
 set -x
 
-bin=${FIREFOX_BIN:-firefox-nightly-bin}
+bin=${FIREFOX_BIN:-firefox-wayland}
 
 # enable touch device support
 export MOZ_USE_XINPUT2=1
 export MOZ_WEBRENDER=1
+export XDG_CURRENT_DESKTOP=1
 
 case "$(basename "$0")" in
     firefox|nightly)
         exec "${bin}" --profile $HOME/.mozilla/firefox/wr7p23up.default-nightly $@ ;;
+    firefox-private)
+        exec "${bin}" --profile $HOME/.mozilla/firefox/wr7p23up.default-nightly $@ --private-window ;;
 
     firefox-kiosk)
         exec "${bin}" --profile $HOME/.mozilla/firefox/wr7p23up.default-nightly --ssb $@ ;;
diff --git a/bin/grimshot b/bin/grimshot
index f661dad..4d4dd81 100755
--- a/bin/grimshot
+++ b/bin/grimshot
@@ -19,6 +19,10 @@
 ## `grimshot | grimshot -h` - usage
 ## `grimshot check` - verify if tools are installed
 
+_slurp() {
+  slurp -d -c '#4E437188' -w 3
+}
+
 ACTION=${1:-usage}
 SUBJECT=${2:-screen}
 FILE=${3:-$(xdg-user-dir PICTURES)/screenshots/$(now).png}
@@ -104,7 +108,7 @@ if [ "$ACTION" = "check" ] ; then
   check mktemp
   exit
 elif [ "$SUBJECT" = "area" ] ; then
-  GEOM=$(slurp -d)
+  GEOM=$(_slurp)
   [ -z "$GEOM" ] && die "Selection cancelled"
   WHAT="Area"
 elif [ "$SUBJECT" = "win" ] ; then
diff --git a/bin/trash b/bin/trash
index 4a1de6e..b3c534d 100755
--- a/bin/trash
+++ b/bin/trash
@@ -1,5 +1,7 @@
 #!/bin/sh
+
 set -e
+[ -n "$DEBUG" ] && set -x
 
 TRASH="$HOME/.trash"
 if [ ! -d "$TRASH" ]; then
@@ -34,7 +36,7 @@ EOF
 }
 
 ask() {
-    r=$(printf 'yes\nno\n' | MENU_PROMPT="delete $1" menu)
+    r=$(printf 'yes\nno\n' | MENU_PROMPT="󰩹 delete $1" menu)
     [ "${r}" = "yes" ] && return 0
     return 1
 }
@@ -57,8 +59,6 @@ case "$1" in
         exit 1 ;;
 esac
 
-set -x
-
 # main
 while test $# -gt 0; do
     f="$1" ; shift