summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ar/.config/TheSiahxyz/lua/TheSiahxyz/snippets/diary.lua (renamed from ar/.config/TheSiahxyz/lua/TheSiahxyz/snippets/recordings.lua)8
-rw-r--r--ar/.config/fontconfig/fonts.conf6
-rw-r--r--ar/.config/htop/htoprc97
-rw-r--r--ar/.config/shell/aliasrc6
-rwxr-xr-xar/.local/bin/fzffiles2
-rwxr-xr-xar/.local/bin/hugow64
-rwxr-xr-xar/.local/bin/remaps7
-rwxr-xr-xar/.local/bin/statusbar/sb-clock2
-rwxr-xr-xar/.local/bin/statusbar/sb-internet52
-rwxr-xr-xar/.local/bin/statusbar/sb-keyboard4
-rwxr-xr-xar/.local/bin/statusbar/sb-repos2
-rwxr-xr-xar/.local/bin/ylog40
-rwxr-xr-xdebian/.local/bin/fzffiles2
-rw-r--r--mac/.config/TheSiahxyz/lua/TheSiahxyz/snippets/diary.lua (renamed from mac/.config/TheSiahxyz/lua/TheSiahxyz/snippets/recordings.lua)8
-rw-r--r--mac/.config/shell/aliasrc6
-rwxr-xr-xmac/.local/bin/fzffiles9
-rwxr-xr-xmac/.local/bin/hugow10
-rwxr-xr-xmac/.local/bin/ylog40
18 files changed, 245 insertions, 120 deletions
diff --git a/ar/.config/TheSiahxyz/lua/TheSiahxyz/snippets/recordings.lua b/ar/.config/TheSiahxyz/lua/TheSiahxyz/snippets/diary.lua
index 9ce9124..90528a1 100644
--- a/ar/.config/TheSiahxyz/lua/TheSiahxyz/snippets/recordings.lua
+++ b/ar/.config/TheSiahxyz/lua/TheSiahxyz/snippets/diary.lua
@@ -6,8 +6,8 @@ local f = ls.function_node
local fmt = require("luasnip.extras.fmt").fmta
-local recordings_snippet = s(
- "recordings",
+local diary_snippet = s(
+ "diary",
fmt(
[[---
title: <title>
@@ -26,5 +26,5 @@ date: <date>
)
)
-ls.add_snippets("markdown", { recordings_snippet })
-ls.add_snippets("quarto", { recordings_snippet })
+ls.add_snippets("markdown", { diary_snippet })
+ls.add_snippets("quarto", { diary_snippet })
diff --git a/ar/.config/fontconfig/fonts.conf b/ar/.config/fontconfig/fonts.conf
index 935549d..c5ac402 100644
--- a/ar/.config/fontconfig/fonts.conf
+++ b/ar/.config/fontconfig/fonts.conf
@@ -7,7 +7,6 @@
<family>Source Han Serif KR</family>
<family>DejaVu Serif</family>
<family>Droid Serif</family>
- <family>Libertinus Serif</family>
<family>Joy Pixels</family>
<family>Noto Color Emoji</family>
<family>FontAwesome</family>
@@ -19,7 +18,6 @@
<family>Source Han Serif KR</family>
<family>DejaVu Serif</family>
<family>Droid Serif</family>
- <family>Libertinus Serif</family>
<family>Joy Pixels</family>
<family>Noto Color Emoji</family>
<family>FontAwesome</family>
@@ -31,7 +29,6 @@
<family>Source Han Sans KR</family>
<family>DejaVu Sans</family>
<family>Droid Sans</family>
- <family>Libertinus Sans</family>
<family>Joy Pixels</family>
<family>Noto Color Emoji</family>
<family>FontAwesome</family>
@@ -42,7 +39,6 @@
<prefer>
<family>Noto Sans Mono</family>
<family>Noto Sans Mono CJK KR</family>
- <family>Libertinus Mono</family>
<family>FontAwesome</family>
<family>Braille</family>
</prefer>
@@ -52,7 +48,6 @@
<prefer>
<family>D2CodingLigature Nerd Font Mono</family>
<family>Hack Nerd Font Mono</family>
- <family>Libertinus Mono</family>
<family>FontAwesome</family>
<family>Braille</family>
</prefer>
@@ -62,7 +57,6 @@
<prefer>
<family>Noto Sans CJK KR</family>
<family>D2CodingLigature Nerd Font</family>
- <family>Libertinus</family>
<family>FontAwesome</family>
<family>Braille</family>
</prefer>
diff --git a/ar/.config/htop/htoprc b/ar/.config/htop/htoprc
index 8666417..6df10ed 100644
--- a/ar/.config/htop/htoprc
+++ b/ar/.config/htop/htoprc
@@ -1,53 +1,72 @@
# Beware! This file is rewritten by htop when settings are changed in the interface.
# The parser is also very primitive, and not human-friendly.
-.all_branches_collapsed=0
-.sort_direction=-1
-.sort_key=PERCENT_CPU
-.tree_sort_direction=1
-.tree_sort_key=PID
-.tree_view=0
-.tree_view_always_by_pid=0
-account_guest_in_cpu_meter=0
-all_branches_collapsed=0
-color_scheme=5
-column_meter_modes_0=1 1 1 2 2 2 1
-column_meter_modes_1=
-column_meters_0=LeftCPUs Memory Swap Uptime LoadAverage Tasks RightCPUs
-column_meters_1=
+htop_version=3.4.1-ee21c79
config_reader_min_version=3
-cpu_count_from_one=0
-delay=15
-detailed_cpu_time=0
-enable_mouse=1
-fields=0 48 17 18 38 39 2 46 46 47 49 1
-find_comm_in_cmdline=1
-header_layout=two_50_50
-header_margin=1
-hide_function_bar=0
+fields=0 48 17 18 38 39 40 2 46 47 49 1
hide_kernel_threads=1
-hide_running_in_container=0
hide_userland_threads=0
+hide_running_in_container=0
+shadow_other_users=1
+show_thread_names=0
+show_program_path=1
highlight_base_name=1
-highlight_changes=1
-highlight_changes_delay_secs=1
highlight_deleted_exe=1
+shadow_distribution_path_prefix=0
highlight_megabytes=1
highlight_threads=1
-htop_version=3.3.0-dev
-screen:Main=PID USER PRIORITY NICE M_VIRT M_RESIDENT STATE PERCENT_CPU PERCENT_MEM TIME Command
+highlight_changes=1
+highlight_changes_delay_secs=1
+find_comm_in_cmdline=1
+strip_exe_from_cmdline=1
+show_merged_command=0
+header_margin=1
screen_tabs=1
-shadow_distribution_path_prefix=0
-shadow_other_users=1
-show_cpu_frequency=1
+detailed_cpu_time=0
+cpu_count_from_one=0
show_cpu_usage=1
-show_merged_command=0
-show_program_path=1
-show_thread_names=0
-sort_direction=-1
+show_cpu_frequency=1
+show_cpu_temperature=0
+degree_fahrenheit=0
+show_cached_memory=1
+update_process_names=0
+account_guest_in_cpu_meter=0
+color_scheme=6
+enable_mouse=1
+delay=15
+hide_function_bar=0
+header_layout=two_50_50
+column_meters_0=LeftCPUs2 Memory Swap
+column_meter_modes_0=1 1 1
+column_meters_1=RightCPUs2 Tasks LoadAverage Uptime
+column_meter_modes_1=1 2 2 2
+tree_view=0
sort_key=46
-strip_exe_from_cmdline=1
-tree_sort_direction=1
tree_sort_key=0
-tree_view=0
+sort_direction=-1
+tree_sort_direction=1
tree_view_always_by_pid=0
-update_process_names=0
+all_branches_collapsed=0
+screen:Main=PID USER PRIORITY NICE M_VIRT M_RESIDENT M_SHARE STATE PERCENT_CPU PERCENT_MEM TIME Command
+.sort_key=PERCENT_CPU
+.tree_sort_key=PID
+.tree_view_always_by_pid=0
+.tree_view=0
+.sort_direction=-1
+.tree_sort_direction=1
+.all_branches_collapsed=0
+screen:I/O=PID USER IO_PRIORITY IO_RATE IO_READ_RATE IO_WRITE_RATE PERCENT_SWAP_DELAY PERCENT_IO_DELAY Command
+.sort_key=IO_RATE
+.tree_sort_key=PID
+.tree_view_always_by_pid=0
+.tree_view=0
+.sort_direction=-1
+.tree_sort_direction=1
+.all_branches_collapsed=0
+screen:Main=PID USER PRIORITY NICE M_VIRT M_RESIDENT STATE PERCENT_CPU PERCENT_MEM TIME Command
+.sort_key=PID
+.tree_sort_key=PID
+.tree_view_always_by_pid=0
+.tree_view=0
+.sort_direction=1
+.tree_sort_direction=1
+.all_branches_collapsed=0
diff --git a/ar/.config/shell/aliasrc b/ar/.config/shell/aliasrc
index 55f04e7..8061a60 100644
--- a/ar/.config/shell/aliasrc
+++ b/ar/.config/shell/aliasrc
@@ -488,6 +488,6 @@ alias szs="source ${XDG_CONFIG_HOME:-${HOME}/.config}/zsh/.zshrc"
alias ylogh='ylog -s hidden -c us | grep $(LC_TIME=C date +%d/%b) | grep -E "[0-9]{2}:[0-9]{2}:[0-9]{2} "'
alias ylogi='ylog -s hidden -c us | grep $(LC_TIME=C date -v-1d +%d/%b) | grep -E "[0-9]{2}:[0-9]{2}:[0-9]{2} "'
-alias ylogt='ylog -s recordings -c us | grep $(LC_TIME=C date +%d/%b) | grep -E "[0-9]{2}:[0-9]{2}:[0-9]{2} "'
-alias ylogy='ylog -s recordings -c us | grep $(LC_TIME=C date -v-1d +%d/%b) | grep -E "[0-9]{2}:[0-9]{2}:[0-9]{2} "'
-alias ylogu='ylog -s recordings -c us'
+alias ylogt='ylog -s diary -c us | grep $(LC_TIME=C date +%d/%b) | grep -E "[0-9]{2}:[0-9]{2}:[0-9]{2} "'
+alias ylogy='ylog -s diary -c us | grep $(LC_TIME=C date -d "yesterday" +%d/%b) | grep -E "[0-9]{2}:[0-9]{2}:[0-9]{2} "'
+alias ylogu='ylog -s diary -c us'
diff --git a/ar/.local/bin/fzffiles b/ar/.local/bin/fzffiles
index 97047e9..9f5cd90 100755
--- a/ar/.local/bin/fzffiles
+++ b/ar/.local/bin/fzffiles
@@ -35,7 +35,7 @@ files=$(fzf-tmux \
fi
fi
if [ -d \"\$target\" ]; then
- exa --color=always --long --all --header --icons --git \"\$target\"
+ eza --color=always --long --all --header --icons --git \"\$target\"
elif [ -f \"\$target\" ]; then
bat --color=always --style=header,grid --line-range=:500 \"\$target\"
else
diff --git a/ar/.local/bin/hugow b/ar/.local/bin/hugow
index 0460174..13cdf51 100755
--- a/ar/.local/bin/hugow
+++ b/ar/.local/bin/hugow
@@ -2,11 +2,11 @@
set -eu
repodir="$HOME/Private/repos/THESIAH"
-out="$repodir/public/recordings/index.html"
+out="$repodir/public/diary/index.html"
server="${THESIAH_SERVER:-root@thesiah.xyz}"
-dest="/var/www/thesiah/recordings/"
+dest="/var/www/thesiah/diary/"
defaults="sy after foramonth"
-src="$repodir/public/recordings/"
+src="$repodir/public/diary/"
cd "$repodir"
hugo --cleanDestinationDir
@@ -16,35 +16,35 @@ if [ ! -f "$out" ]; then
exit 1
fi
-tmp="$(mktemp "$out.XXXXXXXX.tmp")"
-
-awk -v defaults="$defaults" '
-BEGIN {
- n = split(defaults, a, /[[:space:]]+/)
- insert = ""
- for (i = 1; i <= n; i++) {
- if (a[i] == "") continue
- name = a[i] ".mp4"
- insert = insert \
-" <li>\n" \
-" <a href=\"/recordings/" name "\" data-name=\"" name "\" class=\"vid\">" name "</a>\n" \
-" </li>\n"
- }
- injected = 0
-}
-{
- print
- if (!injected && $0 ~ /<ul[^>]*id=["'\''"]list["'\''"][^>]*>/) {
- printf("%s", insert)
- injected = 1
- }
-}
-END { if (!injected) exit 2 }
-' "$out" >"$tmp"
-
-mv "$tmp" "$out"
-echo "Injected defaults into: $out"
+# tmp="$(mktemp "$out.XXXXXXXX.tmp")"
+# awk -v defaults="$defaults" '
+# BEGIN {
+# n = split(defaults, a, /[[:space:]]+/)
+# insert = ""
+# for (i = 1; i <= n; i++) {
+# if (a[i] == "") continue
+# name = a[i] ".mp4"
+# insert = insert \
+# " <li>\n" \
+# " <a href=\"/diary/" name "\" data-name=\"" name "\" class=\"vid\">" name "</a>\n" \
+# " </li>\n"
+# }
+# injected = 0
+# }
+# {
+# print
+# if (!injected && $0 ~ /<ul[^>]*id=["'\''"]list["'\''"][^>]*>/) {
+# printf("%s", insert)
+# injected = 1
+# }
+# }
+# END { if (!injected) exit 2 }
+# ' "$out" >"$tmp"
+#
+# mv "$tmp" "$out"
+# echo "Injected defaults into: $out"
+#
ssh "$server" "mkdir -p '$dest'"
if [ -n "${THESIAH_SSH_OPTS:-}" ]; then
@@ -57,7 +57,7 @@ else
fi
if [ -n "${1-}" ]; then
- new="$repodir/content/recordings/$1"
+ new="$repodir/content/diary/$1"
if [ -f "$new" ]; then
rsync -az --update "$new" "$server:$dest"
elif [ -d "$new" ]; then
diff --git a/ar/.local/bin/remaps b/ar/.local/bin/remaps
index 93832ea..580076d 100755
--- a/ar/.local/bin/remaps
+++ b/ar/.local/bin/remaps
@@ -10,6 +10,10 @@ xinput list | grep 'id=' | while read -r line; do
mouse=$(echo "$line" | grep -i '.*id.*pointer' | sed 's/.*id=\([0-9]\+\).*/\1/')
[ -z "$keyboard" ] || {
case "$(echo "$line" | grep -oE '.*id=' | sed 's/ id=.*//')" in
+ *"Lenovo TrackPoint Keyboard II"*)
+ setxkbmap -device "$keyboard" -option
+ setxkbmap -device "$keyboard" -option caps:ctrl_modifier,altwin:menu_win,altwin:swap_lalt_lwin
+ ;;
*"Lite-On Tech Lenovo USB Travel Keyboard with Ultra Nav"*)
setxkbmap -device "$keyboard" -option
setxkbmap -device "$keyboard" -option caps:ctrl_modifier,ctrl:swap_lwin_lctl
@@ -43,6 +47,9 @@ xinput list | grep 'id=' | while read -r line; do
*"SynPS/2 Synaptics TouchPad"*)
xinput set-prop "$mouse" "libinput Tapping Enabled" 0
;;
+ *"Lenovo TrackPoint Keyboard II"*)
+ [ -z "$1" ] && xinput set-prop "$mouse" "Coordinate Transformation Matrix" 5, 0, 0, 0, 5, 0, 0, 0, 1 || xinput set-prop "$mouse" "Coordinate Transformation Matrix" $1, 0, 0, 0, $1, 0, 0, 0, 1
+ ;;
*"Lite-On Tech Lenovo USB Travel Keyboard with Ultra Nav Mouse"*)
[ -z "$1" ] && xinput set-prop "$mouse" "Coordinate Transformation Matrix" 5, 0, 0, 0, 5, 0, 0, 0, 1 || xinput set-prop "$mouse" "Coordinate Transformation Matrix" $1, 0, 0, 0, $1, 0, 0, 0, 1
xinput set-prop "$mouse" "libinput Scroll Method Enabled" 0, 0, 1
diff --git a/ar/.local/bin/statusbar/sb-clock b/ar/.local/bin/statusbar/sb-clock
index a5992a5..d909326 100755
--- a/ar/.local/bin/statusbar/sb-clock
+++ b/ar/.local/bin/statusbar/sb-clock
@@ -1,7 +1,7 @@
#!/bin/sh
# Get current hour and minute
-calendar="🗓️"
+calendar="🗓"
hour=$(date '+%I')
minute=$(date '+%M')
diff --git a/ar/.local/bin/statusbar/sb-internet b/ar/.local/bin/statusbar/sb-internet
index df43676..baa5ebd 100755
--- a/ar/.local/bin/statusbar/sb-internet
+++ b/ar/.local/bin/statusbar/sb-internet
@@ -4,34 +4,74 @@
# Show 🌐 if connected to ethernet or ❎ if none.
# Show 🛰️ if a vpn connection is active
+eth_con="$(nmcli -t -f NAME,TYPE,DEVICE connection show |
+ awk -F: '$2=="ethernet" && $3!="" { print $1; exit }')"
+
+wifi_con="$(nmcli -t -f NAME,TYPE connection show |
+ awk -F: '$2=="wifi" { print $1; exit }')"
+
+if [ -n "$eth_con" ]; then
+ nmcli connection modify "$eth_con" ipv4.method auto
+ nmcli connection modify "$eth_con" ipv4.never-default no
+ nmcli connection modify "$eth_con" ipv4.dns-priority -42
+ nmcli connection modify "$eth_con" ipv4.route-metric 100
+ nmcli connection modify "$eth_con" connection.autoconnect yes
+fi
+
+if [ -n "$wifi_con" ]; then
+ nmcli connection modify "$wifi_con" ipv4.dns-priority 100
+ nmcli connection modify "$wifi_con" ipv4.route-metric 600
+fi
+
case $BLOCK_BUTTON in
1)
"$TERMINAL" -e nmtui
pkill -RTMIN+7 dwmblocks
;;
+2)
+ wifi_dev="$(nmcli -t -f DEVICE,TYPE device |
+ awk -F: '$2=="wifi" { print $1; exit }')"
+
+ wifi_state="$(nmcli -t -f DEVICE,STATE device |
+ awk -F: -v dev="$wifi_dev" '$1==dev { print $2 }')"
+
+ if [ "$wifi_state" = "connected" ]; then
+ nmcli radio wifi off
+ notify-send "Wi-Fi" "Wi-Fi disconnected"
+ else
+ nmcli radio wifi on
+ notify-send "Wi-Fi" "Wi-Fi connected"
+ fi
+
+ pkill -RTMIN+7 dwmblocks
+ ;;
3) notify-send "🌐 Internet module" "\- Left click to connect
❌: wifi disabled
📡: no wifi connection
🛜: wifi connection with quality
❎: no ethernet
🌐: ethernet working
-🛰️: vpn is active
+🛰: vpn is active
" ;;
6) setsid -f "$TERMINAL" -e "$EDITOR" "$0" ;;
esac
# Wifi
-if grep -q 'up' /sys/class/net/w*/operstate; then
- wifiicon="$(awk '/^\s*w/ { print "🛜" int($3 * 100 / 70) "%" }' /proc/net/wireless)"
-elif grep -q 'down' /sys/class/net/w*/operstate; then
- grep -q '0x1003' /sys/class/net/w*/flags && wifiicon="📡" || wifiicon="❌"
+if grep -q 'up' /sys/class/net/w*/operstate 2>/dev/null; then
+ if grep -q '^\s*w' /proc/net/wireless; then
+ wifiicon="$(awk '/^\s*w/ { print "🛜" int($3 * 100 / 70) "%" }' /proc/net/wireless)"
+ else
+ wifiicon="📡"
+ fi
+elif grep -q 'down' /sys/class/net/w*/operstate 2>/dev/null; then
+ wifiicon="❌"
fi
# Ethernet
grep -q 'up' /sys/class/net/e*/operstate && ethericon="🌐" || ethericon="❎"
# TUN
-[ -n "$(cat /sys/class/net/tun*/operstate 2>/dev/null)" ] && tunicon="🛰️"
+grep -q 'up' /sys/class/net/tun*/operstate 2>/dev/null && tunicon="🛰"
icons=""
[ -n "$wifiicon" ] && icons="${icons}$wifiicon "
diff --git a/ar/.local/bin/statusbar/sb-keyboard b/ar/.local/bin/statusbar/sb-keyboard
index 34fa2bc..67b5f6d 100755
--- a/ar/.local/bin/statusbar/sb-keyboard
+++ b/ar/.local/bin/statusbar/sb-keyboard
@@ -5,7 +5,7 @@
case $BLOCK_BUTTON in
1) fcitx5-remote -t && kill -44 "$(pidof "${STATUSBAR:-dwmblocks}")" ;;
2) remaps ;;
-3) notify-send "⌨️ Input Method module" "\- Shows current input method (defalt US)
+3) notify-send "⌨ Input Method module" "\- Shows current input method (defalt US)
- Left click to switch language (EN/KO)
- Middle click to change keyboard" ;;
6) setsid -f "$TERMINAL" -e "$EDITOR" "$0" ;;
@@ -28,4 +28,4 @@ hangul) lang="KO" ;;
*) lang="??" ;;
esac
-echo "⌨️$lang"
+echo "⌨$lang"
diff --git a/ar/.local/bin/statusbar/sb-repos b/ar/.local/bin/statusbar/sb-repos
index 2c259ba..d5acfac 100755
--- a/ar/.local/bin/statusbar/sb-repos
+++ b/ar/.local/bin/statusbar/sb-repos
@@ -9,7 +9,7 @@ private_repos="$HOME/Private/repos"
public_repos="${XDG_PUBLICSHARE_DIR:-${HOME}/Public}/repos"
# Icon indicators
-dotfiles_icon="⚙️"
+dotfiles_icon="⚙"
suckless_icon="🛠"
private_icon="🏠"
public_icon="🏢"
diff --git a/ar/.local/bin/ylog b/ar/.local/bin/ylog
index 254803b..c56df36 100755
--- a/ar/.local/bin/ylog
+++ b/ar/.local/bin/ylog
@@ -5,7 +5,7 @@ LOG_DIR="/var/log/nginx"
TARGET="all" # "all" means no target filter (show all lines)
COUNTRY="all" # all|kr|us
-SCOPE="all" # all|access|recordings
+SCOPE="all" # all|access|recordings|hidden|diary|peertube
EXCL_FIREFOX=0 # 1 = exclude Firefox lines by default
EXCLUDES="59.19.56.8" # default exclude pattern
ADD_EXCLUDES=""
@@ -24,13 +24,16 @@ Options:
-c COUNTRY Select country logs (default: all)
all : all logs
- kr : recordings.kr.log + recordings.access.log
- us : recordings.us.log + recordings.access.log
+ kr : recordings.kr.log + recordings.access.log (and diary.kr.log when -s diary)
+ us : recordings.us.log + recordings.access.log (and diary.us.log when -s diary)
-s SCOPE Select log scope (default: all)
- all : recordings + access
+ all : recordings + access + hidden + diary + peertube
recordings : recordings.* logs only
access : access.* logs only
+ hidden : hidden.access.* logs only
+ diary : diary.* logs only
+ peertube : peertube.* logs only
-n Disable Firefox exclusion (by default, Firefox lines are excluded)
@@ -51,7 +54,10 @@ Options:
Examples:
ylog # All logs, last 10 lines each
ylog -s recordings # Recordings logs only, last 10 lines each
+ ylog -s diary # Diary logs only, last 10 lines each
+ ylog -s peertube # Peertube logs only, last 10 lines each
ylog -c kr -t 1.2.3.4 # Search specific IP in Korean logs
+ ylog -c kr -s diary # Korean diary logs only
ylog -t all -l 50 # All logs, last 50 lines each
ylog -d 1 # Logs from 1 day ago only
ylog -d ~2 # Logs from 2 days ago to today
@@ -119,6 +125,32 @@ pick_files() {
[ -e "$q" ] && printf "%s\n" "$q"
done
fi
+ # diary logs: similar structure to recordings
+ if [ "$SCOPE" = "diary" ] || [ "$SCOPE" = "all" ]; then
+ if [ "$COUNTRY" = "all" ]; then
+ for q in "$LOG_DIR/diary.access.log" "$LOG_DIR/diary.access.log".*; do
+ [ -e "$q" ] && printf "%s\n" "$q"
+ done
+ fi
+ case "$COUNTRY" in
+ kr) for q in "$LOG_DIR/diary.kr.log" "$LOG_DIR/diary.kr.log".*; do [ -e "$q" ] && printf "%s\n" "$q"; done ;;
+ us) for q in "$LOG_DIR/diary.us.log" "$LOG_DIR/diary.us.log".*; do [ -e "$q" ] && printf "%s\n" "$q"; done ;;
+ all)
+ for p in diary.kr.log diary.us.log; do
+ for q in "$LOG_DIR/$p" "$LOG_DIR/$p".*; do [ -e "$q" ] && printf "%s\n" "$q"; done
+ done
+ ;;
+ esac
+ fi
+ # peertube logs
+ if [ "$SCOPE" = "peertube" ] || [ "$SCOPE" = "all" ]; then
+ for q in "$LOG_DIR/peertube.access.log" "$LOG_DIR/peertube.access.log".*; do
+ [ -e "$q" ] && printf "%s\n" "$q"
+ done
+ for q in "$LOG_DIR/peertube.error.log" "$LOG_DIR/peertube.error.log".*; do
+ [ -e "$q" ] && printf "%s\n" "$q"
+ done
+ fi
}
# build exclude regex
diff --git a/debian/.local/bin/fzffiles b/debian/.local/bin/fzffiles
index 97047e9..9f5cd90 100755
--- a/debian/.local/bin/fzffiles
+++ b/debian/.local/bin/fzffiles
@@ -35,7 +35,7 @@ files=$(fzf-tmux \
fi
fi
if [ -d \"\$target\" ]; then
- exa --color=always --long --all --header --icons --git \"\$target\"
+ eza --color=always --long --all --header --icons --git \"\$target\"
elif [ -f \"\$target\" ]; then
bat --color=always --style=header,grid --line-range=:500 \"\$target\"
else
diff --git a/mac/.config/TheSiahxyz/lua/TheSiahxyz/snippets/recordings.lua b/mac/.config/TheSiahxyz/lua/TheSiahxyz/snippets/diary.lua
index 9ce9124..90528a1 100644
--- a/mac/.config/TheSiahxyz/lua/TheSiahxyz/snippets/recordings.lua
+++ b/mac/.config/TheSiahxyz/lua/TheSiahxyz/snippets/diary.lua
@@ -6,8 +6,8 @@ local f = ls.function_node
local fmt = require("luasnip.extras.fmt").fmta
-local recordings_snippet = s(
- "recordings",
+local diary_snippet = s(
+ "diary",
fmt(
[[---
title: <title>
@@ -26,5 +26,5 @@ date: <date>
)
)
-ls.add_snippets("markdown", { recordings_snippet })
-ls.add_snippets("quarto", { recordings_snippet })
+ls.add_snippets("markdown", { diary_snippet })
+ls.add_snippets("quarto", { diary_snippet })
diff --git a/mac/.config/shell/aliasrc b/mac/.config/shell/aliasrc
index 6dcdf7d..f263206 100644
--- a/mac/.config/shell/aliasrc
+++ b/mac/.config/shell/aliasrc
@@ -501,6 +501,6 @@ alias szs="source ${XDG_CONFIG_HOME:-${HOME}/.config}/zsh/.zshrc"
alias ylogh='ylog -s hidden -c us | grep $(LC_TIME=C date +%d/%b) | grep -E "[0-9]{2}:[0-9]{2}:[0-9]{2} "'
alias ylogi='ylog -s hidden -c us | grep $(LC_TIME=C date -v-1d +%d/%b) | grep -E "[0-9]{2}:[0-9]{2}:[0-9]{2} "'
-alias ylogt='ylog -s recordings -c us | grep $(LC_TIME=C date +%d/%b) | grep -E "[0-9]{2}:[0-9]{2}:[0-9]{2} "'
-alias ylogy='ylog -s recordings -c us | grep $(LC_TIME=C date -v-1d +%d/%b) | grep -E "[0-9]{2}:[0-9]{2}:[0-9]{2} "'
-alias ylogu='ylog -s recordings -c us'
+alias ylogt='ylog -s diary -c us | grep $(LC_TIME=C date +%d/%b) | grep -E "[0-9]{2}:[0-9]{2}:[0-9]{2} "'
+alias ylogy='ylog -s diary -c us | grep $(LC_TIME=C date -v-1d +%d/%b) | grep -E "[0-9]{2}:[0-9]{2}:[0-9]{2} "'
+alias ylogu='ylog -s diary -c us'
diff --git a/mac/.local/bin/fzffiles b/mac/.local/bin/fzffiles
index 97047e9..6c0bcfd 100755
--- a/mac/.local/bin/fzffiles
+++ b/mac/.local/bin/fzffiles
@@ -11,7 +11,7 @@ IFS='
files=$(fzf-tmux \
--header "^a pwd ^b public ^d .dotfiles ^f configs ^g git ^h home ^k desktop ^r scripts ^s suckless ^u staged files ^v private ^/ help" \
--preview "selection={};
- clean=\$(printf '%s' \"\$selection\" | sed -e 's/^📄 //' -e 's/^✏️ //' -e 's/^✅ //' -e 's/^❌ //' -e 's/^🔀 //' -e 's/^❓ //');
+ clean=\$(printf '%s' \"\$selection\" | sed -e 's/^📄 //' -e 's/^✏️ //' -e 's/^✅ //' -e 's/^❌ //' -e 's/^🔀 //' -e 's/^🗑️ //' -e 's/^❓ //');
[ -z \"\$clean\" ] && { echo 'No selection'; exit 0; }
target=\$(readlink -f \"\$clean\" 2>/dev/null || printf '%s' \"\$clean\");
if [ -z \"\$target\" ]; then
@@ -35,7 +35,7 @@ files=$(fzf-tmux \
fi
fi
if [ -d \"\$target\" ]; then
- exa --color=always --long --all --header --icons --git \"\$target\"
+ eza --color=always --long --all --header --icons --git \"\$target\"
elif [ -f \"\$target\" ]; then
bat --color=always --style=header,grid --line-range=:500 \"\$target\"
else
@@ -61,7 +61,8 @@ files=$(fzf-tmux \
file=substr(\$0,4);
gsub(/^ +/, \"\", file);
if (file == \"\") next;
- if (staged == \"?\" && unstaged == \"?\") icon=\"📄\";
+ if (staged == \"D\" || unstaged == \"D\") icon=\"🗑️\";
+ else if (staged == \"?\" && unstaged == \"?\") icon=\"📄\";
else if (staged == \"!\" && unstaged == \"!\") icon=\"❌\";
else if (staged != \" \" && staged != \"?\" && unstaged != \" \" && unstaged != \"?\") icon=\"🔀\";
else if (staged != \" \" && staged != \"?\") icon=\"✅\";
@@ -85,7 +86,7 @@ files=$(fzf-tmux \
# Check if any files were selected, and exit if not
[ -z "$files" ] && exit 0
-files=$(printf '%s\n' "$files" | sed -e 's/^📄 //' -e 's/^✏️ //' -e 's/^✅ //' -e 's/^❌ //' -e 's/^🔀 //' -e 's/^❓ //')
+files=$(printf '%s\n' "$files" | sed -e 's/^📄 //' -e 's/^✏️ //' -e 's/^✅ //' -e 's/^❌ //' -e 's/^🔀 //' -e 's/^🗑️ //' -e 's/^❓ //')
if [ -d "$files" ]; then
absolute_files=$(realpath $files)
diff --git a/mac/.local/bin/hugow b/mac/.local/bin/hugow
index 972d285..13cdf51 100755
--- a/mac/.local/bin/hugow
+++ b/mac/.local/bin/hugow
@@ -2,11 +2,11 @@
set -eu
repodir="$HOME/Private/repos/THESIAH"
-out="$repodir/public/recordings/index.html"
+out="$repodir/public/diary/index.html"
server="${THESIAH_SERVER:-root@thesiah.xyz}"
-dest="/var/www/thesiah/recordings/"
+dest="/var/www/thesiah/diary/"
defaults="sy after foramonth"
-src="$repodir/public/recordings/"
+src="$repodir/public/diary/"
cd "$repodir"
hugo --cleanDestinationDir
@@ -27,7 +27,7 @@ fi
# name = a[i] ".mp4"
# insert = insert \
# " <li>\n" \
-# " <a href=\"/recordings/" name "\" data-name=\"" name "\" class=\"vid\">" name "</a>\n" \
+# " <a href=\"/diary/" name "\" data-name=\"" name "\" class=\"vid\">" name "</a>\n" \
# " </li>\n"
# }
# injected = 0
@@ -57,7 +57,7 @@ else
fi
if [ -n "${1-}" ]; then
- new="$repodir/content/recordings/$1"
+ new="$repodir/content/diary/$1"
if [ -f "$new" ]; then
rsync -az --update "$new" "$server:$dest"
elif [ -d "$new" ]; then
diff --git a/mac/.local/bin/ylog b/mac/.local/bin/ylog
index 254803b..c56df36 100755
--- a/mac/.local/bin/ylog
+++ b/mac/.local/bin/ylog
@@ -5,7 +5,7 @@ LOG_DIR="/var/log/nginx"
TARGET="all" # "all" means no target filter (show all lines)
COUNTRY="all" # all|kr|us
-SCOPE="all" # all|access|recordings
+SCOPE="all" # all|access|recordings|hidden|diary|peertube
EXCL_FIREFOX=0 # 1 = exclude Firefox lines by default
EXCLUDES="59.19.56.8" # default exclude pattern
ADD_EXCLUDES=""
@@ -24,13 +24,16 @@ Options:
-c COUNTRY Select country logs (default: all)
all : all logs
- kr : recordings.kr.log + recordings.access.log
- us : recordings.us.log + recordings.access.log
+ kr : recordings.kr.log + recordings.access.log (and diary.kr.log when -s diary)
+ us : recordings.us.log + recordings.access.log (and diary.us.log when -s diary)
-s SCOPE Select log scope (default: all)
- all : recordings + access
+ all : recordings + access + hidden + diary + peertube
recordings : recordings.* logs only
access : access.* logs only
+ hidden : hidden.access.* logs only
+ diary : diary.* logs only
+ peertube : peertube.* logs only
-n Disable Firefox exclusion (by default, Firefox lines are excluded)
@@ -51,7 +54,10 @@ Options:
Examples:
ylog # All logs, last 10 lines each
ylog -s recordings # Recordings logs only, last 10 lines each
+ ylog -s diary # Diary logs only, last 10 lines each
+ ylog -s peertube # Peertube logs only, last 10 lines each
ylog -c kr -t 1.2.3.4 # Search specific IP in Korean logs
+ ylog -c kr -s diary # Korean diary logs only
ylog -t all -l 50 # All logs, last 50 lines each
ylog -d 1 # Logs from 1 day ago only
ylog -d ~2 # Logs from 2 days ago to today
@@ -119,6 +125,32 @@ pick_files() {
[ -e "$q" ] && printf "%s\n" "$q"
done
fi
+ # diary logs: similar structure to recordings
+ if [ "$SCOPE" = "diary" ] || [ "$SCOPE" = "all" ]; then
+ if [ "$COUNTRY" = "all" ]; then
+ for q in "$LOG_DIR/diary.access.log" "$LOG_DIR/diary.access.log".*; do
+ [ -e "$q" ] && printf "%s\n" "$q"
+ done
+ fi
+ case "$COUNTRY" in
+ kr) for q in "$LOG_DIR/diary.kr.log" "$LOG_DIR/diary.kr.log".*; do [ -e "$q" ] && printf "%s\n" "$q"; done ;;
+ us) for q in "$LOG_DIR/diary.us.log" "$LOG_DIR/diary.us.log".*; do [ -e "$q" ] && printf "%s\n" "$q"; done ;;
+ all)
+ for p in diary.kr.log diary.us.log; do
+ for q in "$LOG_DIR/$p" "$LOG_DIR/$p".*; do [ -e "$q" ] && printf "%s\n" "$q"; done
+ done
+ ;;
+ esac
+ fi
+ # peertube logs
+ if [ "$SCOPE" = "peertube" ] || [ "$SCOPE" = "all" ]; then
+ for q in "$LOG_DIR/peertube.access.log" "$LOG_DIR/peertube.access.log".*; do
+ [ -e "$q" ] && printf "%s\n" "$q"
+ done
+ for q in "$LOG_DIR/peertube.error.log" "$LOG_DIR/peertube.error.log".*; do
+ [ -e "$q" ] && printf "%s\n" "$q"
+ done
+ fi
}
# build exclude regex