fix mod-network formatting

.bash_profile

@@ -27,6 +27,7 @@ export CUDA_CACHE_PATH="$XDG_CACHE_HOME/nv"
 
 # Other program settings
 export XIDLEHOOK_SOCK="$XDG_STATE_HOME/xidlehook.sock"
+export SVDIR="$XDG_CONFIG_HOME/service"
 
 # $PATH additions
 export PATH="$PATH:$HOME/.local/bin"

.bashrc

@@ -19,21 +19,23 @@ cd() { builtin cd "$@" && ls; }
 alias grep='grep --color=auto'
 alias wget='wget --no-hsts'
 alias vim='nvim'
+alias emacs='emacsclient -ca emacs'
+alias nnn='nnn -C'
 
 # Utilities
 alias ipp='curl https://ipinfo.io/ip && echo'
 ipl() {
-	if address="$(ip route get 1 2>/dev/null)"; then
-		address="${address#* via * dev * src }"
-		address="${address% uid *}"
+	if address=$(ip route get 1 2>/dev/null); then
+		address=${address#* via * dev * src }
+		address=${address% uid *}
 	fi
 
 	if [ -n "$address" ]; then
-		printf '%s' "$address"
+		prefix="$address"
 	else
-		printf 'Offline'
+		prefix="Offline"
 	fi
-	printf '\n'
+	printf '%s\n' "$prefix"
 }
 
 # Shorthands
@@ -43,6 +45,7 @@ alias c='cd'
 alias v='nvim'
 alias g='git'
 alias ff='fastfetch'
+alias em='emacs -nw'
 
 # Commands or options
 alias ll='ls -l'

.config/service/.gitignore

@@ -1,2 +0,0 @@
-*/supervise
-*/down

.config/service/dunst/run

@@ -1,2 +0,0 @@
-#!/bin/sh
-[ -n "$DISPLAY" ] && exec dunst

.config/service/mpd/run

@@ -1,2 +0,0 @@
-#!/bin/sh
-exec mpd --no-daemon

.config/service/picom/run

@@ -1,2 +0,0 @@
-#!/bin/sh
-[ -n "$DISPLAY" ] && exec picom

.config/service/pipewire-pulse/run

@@ -1,2 +0,0 @@
-#!/bin/sh
-exec pipewire -c pipewire-pulse.conf

.config/service/pipewire/run

@@ -1,2 +0,0 @@
-#!/bin/sh
-exec pipewire

.config/service/redshift/run

@@ -1,2 +0,0 @@
-#!/bin/sh
-[ -n "$DISPLAY" ] && exec redshift

.config/service/udiskie/run

@@ -1,2 +0,0 @@
-#!/bin/sh
-exec udiskie

.config/service/wireplumber/run

@@ -1,2 +0,0 @@
-#!/bin/sh
-exec wireplumber

.config/service/xidlehook/run

@@ -1,13 +0,0 @@
-#!/bin/sh
-
-# shellcheck disable=SC2016
-
-exec xidlehook \
-    --not-when-fullscreen \
-    --socket "$XIDLEHOOK_SOCK" \
-    --timer 600 \
-    'i3lock -i "$XDG_CACHE_HOME/lock.png"' \
-    '' \
-    --timer 3600 \
-    'loginctl suspend' \
-    ''

.config/service/xscreensaver/run

@@ -1,2 +0,0 @@
-#!/bin/sh
-[ -n "$DISPLAY" ] && exec xscreensaver -nosplash

.local/bin/mod-network

@@ -2,9 +2,9 @@
 
 set -eu
 
-if address="$(ip route get 1 2>/dev/null)"; then
-	address="${address#* via * dev * src }"
-	address="${address% uid *}"
+if address=$(ip route get 1 2>/dev/null); then
+	address=${address#* via * dev * src }
+	address=${address% uid *}
 fi
 
 if [ -n "$address" ]; then

.local/bin/sys-brightness

@@ -0,0 +1,15 @@
+#!/bin/sh
+
+set -eu
+
+NOTIFY_ID=9990
+
+amount=$1
+device=$2
+name=$3
+
+brightness=$(brightnessctl -md "$device" s "$amount")
+brightness=${brightness#*,*,*,}
+brightness=${brightness%\%,*}
+
+notify-send -u low -r "$NOTIFY_ID" -h int:value:"$brightness" "$name Brightness"

.local/bin/sys-volume

@@ -12,7 +12,7 @@ if [ "$action" = "toggle" ]; then
 	wpctl set-mute "$SINK" toggle
 else
 	wpctl set-mute "$SINK" 0
-	wpctl set-volume "$SINK" "$action"
+	wpctl set-volume "$SINK" -l 1 "$action"
 fi
 
 pkill -RTMIN+"$STATUSBAR_SIGNAL" "$STATUSBAR"

.xinitrc

@@ -1,33 +1,23 @@
 #!/bin/sh
 
-xrandr --setprovideroutputsource modesetting NVIDIA-0
-xrandr --auto
-xrandr --dpi 96
-xrandr \
-    --output eDP-1 --off \
-    --output HDMI-2 --primary --mode 1280x1024 --pos 0x0 --rate 75
+if $(xrandr --listproviders | grep 'NVIDIA'); then
+	xrandr --setprovideroutputsource modesetting NVIDIA-0
+	xrandr --auto
+	xrandr --dpi 96
+	xrandr \
+		--output eDP-1 --off \
+		--output HDMI-2 --primary --mode 1280x1024 --pos 0x0 --rate 75
 
-export __NV_PRIME_RENDER_OFFLOAD=1
-export __GLX_VENDOR_LIBRARY_NAME="nvidia"
+	export __NV_PRIME_RENDER_OFFLOAD=1
+	export __GLX_VENDOR_LIBRARY_NAME="nvidia"
+fi
 
 [ -f "$XDG_DATA_HOME/wallpaper" ] && xwallpaper --zoom "$XDG_DATA_HOME/wallpaper" &
 xrdb -merge "$HOME/.Xresources"
 
-pipewire &
-pipewire-pulse &
-wireplumber &
-
-dunst &
-picom &
-udiskie &
-mpd --no-daemon &
-
+runsvdir "$SVDIR" &
 modbot -x &
 
 while :; do
-    if command -v dbus-launch >/dev/null; then
-        dbus-launch --sh-syntax --exit-with-session dwm
-    elif command -v dbus-run-session >/dev/null; then
-        dbus-run-session dwm
-    fi
+	dbus-launch --sh-syntax --exit-with-session dwm
 done