Add update script

dot_config/kanshi/config

@@ -1,8 +1,13 @@
 profile dual {
-  output DP-1 position 0,0
+  output DP-1 enable
-  output DP-2 position 1920,0
+  output DP-2 enable position 1920,0
+}
+
+profile dual-off {
+  output DP-1 disable
+  output DP-2 disable
 }
 
 profile laptop {
-  output eDP-1 mode 3840x2160@60Hz position 0,0 scale 2
+  output eDP-1 enable mode 3840x2160@60Hz scale 2
 }

dot_local/bin/executable_pipewire-launcher

@@ -1,27 +1,28 @@
-#!/bin/bash
+#!/bin/sh
 
-START_TIME=`date +"%b %d, %Y %T"`
+user=$(id -u)
-LOG_FILE_WIRE="${XDG_STATE_HOME}"/wireplumber.log
+time=$(date +"%b %d, %Y %T")
-LOG_FILE_PIPE="${XDG_STATE_HOME}"/pipewire.log
+wire_log=$XDG_STATE_HOME/wireplumber.log
-LOG_FILE_PULSE="${XDG_STATE_HOME}"/pipewire-pulse.log
+pipe_log=$XDG_STATE_HOME/pipewire.log
+pulse_log=$XDG_STATE_HOME/pipewire-pulse.log
 
-echo "--- ${START_TIME} ---" > "$LOG_FILE_WIRE"
+echo "--- $time ---" > "$wire_log"
-echo "--- ${START_TIME} ---" > "$LOG_FILE_PIPE"
+echo "--- $time ---" > "$pipe_log"
-echo "--- ${START_TIME} ---" > "$LOG_FILE_PULSE"
+echo "--- $time ---" > "$pulse_log"
 
 # Kill any running pipewire processes
 killall -q wireplumber & killall -q pipewire-pulse & killall -q pipewire
 
 # Wait for processes to stop
-while pgrep -u $UID -x wireplumber >/dev/null; do sleep 1; done
+while pgrep -u "$user" -x wireplumber >/dev/null; do sleep 1; done
-while pgrep -u $UID -x pipewire >/dev/null; do sleep 1; done
+while pgrep -u "$user" -x pipewire >/dev/null; do sleep 1; done
-while pgrep -u $UID -x pipewire-pulse >/dev/null; do sleep 1; done
+while pgrep -u "$user" -x pipewire-pulse >/dev/null; do sleep 1; done
 
 # Wait for xdg-desktop-portal to start
-until pgrep -u $UID -f /usr/lib/xdg-desktop-portal >/dev/null; do sleep 1; done
+until pgrep -u "$user" -f /usr/lib/xdg-desktop-portal >/dev/null; do sleep 1; done
 
 # Launch pipewire
-/usr/bin/wireplumber 2>&1 | tee -a "$LOG_FILE_WIRE" & disown
+/usr/bin/wireplumber 2>&1 | tee -a "$wire_log" &
-/usr/bin/pipewire 2>&1 | tee -a "$LOG_FILE_PIPE" & disown
+/usr/bin/pipewire 2>&1 | tee -a "$pipe_log" &
-/usr/bin/pipewire-pulse 2>&1 | tee -a "$LOG_FILE_PULSE" & disown
+/usr/bin/pipewire-pulse 2>&1 | tee -a "$pulse_log" &
 

dot_local/bin/executable_river-logout

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-RIVER=`ps -C river | awk '/river/'`
-
-[[ $RIVER != "" ]] && riverctl spawn 'reset' && riverctl exit || echo "River is not running."

dot_local/bin/executable_swayidle-launcher.tmpl

@@ -1,9 +1,9 @@
-#!/bin/bash
+#!/bin/sh
 
-START_TIME=`date +"%b %d, %Y %T"`
+time=$(date +"%b %d, %Y %T")
-LOG_FILE="${XDG_STATE_HOME}"/swayidle.log
+log_file=$XDG_STATE_HOME/swayidle.log
 
-echo "--- ${START_TIME} ---" > "$LOG_FILE"
+echo "--- $time ---" > "$log_file"
 
 # kill running processes
 killall -q swayidle
@@ -21,19 +21,19 @@ swayidle -w \
     resume 'wlr-randr --output eDP-1 --on && kanshictl reload' \
   lock 'waylock-launcher' \
   before-sleep 'waylock-launcher' \
