From b0f35f3492291f42778db6a79596aab04da8d3a9 Mon Sep 17 00:00:00 2001 From: Zhongheng Liu Date: Fri, 3 Oct 2025 12:47:49 +0200 Subject: [PATCH 1/2] bump dwl && scripts setup --- dwl | 2 +- scripts/Makefile | 17 +++++++++++++++++ scripts/src/batman.sh | 1 + scripts/src/screenshot.sh | 1 + 4 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 scripts/Makefile create mode 100755 scripts/src/batman.sh create mode 100755 scripts/src/screenshot.sh diff --git a/dwl b/dwl index 6cd2656..1bfd2e9 160000 --- a/dwl +++ b/dwl @@ -1 +1 @@ -Subproject commit 6cd26568d5b8be2252ac0def36cd194b4fb2d7c3 +Subproject commit 1bfd2e92e80db3821726a054c2fd3ca2db564a48 diff --git a/scripts/Makefile b/scripts/Makefile new file mode 100644 index 0000000..b0233d0 --- /dev/null +++ b/scripts/Makefile @@ -0,0 +1,17 @@ +SHELL := /bin/bash + +DEST := /usr/local/bin +SRC := ./src/ +install: + @if [ "$$(id -u)" -ne 0 ]; then \ + echo "Error: You must be root to run 'make install'."; \ + exit 1; \ + fi + @find $(SRC) -type f | while IFS= read -r fpath; do \ + filename="$${fpath##*/}"; \ + echo "Installing $$filename ..."; \ + install -m 755 "$$fpath" "$(DEST)/$$filename"; \ + done + + + diff --git a/scripts/src/batman.sh b/scripts/src/batman.sh new file mode 100755 index 0000000..17405b6 --- /dev/null +++ b/scripts/src/batman.sh @@ -0,0 +1 @@ +echo "BAT1: $(calc -p round\($(cat /sys/class/power_supply/BAT1/charge_now)/$(cat /sys/class/power_supply/BAT1/charge_full)\*100, 1\))% # $(cat /sys/class/power_supply/BAT1/status)" diff --git a/scripts/src/screenshot.sh b/scripts/src/screenshot.sh new file mode 100755 index 0000000..2cb8d22 --- /dev/null +++ b/scripts/src/screenshot.sh @@ -0,0 +1 @@ +slurp | grim -g - - | wl-copy From 4e689bf5de0e3f469c84dd508b2791ceafc51f9a Mon Sep 17 00:00:00 2001 From: Zhongheng Liu Date: Mon, 6 Oct 2025 02:22:32 +0200 Subject: [PATCH 2/2] update config --- .gitmodules | 3 +++ Makefile | 3 ++- dwl | 2 +- dwlb | 1 + scripts/src/batman.sh | 2 +- scripts/src/launch_dwlb.sh | 2 ++ scripts/src/screenshot-file.sh | 5 +++++ 7 files changed, 15 insertions(+), 3 deletions(-) create mode 160000 dwlb create mode 100755 scripts/src/launch_dwlb.sh create mode 100755 scripts/src/screenshot-file.sh diff --git a/.gitmodules b/.gitmodules index 35669cf..c56c6f4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,3 +10,6 @@ [submodule "dwl"] path = dwl url = git@stvnliu.me:steven/dwl-custom +[submodule "dwlb"] + path = dwlb + url = git@stvnliu.me:steven/dwlb-custom diff --git a/Makefile b/Makefile index 7f28ab7..3abf4d2 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,8 @@ install: + cd ./scripts && $(MAKE) install && cd .. cd ./dwl && $(MAKE) install && cd .. cd ./somebar && meson setup build --reconfigure && ninja -C build && ninja -C build install && cd .. cd ./someblocks && $(MAKE) install && cd .. - cd ./wmenu && meson setup build --reconfigure && ninja -C build && ninja -C build install && cd .. \ No newline at end of file + cd ./wmenu && meson setup build --reconfigure && ninja -C build && ninja -C build install && cd .. diff --git a/dwl b/dwl index 1bfd2e9..c643413 160000 --- a/dwl +++ b/dwl @@ -1 +1 @@ -Subproject commit 1bfd2e92e80db3821726a054c2fd3ca2db564a48 +Subproject commit c643413742e5a500bc4c3254608d905be02a81a4 diff --git a/dwlb b/dwlb new file mode 160000 index 0000000..48dbe00 --- /dev/null +++ b/dwlb @@ -0,0 +1 @@ +Subproject commit 48dbe00bdb98a1ae6a0e60558ce14503616aa759 diff --git a/scripts/src/batman.sh b/scripts/src/batman.sh index 17405b6..8ee72fb 100755 --- a/scripts/src/batman.sh +++ b/scripts/src/batman.sh @@ -1 +1 @@ -echo "BAT1: $(calc -p round\($(cat /sys/class/power_supply/BAT1/charge_now)/$(cat /sys/class/power_supply/BAT1/charge_full)\*100, 1\))% # $(cat /sys/class/power_supply/BAT1/status)" +echo "$(calc -p round\($(cat /sys/class/power_supply/BAT1/charge_now)/$(cat /sys/class/power_supply/BAT1/charge_full)\*100, 1\))%" diff --git a/scripts/src/launch_dwlb.sh b/scripts/src/launch_dwlb.sh new file mode 100755 index 0000000..88b8d11 --- /dev/null +++ b/scripts/src/launch_dwlb.sh @@ -0,0 +1,2 @@ +dwlb -ipc -font "BlexMono Nerd Font:size=16" & +someblocks -p | dwlb -status-stdin all diff --git a/scripts/src/screenshot-file.sh b/scripts/src/screenshot-file.sh new file mode 100755 index 0000000..46d9a73 --- /dev/null +++ b/scripts/src/screenshot-file.sh @@ -0,0 +1,5 @@ +#!/usr/bin/sh +IFS="" +file="$HOME/Screenshots/$(date '+%Y-%m-%d-%H-%M-%S.png')" +echo $file +slurp | grim -g - $file