From 7061b1caa63ceb83a5c0e7abd171267902f5ebfd Mon Sep 17 00:00:00 2001 From: "Skylar \"The Cobra\" Widulski" Date: Mon, 11 Dec 2023 08:07:11 -0500 Subject: [PATCH] bump Signed-off-by: Skylar "The Cobra" Widulski --- .bash_profile | 8 -------- .bashrc | 2 +- .config/colorscheme | 4 ++-- .config/foot/foot.ini | 6 +++--- .config/guix/cobra/home.scm | 17 +---------------- .config/guix/cobra/home/configs.scm | 10 +++++----- .config/waybar/config | 6 +++--- .devspec | 9 +-------- .newsboat/config | 2 +- .prompt | 8 +++++++- 10 files changed, 24 insertions(+), 48 deletions(-) diff --git a/.bash_profile b/.bash_profile index 2692a11..f5caaef 100644 --- a/.bash_profile +++ b/.bash_profile @@ -1,6 +1,5 @@ # Honor per-interactive-shell startup file if [ -f ~/.bashrc ]; then . ~/.bashrc; fi -export PATH="~/.local/bin:$PATH" export LESS_TERMCAP_mb='' export LESS_TERMCAP_md='' export LESS_TERMCAP_me='' @@ -9,13 +8,6 @@ export LESS_TERMCAP_so='' export LESS_TERMCAP_ue='' export LESS_TERMCAP_us='' export LESS=-R -export PATH=~/.guix-home/profile/bin:$PATH - -PATH="/home/cobra/perl5/bin${PATH:+:${PATH}}"; export PATH; -PERL5LIB="/home/cobra/perl5/lib/perl5${PERL5LIB:+:${PERL5LIB}}"; export PERL5LIB; -PERL_LOCAL_LIB_ROOT="/home/cobra/perl5${PERL_LOCAL_LIB_ROOT:+:${PERL_LOCAL_LIB_ROOT}}"; export PERL_LOCAL_LIB_ROOT; -PERL_MB_OPT="--install_base \"/home/cobra/perl5\""; export PERL_MB_OPT; -PERL_MM_OPT="INSTALL_BASE=/home/cobra/perl5"; export PERL_MM_OPT; . ~/.devspec [ -f ~/.guix-home/setup-environment ] && . ~/.guix-home/setup-environment diff --git a/.bashrc b/.bashrc index 6a4b097..70cd6a7 100644 --- a/.bashrc +++ b/.bashrc @@ -244,7 +244,7 @@ cpplot() { } reconf() { - $PRIV guix system reconfigure /etc/guix-config/${HOSTNAME,,}.scm "$@" + $PRIV -E guix system reconfigure /etc/guix-config/${HOSTNAME,,}.scm "$@" } hreconf() { diff --git a/.config/colorscheme b/.config/colorscheme index 93e4fd8..414b3bd 100644 --- a/.config/colorscheme +++ b/.config/colorscheme @@ -2,7 +2,7 @@ foreground=f4e5e7 background=17100b regular0=2e2016 # black -regular1=d88f96 # red +regular1=ff99c8 # red regular2=16af38 # green regular3=dbbc2f # yellow regular4=1961e6 # blue @@ -10,7 +10,7 @@ regular5=b3787e # magenta regular6=32cbe6 # cyan regular7=f4e5e7 # white bright0=473032 # bright black -bright1=e5a7aa # bright red +bright1=fcc5dc # bright red bright2=27d64d # bright green bright3=f3d64d # bright yellow bright4=4545db # bright blue diff --git a/.config/foot/foot.ini b/.config/foot/foot.ini index 121dfde..4fce0b8 100644 --- a/.config/foot/foot.ini +++ b/.config/foot/foot.ini @@ -29,7 +29,7 @@ pad=10x10 # optionally append 'center' # notify=notify-send -a ${app-id} -i ${app-id} ${title} ${body} -bold-text-in-bright=yes +bold-text-in-bright=no # word-delimiters=,│`|:"'()[]{}<> # selection-target=primary # workers= @@ -70,7 +70,7 @@ alpha=0.7 foreground=f4e5e7 background=17100b regular0=2e2016 # black -regular1=d88f96 # red +regular1=ff99c8 # red regular2=16af38 # green regular3=dbbc2f # yellow regular4=1961e6 # blue @@ -78,7 +78,7 @@ regular5=b3787e # magenta regular6=32cbe6 # cyan regular7=f4e5e7 # white bright0=473032 # bright black -bright1=e5a7aa # bright red +bright1=fcc5dc # bright red bright2=27d64d # bright green bright3=f3d64d # bright yellow bright4=4545db # bright blue diff --git a/.config/guix/cobra/home.scm b/.config/guix/cobra/home.scm index d2701c5..404b801 100644 --- a/.config/guix/cobra/home.scm +++ b/.config/guix/cobra/home.scm @@ -9,14 +9,7 @@ (plain-file "devspec" "\ #!/usr/bin/env bash -if [[ $HOSTNAME == pp ]]; then - PRIV=doas - UPDATE=\"$PRIV sh -c 'apk update && apk upgrade -aiv && apk fix'\" - COPY_COMMAND=\"wl-copy\" - PASTE_COMMAND=\"wl-paste\" - WIFI=wlan0 - WM=\"bash\" -elif [[ $HOSTNAME == Oganesson || $HOSTNAME == Radon ]]; then : +if [[ $HOSTNAME == Oganesson || $HOSTNAME == Radon ]]; then : elif [[ $HOSTNAME == Neon ]]; then export WLR_NO_HARDWARE_CURSORS=1 else @@ -32,7 +25,6 @@ fi")) (plain-file "bash_profile" "\ # Honor per-interactive-shell startup file if [ -f ~/.bashrc ]; then . ~/.bashrc; fi -export PATH=\"~/.local/bin:$PATH\" export LESS_TERMCAP_mb='' export LESS_TERMCAP_md='' export LESS_TERMCAP_me='' @@ -41,13 +33,6 @@ export LESS_TERMCAP_so='' export LESS_TERMCAP_ue='' export LESS_TERMCAP_us='' export LESS=-R -export PATH=~/.guix-home/profile/bin:$PATH - -PATH=\"/home/cobra/perl5/bin${PATH:+:${PATH}}\"; export PATH; -PERL5LIB=\"/home/cobra/perl5/lib/perl5${PERL5LIB:+:${PERL5LIB}}\"; export PERL5LIB; -PERL_LOCAL_LIB_ROOT=\"/home/cobra/perl5${PERL_LOCAL_LIB_ROOT:+:${PERL_LOCAL_LIB_ROOT}}\"; export PERL_LOCAL_LIB_ROOT; -PERL_MB_OPT=\"--install_base \\\"/home/cobra/perl5\\\"\"; export PERL_MB_OPT; -PERL_MM_OPT=\"INSTALL_BASE=/home/cobra/perl5\"; export PERL_MM_OPT; . ~/.devspec [ -f ~/.guix-home/setup-environment ] && . ~/.guix-home/setup-environment diff --git a/.config/guix/cobra/home/configs.scm b/.config/guix/cobra/home/configs.scm index 5e61a03..81e177b 100644 --- a/.config/guix/cobra/home/configs.scm +++ b/.config/guix/cobra/home/configs.scm @@ -715,7 +715,7 @@ pad=10x10 # optionally append 'center' # notify=notify-send -a ${app-id} -i ${app-id} ${title} ${body} -bold-text-in-bright=yes +bold-text-in-bright=no # word-delimiters=,│`|:\"'()[]{}<> # selection-target=primary # workers= @@ -756,7 +756,7 @@ alpha=0.7 foreground=f4e5e7 background=17100b regular0=2e2016 # black -regular1=d88f96 # red +regular1=ff99c8 # red regular2=16af38 # green regular3=dbbc2f # yellow regular4=1961e6 # blue @@ -764,7 +764,7 @@ regular5=b3787e # magenta regular6=32cbe6 # cyan regular7=f4e5e7 # white bright0=473032 # bright black -bright1=e5a7aa # bright red +bright1=fcc5dc # bright red bright2=27d64d # bright green bright3=f3d64d # bright yellow bright4=4545db # bright blue @@ -875,7 +875,7 @@ scrollback-down-line=Mod1+n foreground=f4e5e7 background=17100b regular0=2e2016 # black -regular1=d88f96 # red +regular1=ff99c8 # red regular2=16af38 # green regular3=dbbc2f # yellow regular4=1961e6 # blue @@ -883,7 +883,7 @@ regular5=b3787e # magenta regular6=32cbe6 # cyan regular7=f4e5e7 # white bright0=473032 # bright black -bright1=e5a7aa # bright red +bright1=fcc5dc # bright red bright2=27d64d # bright green bright3=f3d64d # bright yellow bright4=4545db # bright blue diff --git a/.config/waybar/config b/.config/waybar/config index 5c28499..84fb6ba 100644 --- a/.config/waybar/config +++ b/.config/waybar/config @@ -49,7 +49,7 @@ "critical": 15 }, // Connected to AC - "format": "{icon} ^{capacity}%", // Icon: bolt + "format": "{icon} {capacity}%", // Icon: bolt // Not connected to AC "format-discharging": "{icon} {capacity}%", "format-icons": [ @@ -76,7 +76,7 @@ "cpu": { "interval": 5, - "format": " {usage}%", // Icon: microchip + "format": " {usage}%", // Icon: cpu "states": { "warning": 70, "critical": 90 @@ -85,7 +85,7 @@ "memory": { "interval": 5, - "format": "MEM {}%", // Icon: memory + "format": " {}%", // Icon: microchip "states": { "warning": 70, "critical": 90 diff --git a/.devspec b/.devspec index 643bba5..29365b1 100644 --- a/.devspec +++ b/.devspec @@ -1,13 +1,6 @@ #!/usr/bin/env bash -if [[ $HOSTNAME == pp ]]; then - PRIV=doas - UPDATE="$PRIV sh -c 'apk update && apk upgrade -aiv && apk fix'" - COPY_COMMAND="wl-copy" - PASTE_COMMAND="wl-paste" - WIFI=wlan0 - WM="bash" -elif [[ $HOSTNAME == Oganesson || $HOSTNAME == Radon ]]; then : +if [[ $HOSTNAME == Oganesson || $HOSTNAME == Radon ]]; then : elif [[ $HOSTNAME == Neon ]]; then export WLR_NO_HARDWARE_CURSORS=1 else diff --git a/.newsboat/config b/.newsboat/config index ae03377..4288967 100644 --- a/.newsboat/config +++ b/.newsboat/config @@ -1,4 +1,4 @@ -browser "swayhide mpv --user-agent=Mozilla/5.0 '--ytdl-format=bestvideo[height=?480][fps<=?30][vcodec!=?vp9]+bestaudio/best' %u" +browser "cmus-remote -U; swayhide mpv --user-agent=Mozilla/5.0 '--ytdl-format=bestvideo[height=?480][fps<=?30][vcodec!=?vp9]+bestaudio/best' %u" use-proxy yes proxy-type socks5h proxy 127.0.0.1:9050 diff --git a/.prompt b/.prompt index 8cc0805..60d577d 100644 --- a/.prompt +++ b/.prompt @@ -19,6 +19,10 @@ _GUIX_MAXLIST=1 # Minimum microseconds to show a count _MIN_US=0 +# Number of characters of the {start,end} of the IP you SSH into +_SSH_LIMIT_START=4 +_SSH_LIMIT_END=4 + __debug_trap() { # Set necessary pre-command variables (PROMPT_COMMAND is a # command so its excluded here) @@ -108,11 +112,13 @@ __sig() { __ssh() { local CON=($SSH_CONNECTION) local SRV_IP="${CON[2]}" + [[ $_SSH_LIMIT_START -lt 0 ]] && _SSH_LIMIT_START=0 + [[ $_SSH_LIMIT_END -lt 0 ]] && _SSH_LIMIT_END=0 [[ -z "$SRV_IP" ]] && return local SRV_PORT="${CON[3]}" # 4 chars from startand 4 chars from end local SRV_IP_CUT="${_CYN}${SRV_IP}" - [[ ${#SRV_IP} -gt 8 ]] && local SRV_IP_CUT="${_CYN}${SRV_IP:0:4}${_WHT}*${_CYN}${SRV_IP: -4}" + [[ ${#SRV_IP} -gt $((_SSH_LIMIT_START+_SSH_LIMIT_END)) ]] && local SRV_IP_CUT="${_CYN}${SRV_IP:0:$_SSH_LIMIT_START}${_WHT}*${_CYN}${SRV_IP: -$_SSH_LIMIT_END}" printf '%s' "${_GRN}${_BLU}[${SRV_IP_CUT}${_PRP}${_BLD}:${_NON}${_CYN}${SRV_PORT}${_BLU}]${_NON}" }