-  2>&1 | tee -a "$LOG_FILE" & disown
+  2>&1 | tee -a "$log_file" &
 {{- else if eq .chezmoi.hostname "hydrus" }}
 # lock: 5m, display: 15m
 swayidle -w \
   timeout 300 'waylock-launcher' \
-  timeout 900 'wlr-randr --output DP-1 --off --output DP-2 --off' \
+  timeout 900 'kanshictl switch dual-off' \
-    resume 'wlr-randr --output DP-1 --on --output DP-2 --on && sleep 2 && kanshictl reload' \
+    resume 'kanshictl switch dual' \
   lock 'waylock-launcher' \
   before-sleep 'waylock-launcher' \
-  2>&1 | tee -a "$LOG_FILE" & disown
+  2>&1 | tee -a "$log_file" &
 {{- else }}
 # lock after 5m
 swayidle -w \
   timeout 300 'waylock-launcher' \
-  2>&1 | tee -a "$LOG_FILE" & disown
+  2>&1 | tee -a "$log_file" &
 {{ end }}

dot_local/bin/executable_sys-mon.py

@@ -1,349 +0,0 @@
-#!/usr/bin/env python
-# _*_ coding: utf-8 _*_
-
-"""
-
-This script uses the `python-psutil` module to display the CPU average load, frequency (current/max),
-the temperature sensor reading, the fan speed and memory usage (used/total).
-
-Author: Piotr Miller
-e-mail: nwg.piotr@gmail.com
-Website: http://nwg.pl
-Project: https://github.com/nwg-piotr/tint2-executors
-
-The script is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation, either version 3 of the License, or any later version.
-The script is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
-Inspired by tknomanzr's cpu.py at https://forums.bunsenlabs.org/viewtopic.php?id=4276
-
-Command: python ~/tint2-executors/cpu-fan-mem.py [-C{components}] [-F] [-N] [-T] [-ALL] [-h] [--help]
-
--C stands for Components:
-
-    g - (g)raphical CPU load bar
-    p - (p)ercentage for each core (text)
-    a - (a)verage CPU load (text)
-    q - fre(q)ency for each thread
-    Q - fre(Q)ency for each thread/max frequency
-    s - current CPU (s)peed
-    S - current/max CPU (S)peed
-    t - CPU (t)emperature
-    f - (f)an speed
-    m - (m)emory in use
-    M - (M)emory in use/total
-    w - s(w)ap memory in use
-    W - s(W)ap memory in use/total
-    d - (d)rives as names usage in %
-    D - (D)rives as names used/total
-    n - drives as mou(n)tpoints usage in %
-    N - drives as mou(N)tpoints used/total
-    u - (u)ptime HH:MM
-    U - (U)ptime HH:MM:SS
-
--F - use Fahrenheit instead of ℃
--N - display field names (except for (g)raphical CPU load bar)
--T - test execution time
--ALL - display all possible data (for use in terminal)
-
-"""
-
-import sys
-import psutil
-import re
-import time
-
-
-def main():
-    fahrenheit = False
-    names = False
-    testing = False
-    time_start = None
-    components = "gStfM"
-
-    for i in range(1, len(sys.argv)):
-        if sys.argv[i] == "-h" or sys.argv[i] == "--help":
-            print_help()
-            exit(0)
-
-        if sys.argv[i] == "-F":
-            fahrenheit = True
-
-        if sys.argv[i] == "-N":
-            names = True
-
-        if sys.argv[i] == "-T":
-            testing = True
-
-        if sys.argv[i].startswith("-C"):
-            components = sys.argv[i][2::]
-
-        if sys.argv[i] == "-ALL":
-            components = "gpaQStfMWDU"
-            names = True
-            testing = True
-
-    if testing:
-        time_start = int(round(time.time() * 1000))
-
-    pcpu, avg, speed, freqs, temp, fans, b_time, \
-        memory, swap, disks_usage = None, None, None, None, None, None, None, None, None, None
-
-    output = ""
-
-    # Prepare ONLY requested data, ONLY once
-    if "g" in components or "p" in components:
-        try:
-            pcpu = psutil.cpu_percent(interval=1, percpu=True)
-        except:
-            pass
-
-    if "a" in components:
-        try:
-            avg = str(psutil.cpu_percent(interval=1))
-            if len(avg) < 4:
-                avg = "~" + avg
-        except:
-            pass
-
-    if "s" in components or "S" in components:
-        try:
-            speed = psutil.cpu_freq(False)
-        except:
-            pass
-
-    if "q" in components or "Q" in components:
-        try:
-            freqs = psutil.cpu_freq(True)
-            if len(freqs) == 0:
-                freqs = None
-        except:
-            pass
-
-    if "t" in components:
-        try:
-            temp = psutil.sensors_temperatures(fahrenheit)
-        except:
-            pass
-
-    if "f" in components:
-        try:
-            fans = psutil.sensors_fans()
-        except:
-            pass
-
-    if "m" in components or "M" in components:
-        try:
-            memory = psutil.virtual_memory()
-        except:
-            pass
-
-    if "w" in components or "W" in components:
-        try:
-            s = psutil.swap_memory()
-            swap = s[1], s[0]
-        except:
-            pass
-
-    drives = []
-    # Find drive names, mountpoints
-    if "d" in components or "D" in components or "n" in components or "N" in components:
-        try:
-            d = psutil.disk_partitions()
-            # This will store name, mountpoint
-
-            for entry in d:
-                n = entry[0].split("/")
-                name = n[len(n) - 1]
-                # name, mountpoint
-                drive = name, entry[1]
-                drives.append(drive)
-        except:
-            pass
-
-    if "d" in components or "D" in components:
-        try:
-            disks_usage = []
-            for drive in drives:
-                # Search drives by path
-                data = psutil.disk_usage(drive[1])
-                # Store name, used, total, percent
-                essential = drive[0].upper(), data[1], data[0], data[3]
-                disks_usage.append(essential)
-        except:
-            pass
-
-    if "n" in components or "N" in components:
-        try:
-            disks_usage = []
-            for drive in drives:
-                # Search drives by path
-                data = psutil.disk_usage(drive[1])
-                # Store mountpoint, used, total, percent
-                essential = drive[1], data[1], data[0], data[3]
-                disks_usage.append(essential)
-        except:
-            pass
-
-    if "u" in components or "U" in components:
-        try:
-            b_time = psutil.boot_time()
-        except:
-            pass
-
-    # Build output component after component
-    for char in components:
-        if char == "g" and pcpu is not None:
-            output += " " + graph_per_cpu(pcpu) + " "
-
-        if char == "p" and pcpu is not None:
-            output += " CPU:" if names else " "
-            output += per_cpu(pcpu) + " "
-
-        if char == "a" and avg is not None:
-            output += " avCPU:" if names else " "
-            output += avg + "% "
-
-        if char == "q" and freqs is not None:
-            output += " CPU:" if names else " "
-            output += freq_per_cpu(freqs)[0][:-1] + "GHz "
-
-        if char == "Q" and freqs is not None:
-            output += " CPU:" if names else " "
-            result = freq_per_cpu(freqs)
-            output += result[0][:-1] + "/" + str(result[1]) + "GHz "
-
-        if char == "s" and speed is not None:
-            output += " SPD:" if names else " "
-            output += str(round(speed[0] / 1000, 1)) + "GHz "
-
-        if char == "S" and speed is not None:
-            output += " avSPD:" if names else " "
-            output += str(round(speed[0] / 1000, 1)) + "/" + str(round(speed[2] / 1000, 1)) + "GHz "
-
-        if char == "t" and temp is not None and len(temp) > 0:
-            output += " CORE:" if names else " "
-            # "acpitz" for ACPI Thermal Zone
-            output += str(temp["acpitz"][0][1])
-            output += "℉ " if fahrenheit else "℃ "
-
-        if char == "f" and fans is not None and len(fans) > 0:
-            output += " FAN:" if names else " "
-            fan0 = next(iter(fans.values()))
-            output += str(fan0[0][1]) + "/m "
-
-        if char == 'm' and memory is not None:
-            output += " MEM:" if names else " "
-            output += str(round((memory[0] - memory[1]) / 1073741824, 1)) + "GB "
-
-        if char == 'M' and memory is not None:
-            output += " MEM:" if names else " "
-            output += str(round((memory[3]) / 1073741824, 1)) + "/" + str(
-                round(memory[0] / 1073741824, 1)) + "GB "
-
-        if char == 'u' and b_time is not None:
-            up_time = int(time.time()) - b_time
-            m, s = divmod(up_time, 60)
-            h, m = divmod(m, 60)
-            output += " UP:" if names else " "
-            output += "%d:%02d " % (h, m)
-
-        if char == 'U' and b_time is not None:
-            up_time = int(time.time()) - b_time
-            m, s = divmod(up_time, 60)
-            h, m = divmod(m, 60)
-            output += " UP:" if names else " "
-            output += "%d:%02d:%02d " % (h, m, s)
-
-        if char == "w" and swap is not None:
-            output += " SWAP:" if names else " "
-            output += str(round(swap[0] / 1073741824, 1)) + "GB "
-
-        if char == "W" and swap is not None:
-            output += " SWAP:" if names else " "
-            output += str(round(swap[0] / 1073741824, 1)) + "/"
-            output += str(round(swap[1] / 1073741824, 1)) + "GB "
-
-        if char == "d" or char == "n" and disks_usage is not None:
-            for entry in disks_usage:
-                output += " " + entry[0] + ":"
-                output += str(entry[3]) + "% "
-
-        if char == "D" or char == "N" and disks_usage is not None:
-            for entry in disks_usage:
-                output += " " + entry[0] + ":"
-                output += str(round(entry[1] / 1073741824, 1)) + "/"
-                output += str(round(entry[2] / 1073741824, 1)) + "GB "
-
-    if testing:
-        output += " [" + str(int((round(time.time() * 1000)) - time_start) / 1000) + "s]"
-
-    # remove double, leading and trailing spaces before printing
-    print(re.sub(' +', ' ', output).strip())
-
-
-def per_cpu(result):
-    string = ""
-    for val in result:
-        proc = str(int(round(val, 1)))
-        if len(proc) < 2:
-            proc = "~" + proc
-        string += proc + "% "
-    return string
-
-
-def freq_per_cpu(result):
-    string = ""
-    max_freq = 0
-    for val in result:
-        freq = str(round(val[0] / 1000, 1))
-        string += freq + "|"
-        max_freq = str(round(val[2] / 1000, 1))
-
-    return string, max_freq
-
-
-def graph_per_cpu(result):
-    graph = "_▁▂▃▄▅▆▇███"
-
-    string = ""
-    for val in result:
-        proc = int(round(val / 10, 0))
-        string += graph[proc]
-    return string
-
-
-def print_help():
-    print("\nArguments: [-C{components}] [-F] [-N] [-T] [-ALL] [-h] [--help]")
-
-    print("\n-C defines Components. If none given, -CgStfM will be used by default\n")
-    print("  g - (g)raphical CPU load bar")
-    print("  p - (p)ercentage for each core (text)")
-    print("  a - (a)verage CPU load (text)")
-    print("  q - fre(q)ency for each thread")
-    print("  Q - fre(Q)ency for each thread/max frequency")
-    print("  s - current CPU (s)peed")
-    print("  S - current/max CPU (S)peed")
-    print("  t - CPU (t)emperature")
-    print("  f - (f)an speed")
-    print("  m - (m)emory in use")
-    print("  M - (M)emory in use/total")
-    print("  w - s(w)ap memory in use")
-    print("  W - s(W)ap memory in use/total")
-    print("  d - (d)rives as names usage in %")
-    print("  D - (D)rives as names used/total")
-    print("  n - drives as mou(n)tpoints usage in %")
-    print("  N - drives as mou(N)tpoints used/total")
-    print("  u - (u)ptime HH:MM")
-    print("  U - (U)ptime HH:MM:SS")
-
-    print("\n-F - use Fahrenheit instead of ℃")
-    print("-N - display field names (except for (g)raphical CPU load bar)")
-    print("-T - test execution time")
-    print("-ALL - display all possible data (for use in terminal)\n")
-
-
-if __name__ == "__main__":
-    main()
-

