modified shell/aliasrc, modified zsh/.zshrc, deleted bin/displayselect, modified Music/.music.txt, created bin/dmenudisplay

4 files changed, 141 insertions, 5 deletions

diff --git a/ar/.config/shell/aliasrc b/ar/.config/shell/aliasrc
index e4ac623..3688ef4 100644
--- a/ar/.config/shell/aliasrc
+++ b/ar/.config/shell/aliasrc
@@ -491,6 +491,8 @@ 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 -d "1 days ago" +%d/%b) | grep -E "[0-9]{2}:[0-9]{2}:[0-9]{2} "'
+alias ylogp='ylog -s peertube | grep $(LC_TIME=C date +%d/%b) | grep -E "[0-9]{2}:[0-9]{2}:[0-9]{2} "'
+alias ylogP='ylog -s peertube | grep $(LC_TIME=C date -d "1 days ago" +%d/%b) | grep -E "[0-9]{2}:[0-9]{2}:[0-9]{2} "'
 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 "1 days ago" +%d/%b) | grep -E "[0-9]{2}:[0-9]{2}:[0-9]{2} "'
 alias ylogr='ylog -s diary -c us | grep $(LC_TIME=C date -d "2 days ago" +%d/%b) | grep -E "[0-9]{2}:[0-9]{2}:[0-9]{2} "'
diff --git a/ar/.config/zsh/.zshrc b/ar/.config/zsh/.zshrc
index a73891e..3602f50 100644
--- a/ar/.config/zsh/.zshrc
+++ b/ar/.config/zsh/.zshrc
@@ -117,10 +117,9 @@ zstyle ':fzf-tab:*' switch-group ',' '.'    # switch group using `,` and `.`
 [ -f "${XDG_CONFIG_HOME:-${HOME}/.config}/shell/shortcutrc" ] && source "${XDG_CONFIG_HOME:-${HOME}/.config}/shell/shortcutrc"
 [ -f "${XDG_CONFIG_HOME:-${HOME}/.config}/shell/shortcutenvrc" ] && source "${XDG_CONFIG_HOME:-$HOME/.config}/shell/shortcutenvrc"
 [ -f "${XDG_CONFIG_HOME:-${HOME}/.config}/shell/zshnameddirrc" ] && source "${XDG_CONFIG_HOME:-${HOME}/.config}/shell/zshnameddirrc"
-source "$HOME/.local/share/../bin/env"
 
 
-## --- TMUX --- ###
+### --- TMUX --- ###
 if command -v tmux >/dev/null 2>&1 && [ -z "$TMUX" ]; then
     terminal_count=$(pgrep -u "$USER" -ax "${TERMINAL:-st}" | grep -Ev 'ncmpcpp|newsboat|pulsemixer|spterm|splf|spcalc|stig|vimwikitodo' | wc -l)
     if [ "$terminal_count" -le 1 ]; then
diff --git a/ar/.local/bin/displayselect b/ar/.local/bin/dmenudisplay
index 87c8bd6..4673599 100755
--- a/ar/.local/bin/displayselect
+++ b/ar/.local/bin/dmenudisplay
@@ -3,6 +3,31 @@
 # A UI for detecting and selecting all displays. Probes xrandr for connected
 # displays and lets user select one to use. User may also select "manual
 # selection" which opens arandr.
