dotfiles

commit 674be3ce52cb3169e7a7cc2febbd97ef1cfc25f6
parent 4294236a3616968558973fd5c42aab69ee669419
Author: regexghost <dev@regexghost.com>
Date:   Sat, 20 Jun 2026 18:29:59 +0100

minor changes and added newsraft script combine-feeds.sh

Diffstat:
A
dotfiles/.config/newsraft/combine-feeds.sh
 | 
13
+++++++++++++
M
dotfiles/.config/newsraft/reddit-refresh.sh
 | 
4
++--
M
dotfiles/.kshrc
 | 
4
++--
M
dotfiles/Power_Management-Substitution-jwm-pi-.kshrc
 | 
2
+-
M
lists/dotfiles
 | 
1
+
M
wm-scripts/jwm-scratchpad.sh
 | 
5
++++-

6 files changed, 23 insertions(+), 6 deletions(-)
diff --git a/dotfiles/.config/newsraft/combine-feeds.sh b/dotfiles/.config/newsraft/combine-feeds.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+TMP_DIR="/tmp/combined-feeds"
+
+mkdir -p "$TMP_DIR"
+
+while read feed; do
+	url="$(echo "$feed" | cut -d " " -f 1)"
+	name="$(echo "$feed" | cut -d " " -f 2-)"
+	curl -s "$url" > "${TMP_DIR}/${name}.xml"
+done < ~/.config/newsraft/combined-feeds.txt
+
+xmlstarlet sel -t -c "//*[local-name()='entry']" "$TMP_DIR"/* | echo "<feed>$(cat)</feed>"
diff --git a/dotfiles/.config/newsraft/reddit-refresh.sh b/dotfiles/.config/newsraft/reddit-refresh.sh
@@ -3,11 +3,11 @@
 USER_AGENT="NetSurf/3.10 (Linux)"
 TMP_LOC="/tmp/reddit-rss"
 
-[ -d "$XDG_CACHE_HOME/reddit-rss" ] && cp "$XDG_CACHE_HOME/reddit-rss" "$TMP_LOC" || mkdir "$TMP_LOC"
+[ -d "$XDG_CACHE_HOME/reddit-rss" ] && cp -r "$XDG_CACHE_HOME/reddit-rss" "$TMP_LOC" || mkdir "$TMP_LOC"
 
 while true; do
 	while read -r subreddit; do
-		sleep 20
+		sleep 60
 		curl -s -L --user-agent "$USER_AGENT" "https://www.reddit.com/r/${subreddit}/top/.rss?t=week" > "${TMP_LOC}/r.${subreddit}"
 	done < "$XDG_CONFIG_HOME/newsraft/reddit-rss.txt"
 	sleep 3600
diff --git a/dotfiles/.kshrc b/dotfiles/.kshrc
@@ -268,8 +268,8 @@ alias queue-vid='~/.config/newsraft/queue-vid.sh'
 
 # Search commands
 
-alias hs='history'
-alias his='history | grep'
+alias hs='nl ~/.history'
+alias his='nl ~/.history | grep'
 
 ## Search root directory
 findr () {
diff --git a/dotfiles/Power_Management-Substitution-jwm-pi-.kshrc b/dotfiles/Power_Management-Substitution-jwm-pi-.kshrc
@@ -3,7 +3,7 @@
 shutdown_commands () {
 	mocp -M "$XDG_CONFIG_HOME/moc" --stop
 	rm -rf "$XDG_CACHE_HOME/reddit-rss"
-	cp /tmp/reddit-rss "$XDG_CACHE_HOME/reddit-rss"
+	cp -r /tmp/reddit-rss "$XDG_CACHE_HOME/reddit-rss"
 	tmux send-keys -t buffer_tmux.o C-s
 	tmux send-keys -t buffer_tmux.o C-q
 	tmux kill-session -t buffer_tmux
diff --git a/lists/dotfiles b/lists/dotfiles
@@ -34,3 +34,4 @@
 ~/.config/newsraft/reddit-gallery.sh
 ~/.config/newsraft/article.sh
 ~/.config/newsraft/reddit-refresh.sh
+~/.config/newsraft/combine-feeds.sh
diff --git a/wm-scripts/jwm-scratchpad.sh b/wm-scripts/jwm-scratchpad.sh
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 scratchpad="$(xdotool search --class "scratchpad")"
+old_focus="$(cat ~/.cache/old_window)"
 
 launch_window () {
 	tmux new-session -d -s "buffer_tmux" 'nano ~/Downloads/buffer.md; bash'
@@ -13,10 +14,12 @@ launch_window () {
 hide_window () {
 	xdotool windowmove "$scratchpad" -1000 -1000
 #	xdotool set_desktop_for_window "$scratchpad" 5
-	xdotool windowminimize "$scratchpad"
+	xdotool windowactivate "$old_focus"
+#	xdotool windowminimize "$scratchpad"
 }
 
 show_window () {
+	xdotool getactivewindow > ~/.cache/old_window
 	desktop="$(xdotool get_desktop)"
 	xdotool set_desktop_for_window "$scratchpad" "$desktop"
 	xdotool windowmove "$scratchpad" 610 300