dot_local/bin/executable_update-all

@@ -0,0 +1,30 @@
+#!/bin/sh
+
+alias paru='paru --skipreview'
+alias zigup='zigup --install-dir "${HOME}/.local/share/zigup" --path-link "${HOME}/.local/bin/zig"'
+
+updates=$(checkupdates)
+aur_updates=$(paru -Qua)
+
+if [ "$updates" = "" ] && [ "$aur_updates" = "" ]; then
+  echo "System is already up to date."
+  exit 0
+fi
+
+river_has_update=$(echo "$aur_updates" | grep -c 'river-git')
+zls_has_update=$(echo "$aur_updates" | grep -c 'zls-git')
+
+if [ "$river_has_update" -ne 0 ] && [ "$zls_has_update" -ne 0 ]; then
+  zigup master
+  paru -Syu --exclude river-git
+  zigup 0.11.0
+  paru -S river-git
+  zigup master
+elif [ "$river_has_update" -ne 0 ]; then
+  zigup 0.11.0
+  paru -Syu
+  zigup master
+else
+  zigup master
+  paru -Syu
+fi

dot_local/bin/executable_waybar-launcher

@@ -1,19 +1,20 @@
-#!/bin/bash
+#!/bin/sh
 
-START_TIME=`date +"%b %d, %Y %T"`
+user=$(id -u)
-LOG_FILE="${XDG_STATE_HOME}"/waybar.log
+time=$(date +"%b %d, %Y %T")
+log_file=$XDG_STATE_HOME/waybar.log
 