+#
+# Options:
+#   -r    Enable resolution selection for each display
+
+# Parse options
+select_resolution=false
+while getopts "r" opt; do
+  case $opt in
+    r) select_resolution=true ;;
+    *) echo "Usage: $0 [-r]" >&2; exit 1 ;;
+  esac
+done
+shift $((OPTIND - 1))
+
+# Function to select resolution for a display
+get_resolution() {
+  display="$1"
+  if [ "$select_resolution" = true ]; then
+    resolutions=$(xrandr --query | sed -n "/^$display/,/^[^ ]/p" | grep -v "^$display" | grep -v "^[^ ]" | awk '{print $1}' | grep -E "^[0-9]+x[0-9]+$")
+    chosen_res=$(echo "$resolutions" | dmenu -i -p "Resolution for $display:")
+    [ -n "$chosen_res" ] && echo "--mode $chosen_res" || echo "--auto"
+  else
+    echo "--auto"
+  fi
+}
 
 twoscreen() { # If multi-monitor is selected and there are two screens.
   mirror=$(printf "no\\nyes" | dmenu -i -p "Mirror displays?")
@@ -34,7 +59,9 @@ twoscreen() { # If multi-monitor is selected and there are two screens.
     [ -z "$primary" ] && exit
     secondary=$(echo "$screens" | grep -v ^"$primary"$)
     direction=$(printf "left\\nright" | dmenu -i -p "What side of $primary should $secondary be on?")
-    xrandr --output "$primary" --primary --auto --scale 1.0x1.0 --output "$secondary" --"$direction"-of "$primary" --auto --scale 1.0x1.0
+    primary_res=$(get_resolution "$primary")
+    secondary_res=$(get_resolution "$secondary")
+    xrandr --output "$primary" --primary $primary_res --scale 1.0x1.0 --output "$secondary" --"$direction"-of "$primary" $secondary_res --scale 1.0x1.0
   fi
 }
 
@@ -44,7 +71,10 @@ morescreen() { # If multi-monitor is selected and there are more than two screen
   secondary=$(echo "$screens" | grep -v ^"$primary"$ | dmenu -i -p "Select secondary display:")
   direction=$(printf "left\\nright" | dmenu -i -p "What side of $primary should $secondary be on?")
   tertiary=$(echo "$screens" | grep -v ^"$primary"$ | grep -v ^"$secondary"$ | dmenu -i -p "Select third display:")
-  xrandr --output "$primary" --primary --auto --output "$secondary" --"$direction"-of "$primary" --auto --output "$tertiary" --"$(printf "left\\nright" | grep -v "$direction")"-of "$primary" --auto
+  primary_res=$(get_resolution "$primary")
+  secondary_res=$(get_resolution "$secondary")
+  tertiary_res=$(get_resolution "$tertiary")
+  xrandr --output "$primary" --primary $primary_res --output "$secondary" --"$direction"-of "$primary" $secondary_res --output "$tertiary" --"$(printf "left\\nright" | grep -v "$direction")"-of "$primary" $tertiary_res
 }
 
 multimon() { # Multi-monitor handler.
@@ -55,7 +85,8 @@ multimon() { # Multi-monitor handler.
 }
 
 onescreen() { # If only one output available or chosen.
-  xrandr --output "$1" --primary --auto --scale 1.0x1.0 $(echo "$allposs" | grep -v "\b$1" | awk '{print "--output", $1, "--off"}' | paste -sd ' ' -)
+  res_opt=$(get_resolution "$1")
+  xrandr --output "$1" --primary $res_opt --scale 1.0x1.0 $(echo "$allposs" | grep -v "\b$1" | awk '{print "--output", $1, "--off"}' | paste -sd ' ' -)
 }
 
 postrun() { # Stuff to run to clean up.
diff --git a/global/Music/.music.txt b/global/Music/.music.txt
index 723a23d..9fee09d 100644
--- a/global/Music/.music.txt
+++ b/global/Music/.music.txt
@@ -916,3 +916,107 @@ youtube RgKAFK5djSk
 youtube 6wmuFMBouyQ
 youtube t8p8FF16zJs
 youtube Ejc__vhP2U8
+youtube izssDYTMXis
+youtube evOsUf9en-Y
+youtube i2aRMXZR1k0
+youtube Dbxzh078jr4
+youtube oaIbr8mz9rk
+youtube OWj1mgbxGSw
+youtube 1P3jzu6Mt6w
+youtube 1qzbXDsUd2E
+youtube FxFr-ZMxZes
+youtube 6RQ-bBdASvk
+youtube cUlDEVp7GIY
+youtube 5sPFZ2qBYpY
+youtube d0IbyPRbeLo
+youtube xqZbQ9VRq6k
+youtube 9QMaI9PEM6A
+youtube wisRmOsAW6c
+youtube fpYXs5Zj1QA
+youtube gJ6Dd6Zgaxo
+youtube e5R_ox2blOY
+youtube nCJBm86zGkk
+youtube tln-86LDE2g
+youtube mtD4qRsXH-c
+youtube g9fwsnPEf2s
+youtube LipmslETRSw
+youtube JhWWlEfTYyA
+youtube LCRO0vtsA-I
+youtube f6vxTz3me-0
+youtube xIcMCjHgrs0
+youtube M7ubcEn2nE4
+youtube owDRFOvt1_8
+youtube oN91_NlU2Aw
+youtube GORtobi0x4A
+youtube V9uCFT-g2xc
+youtube DRUt7T_M9e0
+youtube LQDGZXeIopA
+youtube 2jskTe1njXI
+youtube HLs70hP-r14
+youtube Thjxkc7FrYU
+youtube G7WkIZCBAkc
+youtube -1-kMeWvZGY
+youtube b1n5IAJDEKU
+youtube G21UmShyv6I
+youtube mQiPtbod-lA
+youtube etq7A0u3Lx8
+youtube hE8LT33xcWQ
+youtube JykdXlQbSs8
+youtube 6zqxWPGyr7E
+youtube G6pQShD5H-I
+youtube y6jYqXUhL50
+youtube CNhqxinoZ1w
+youtube xSDRTvqlRJ8
+youtube bD2-PwcHNUs
+youtube RVzo5hQ0OGE
+youtube BG0BvLu8TJU
+youtube qX-F9APsuzc
+youtube VyKY4k6vrfU
+youtube gGFfWlrVt40
+youtube NQCl_dgYznA
+youtube 4Bgl4t0k96o
+youtube LMZ6pJsjcfg
+youtube gHcXAKElqI8
+youtube bFN6s6Bm7EM
+youtube HIkoeDfam4g
+youtube 5yKjmZvKwGA
+youtube oeGMVZ55DTQ
+youtube MAHptlThlKA
+youtube aZFmwtkSFaU
+youtube XjKNXIEZ69A
+youtube UrTh0H7j_qQ
+youtube vXZVfxegDJw
+youtube d0wgEuxcBJw
+youtube AisSWiKrrq0
+youtube bnrzVXVgcSs
+youtube VFOQhg2tvMw
+youtube 9h1UBQQVTRw
+youtube XMGqc5_a4ZI
+youtube QQIdl-41fjI
+youtube 3k3-lYeDP7U
+youtube etMQEpzSnic
+youtube dF9Ym1A2_v4
+youtube K4vjSYvp1U8
+youtube nuSoP8MSgZw
+youtube 1vkKlQr2R4U
+youtube 1NOIeX88s4w
+youtube JVt-BjU6PeQ
+youtube ksasTVYIcQs
+youtube 7Dofmtt2Wgk
+youtube OF4sejgmQSw
+youtube -pPDEayEY4M
+youtube eZfWkIbdrqs
+youtube 2y1H7UwL8No
+youtube yrafZMO50_0
+youtube 2Fu9aq_o1G0
+youtube NNvASaW9Qmk
+youtube wxPPHgcoDqo
+youtube zoUG1I8y3SI
+youtube 3BCRRNErRes
+youtube HM0g4-6U9nc
+youtube dXZpuDn-FYU
+youtube DEaVAEtWo9k
+youtube b-F9VTOEQFI
+youtube W9_mqi8w3I0
+youtube FWQCr3F37-k
+youtube nnZ_rfE0_aQ