-echo "--- ${START_TIME} ---" > "$LOG_FILE" 
+echo "--- $time ---" > "$log_file"
 
 # Terminate already running bar instances
 killall -q waybar
 
 # Wait until the processes have been shut down
-while pgrep -u $UID -x waybar >/dev/null; do sleep 1; done
+while pgrep -u "$user" -x waybar >/dev/null; do sleep 1; done
 
 # Make sure pipewire-pulse is running or module won't load
-until pgrep -u $UID -x pipewire-pulse >/dev/null; do sleep 1; done
+until pgrep -u "$user" -x pipewire-pulse >/dev/null; do sleep 1; done
 
 # Launch Waybar
-waybar 2>&1 | tee -a "$LOG_FILE" & disown
+waybar 2>&1 | tee -a "$log_file" &
 

dot_local/bin/executable_waylock-launcher

@@ -1,10 +1,13 @@
-#!/bin/bash
+#!/bin/sh
 
-START_TIME=`date +"%b %d, %Y %T"`
+user=$(id -u)
-LOG_FILE="${XDG_STATE_HOME}"/waylock.log
+time=$(date +"%b %d, %Y %T")
-echo "--- ${START_TIME} ---" > "$LOG_FILE"
+log_file=$XDG_STATE_HOME/waylock.log
 
-if pgrep -u $UID -x waylock >/dev/null; then 
+echo "--- $time ---" > "$log_file"
+
+if pgrep -u "$user" -x waylock >/dev/null; then
+  echo "error: waylock is already running" >> "$log_file"
   exit 1
 else
   waylock \
@@ -12,6 +15,6 @@ else
     -init-color 0x000000 \
     -fail-color 0x000000 \
     -input-color 0x525c62 \
-    2>&1 | tee -a "$LOG_FILE" & disown
+    2>&1 | tee -a "$log_file"
 fi
 

dot_local/bin/executable_yambar-launcher.tmpl

@@ -1,21 +1,25 @@
-#!/bin/bash
+#!/bin/sh
 
-START_TIME=`date +"%b %d, %Y %T"`
+user=$(id -u)
-LOG_FILE_BAR1="${XDG_STATE_HOME}"/yambar1.log
+time=$(date +"%b %d, %Y %T")
-echo "--- ${START_TIME} ---" > "$LOG_FILE_BAR1"
+bar1_log=$XDG_STATE_HOME/yambar1.log
 {{- if eq .chezmoi.hostname "hydrus" }}
-LOG_FILE_BAR2="${XDG_STATE_HOME}"/yambar2.log
+bar2_log=$XDG_STATE_HOME/yambar2.log
-echo "--- ${START_TIME} ---" > "$LOG_FILE_BAR2"
+{{- end }}
+
+echo "--- $time ---" > "$bar1_log"
+{{- if eq .chezmoi.hostname "hydrus" }}
+echo "--- $time ---" > "$bar2_log"
 {{- end }}
 
 # Terminate already running bar instances
 killall -q yambar
 
 # Wait until the processes have been shut down
-while pgrep -u $UID -x yambar >/dev/null; do sleep 1; done
+while pgrep -u "$user" -x yambar >/dev/null; do sleep 1; done
 
 # Launch Yambar
-yambar -s 2>&1 | tee -a "$LOG_FILE_BAR1" & disown
+yambar -s 2>&1 | tee -a "$bar1_log" &
 {{- if eq .chezmoi.hostname "hydrus" }}
-yambar -s -c "${XDG_CONFIG_HOME}/yambar/bar2.yml" 2>&1 | tee -a "$LOG_FILE_BAR2" & disown
+yambar -s -c "$XDG_CONFIG_HOME/yambar/bar2.yml" 2>&1 | tee -a "$bar2_log" &
 {{- end }}