From e1255dc9efe567cbf6da371a0011594886c6eb5e Mon Sep 17 00:00:00 2001 From: stupidcomputer Date: Fri, 29 Nov 2024 04:12:40 -0600 Subject: [PATCH] remove more redundant materials --- .config/sxhkd/sxhkdrc | 8 --- boxes/aristotle/home.nix | 1 - boxes/copernicus/home.nix | 1 - builds/utils/connect | 44 ------------- builds/utils/disp | 39 ----------- builds/utils/gaming | 12 ---- builds/utils/getphone | 1 - builds/utils/is_school | 3 - builds/utils/lofi | 1 - builds/utils/machine | 18 ------ builds/utils/mass_delete | 11 ---- builds/utils/mass_rename | 16 ----- builds/utils/musexplore | 8 --- builds/utils/nws | 104 ------------------------------ builds/utils/rotate_image | 23 ------- builds/utils/start-copernicus-vnc | 12 ---- builds/utils/start-phone-bridge | 21 ------ builds/utils/summarize | 18 ------ builds/utils/synchron | 1 - builds/utils/tabletmenu | 50 -------------- builds/utils/tmuxbird | 10 --- builds/utils/vpn | 5 -- home/brave/default.nix | 11 +--- home/chromium/default.nix | 15 ----- home/dunst/default.nix | 15 ----- home/emacs/default.nix | 11 ---- home/tridactyl/default.nix | 9 --- home/x11-progs.nix | 20 +++--- home/x11.nix | 3 - lappy/hardware-configuration.nix | 1 - lib/default.nix | 28 -------- 31 files changed, 11 insertions(+), 509 deletions(-) delete mode 100755 builds/utils/connect delete mode 100755 builds/utils/gaming delete mode 100755 builds/utils/getphone delete mode 100755 builds/utils/is_school delete mode 100755 builds/utils/lofi delete mode 100755 builds/utils/machine delete mode 100755 builds/utils/mass_delete delete mode 100755 builds/utils/mass_rename delete mode 100755 builds/utils/musexplore delete mode 100755 builds/utils/nws delete mode 100755 builds/utils/rotate_image delete mode 100755 builds/utils/start-copernicus-vnc delete mode 100755 builds/utils/start-phone-bridge delete mode 100755 builds/utils/summarize delete mode 100755 builds/utils/tabletmenu delete mode 100755 builds/utils/tmuxbird delete mode 100755 builds/utils/vpn delete mode 100644 home/chromium/default.nix delete mode 100644 home/dunst/default.nix delete mode 100644 home/emacs/default.nix delete mode 100644 home/tridactyl/default.nix delete mode 100644 lib/default.nix diff --git a/.config/sxhkd/sxhkdrc b/.config/sxhkd/sxhkdrc index 16ea90e..9e43d8d 100644 --- a/.config/sxhkd/sxhkdrc +++ b/.config/sxhkd/sxhkdrc @@ -31,10 +31,6 @@ ctrl + b; r pkill -USR1 -x sxhkd; \ bspc wm -r -# show nws radar -super + {_,shift + }n - nws {local,national} - # switch to "mouse mode" super + m mode mouse @@ -96,10 +92,6 @@ super + {t,f,s} ctrl + b; {t,f,s} bspc node -t {tiled,floating,fullscreen} -# x230t specific -- activate the tablet menu -XF86RotateWindows - tabletmenu - shift + Insert special_ins diff --git a/boxes/aristotle/home.nix b/boxes/aristotle/home.nix index 24f26c5..0de943a 100644 --- a/boxes/aristotle/home.nix +++ b/boxes/aristotle/home.nix @@ -3,7 +3,6 @@ { imports = [ ../../home/x11.nix - ../../home/chromium ]; home.stateVersion = "24.05"; diff --git a/boxes/copernicus/home.nix b/boxes/copernicus/home.nix index 8c118a1..144dd0e 100644 --- a/boxes/copernicus/home.nix +++ b/boxes/copernicus/home.nix @@ -3,7 +3,6 @@ { imports = [ ../../home/x11.nix - ../../home/chromium ]; home.stateVersion = "23.11"; diff --git a/builds/utils/connect b/builds/utils/connect deleted file mode 100755 index c37240d..0000000 --- a/builds/utils/connect +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/sh - -[ "$(pgrep -c NetworkManager)" -eq 1 ] && - printf "NetworkManager is already running!\n" && - exit - -case $1 in - "c"*) - wpa_supplicant -iwlp3s0 -c/etc/wpa_supplicant/wpa_supplicant.conf -B - dhcpcd wlp3s0 - # make tor and nohup shut up in a posix-compliant way - nohup tor >/dev/null 2>&1 - ;; - "d"*) - killall -15 wpa_supplicant dhcpcd tor - ;; - "r"*) - sh "$0" d - sh "$0" c - ;; - "t"*) - [ "$(pgrep -c wpa_supplicant)" -eq 1 ] && sh "$0" d && exit - sh "$0" c - ;; - "l"*) - iw dev wlp3s0 scan | \ - grep 'SSID\|signal' | \ - grep -v 'SSID List' | \ - awk -F': ' '{print $2}' | \ - sed 'N;s/\n/ /' | \ - grep -v '\x00' - ;; - *) - echo " -simple wrapper for connecting to a network -${0} toggle to toggle wifi connection -${0} restart to restart wifi -${0} disconnect to disconnect -${0} connect to connect to network -${0} list to list networks -" - ;; -esac -exit 0 diff --git a/builds/utils/disp b/builds/utils/disp index fe786fa..654130c 100755 --- a/builds/utils/disp +++ b/builds/utils/disp @@ -49,12 +49,6 @@ exists() { } case "$(hostname)" in - "mainsail") - echo "mainsail" - xrandr --output VGA-1 --left-of HDMI-1 - bspc monitor VGA-1 -d 01 03 05 07 09 - bspc monitor HDMI-1 -d 02 04 06 08 00 - ;; "aristotle") bspc monitor eDP-1 -d 01 02 03 04 05 06 07 08 09 ;; @@ -113,38 +107,6 @@ case "$(hostname)" in sshfs "usr@$target:/home/usr/vdir" $HOME/.cache/mount_point5 -o ConnectTimeout=1 ln -sf $HOME/.cache/mount_point5 $HOME/vdir - ;; - "x230t") - echo "x230t" - case "$1" in - "dockedtwo") - # assume we're connected to the two external displays - xrandr --output VGA-1 --primary --mode 1920x1080 --rotate normal \ - --output HDMI-1 --mode 1920x1080 --rotate normal --right-of VGA-1 \ - --output LVDS-1 --off - bspc monitor VGA-1 -d 01 03 05 07 09 - bspc monitor HDMI-1 -d 02 04 06 08 - ;; - *) - if - assert_edid "VGA-1" "35737dc483d2c3b1b20ea2343ce13c6c42d115febdc9634f8437e1b9f7fd3f5c" && - assert_edid "HDMI-A-1" "01887cbd23d74201e489a6334656f7db73a7b7f732a738a9f1ee2d53389f7817"; - then - echo "docked" - xrandr --output LVDS-1 --primary --mode 1366x768 --pos 1194x1080 --rotate normal \ - --output VGA-1 --mode 1920x1080 --pos 0x0 --rotate normal \ - --output HDMI-1 --mode 1920x1080 --pos 1920x0 --rotate normal \ - --output DP-1 --off \ - --output HDMI-2 --off \ - --output DP-2 --off - bspc monitor LVDS-1 -d 01 04 07 - bspc monitor VGA-1 -d 02 05 08 - bspc monitor HDMI-1 -d 03 06 09 - else - bspc monitor LVDS-1 -d 01 02 03 04 05 06 07 08 09 - fi - ;; - esac ;; "copernicus") case "$1" in @@ -169,7 +131,6 @@ case "$(hostname)" in bspc monitor HDMI-1-2 -d 10 ;; esac - dunst & disown phone pair & disown ;; "localhost") # phone in termux diff --git a/builds/utils/gaming b/builds/utils/gaming deleted file mode 100755 index 0a5a14f..0000000 --- a/builds/utils/gaming +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -discord & -st -c send-to-9 -e cmus & -st -c send-to-9 -e ncpamixer & -sleep 1 -cmus-remote < $temp -nvim "$temp" - -different=$(ls | cat "$temp" - | sort | uniq -u) -rm $different -for i in $different; do - printf "rm %i\n" "$i" -done diff --git a/builds/utils/mass_rename b/builds/utils/mass_rename deleted file mode 100755 index 36ebb37..0000000 --- a/builds/utils/mass_rename +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh - -temp=$(mktemp) -ls > $temp -nvim $temp -results=$(ls | paste -d'|' - $temp) - -IFS=" -" -for i in $results; do - before="${i%%|*}" - after="${i#*|}" - - [ "$before" != "$after" ] && mv "$before" "$after" - printf "%s -> %s\n" "$before" "$after" -done diff --git a/builds/utils/musexplore b/builds/utils/musexplore deleted file mode 100755 index feaf0e8..0000000 --- a/builds/utils/musexplore +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -svkbd-mobile-intl & -choice=$(ls ~/annex/music/works | tmenu) -kill %1 -if [ -n "$choice" ]; then - find "$HOME/annex/music/works/$choice/" -type f | sxiv -i -fi diff --git a/builds/utils/nws b/builds/utils/nws deleted file mode 100755 index e1e52a1..0000000 --- a/builds/utils/nws +++ /dev/null @@ -1,104 +0,0 @@ -#!/bin/sh - -[ -z "${XDG_CONFIG_DIR}" ] && XDG_CONFIG_DIR="${HOME}/.config" -[ -z "${NWS_CONFIG}" ] && NWS_CONFIG="${XDG_CONFIG_DIR}/nws" -[ -n "${NWS_ZONE}" ] || \ - [ -e "${NWS_CONFIG}" ] && NWS_ZONE=$(cat "${NWS_CONFIG}") || - NWS_ZONE="KGYX" -[ -z "${NWS_GIF}" ] && NWS_GIF="mpv --loop" -[ -z "${NWS_TORIFY}" ] && NWS_TORIFY="" - - -info () { - printf %s "\ -nws - wrapper for the National Weather Service's website - -=> [n]ational - View national weather mosaic -=> [l]ocal - View local weather mosaic -=> [r]ivers - View local river conditions -=> [w]eather - View local weather observations -=> [m]osaic [id] - View a given area's weather mosaic -=> [s]et [id] - Set local zone -=> [t]ext [id] - View text messages by catagory - -Default zone: export NWS_ZONE= -GIF player: export NWS_GIF= -Configuration: export NWS_CONFIG= -Torify wrapper: export NWS_TORIFY= -" -} -err () { - printf "err: %s\n" "${1}" - [ -z "${2}" ] && exit 1 - exit "${2}" -} -kstrip () { - printf %s "$1" | sed 's/^K\(.*\)/\1/' -} -national () { - mosaic CONUS-LARGE -} -# name interestingly to avoid keyword collision -localradar () { - mosaic ${NWS_ZONE} -} -mosaic () { - ${NWS_GIF} "https://radar.weather.gov/ridge/standard/${1}_loop.gif" -} -setzone () { - printf "%s" "${1}" > "${NWS_CONFIG}" -} -river () { - textmessage "RVA" -} -weather () { - textmessage "ZFP" -} -textmessage () { - curl --silent --fail "https://forecast.weather.gov/product.php?site=NWS&issuedby=$(kstrip ${NWS_ZONE})&product=${1}&format=TXT&version=1" | \ - sed -n '//,/<\/pre>/p' | \ - grep -v "a href" | \ - grep -v '' | \ - grep -v '<\/pre>' || \ - printf "${1} data not found for zone %s" ${NWS_ZONE} -} - -case $1 in - "n"*) - national - ;; - "l"*) - localradar - ;; - "r"*) - river - ;; - "w"*) - weather - ;; - "m"*) - if [ "$#" -eq 2 ]; then - mosaid "$2" - else - err "two args required" - fi - ;; - "s"*) - if [ "$#" -eq 2 ]; then - setzone "$2" - else - err "two args required" - fi - ;; - "t"*) - if [ "$#" -eq 2 ]; then - textmessage "$2" - else - err "two args required" - fi - ;; - *) - info - ;; -esac -exit 0 diff --git a/builds/utils/rotate_image b/builds/utils/rotate_image deleted file mode 100755 index 52c6996..0000000 --- a/builds/utils/rotate_image +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh - -print_help() { - echo " -rotate -- a thin wrapper around imagemagick - -$1 - degrees (clockwise) -$2 - infile -$3 - outfile" - -exit -} - -if [ "$1" = "-h" ]; then - print_help -fi - -if [ -z "$1" ]; then - print_help -fi - -[ -z "$3" ] && 3="$2.out" -convert "$1" -rotate "$2" "$3" diff --git a/builds/utils/start-copernicus-vnc b/builds/utils/start-copernicus-vnc deleted file mode 100755 index d25d4b6..0000000 --- a/builds/utils/start-copernicus-vnc +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -pkill x11vnc - -x11vnc -loop -display $DISPLAY -rfbport 5900 -listen 127.0.0.1 & # main screen -x11vnc -loop -display $DISPLAY -rfbport 5901 -listen 127.0.0.1 -clip xinerama0 & # screen 0 -x11vnc -loop -display $DISPLAY -rfbport 5902 -listen 127.0.0.1 -clip xinerama1 & # screen 1 -x11vnc -loop -display $DISPLAY -rfbport 5903 -listen 127.0.0.1 -clip xinerama2 & # screen 2 -x11vnc -loop -display $DISPLAY -rfbport 5904 -listen 127.0.0.1 -clip xinerama3 & # screen 3 -x11vnc -loop -display $DISPLAY -rfbport 5905 -listen 127.0.0.1 -clip xinerama4 & # screen 4 - -read diff --git a/builds/utils/start-phone-bridge b/builds/utils/start-phone-bridge deleted file mode 100755 index d8de251..0000000 --- a/builds/utils/start-phone-bridge +++ /dev/null @@ -1,21 +0,0 @@ -ssh phone " - termux-notification -c 'a computer connected via the termux bridge'; - while true; do - termux-sms-list -d -t inbox | \ - jq -r 'map(select(.read == false)).[] | if .sender == null then .number else .sender end, .body' | \ - xargs -d '\n' -n2 - done -" 2>&1 | awk '!seen[$0]++' | tee help_me_im_going_insane | xargs -L1 dunstify - -ssh phone " -# ( while true; do -# echo "911 -#testing message" -#done ) | { - -#( while true; do -# ssh phone "termux-sms-list -d -t inbox" \ -# | jq -r 'map(select(.read == false)) | if .[].sender == null then .[].number else .[].sender end, .[].body' -#done ) | { -# paste -d ' ' - - -#} diff --git a/builds/utils/summarize b/builds/utils/summarize deleted file mode 100755 index f2560bd..0000000 --- a/builds/utils/summarize +++ /dev/null @@ -1,18 +0,0 @@ -case $? in - 0) - st -g 100x30+20+20 -c generic-st-window sh -c 'summarize backend | less' - ;; - 1) - figlet help menu - for i in $(ls ~/.config/sxhkd); do - printf "\n%s mode | ----------------------\n" $i - grep -iv "^[[:blank:]].*$" ~/.config/sxhkd/$i | \ - grep -v '^$' | \ - sed 'N;s/\n/ -> /' | \ - sed 's/^\# //g' - done - ;; - *) - echo "???????????????" - ;; -esac diff --git a/builds/utils/synchron b/builds/utils/synchron index 4cde79b..7aa5a6a 100755 --- a/builds/utils/synchron +++ b/builds/utils/synchron @@ -1,7 +1,6 @@ if [ "$(hostname)" = "localhost" ]; then mbsync --config=$HOME/.config/isync/phone-config else - is_school && echo "enable the vpn" mbsync --config=$HOME/.config/isync/config main fi diff --git a/builds/utils/tabletmenu b/builds/utils/tabletmenu deleted file mode 100755 index 692903a..0000000 --- a/builds/utils/tabletmenu +++ /dev/null @@ -1,50 +0,0 @@ -svkbd-mobile-intl & - -choice=$( - printf " -vert-mode -hori-mode -keyb -nokeyb -musexplore -brave -chromium -run -close-wind - " | tmenu -) - -pkill svkbd - -case "$choice" in - "vert-mode") - xrandr --output LVDS-1 --rotate left - xinput set-prop "Wacom ISDv4 E6 Finger" 178 0 -1 1 1 0 0 0 0 1 - sleep 4 - ;; - "hori-mode") - xrandr --output LVDS-1 --rotate normal - xinput set-prop "Wacom ISDv4 E6 Finger" 178 1 0 0 0 1 0 0 0 1 - ;; - "nokeyb") - pkill svkbd - ;; - "keyb") - svkbd-mobile-intl & disown - ;; - "musexplore") - musexplore - ;; - "brave") - brave - ;; - "chromium") - chromium - ;; - "run") - tmenu_run - ;; - "close-wind") - bspc node -c - ;; -esac diff --git a/builds/utils/tmuxbird b/builds/utils/tmuxbird deleted file mode 100755 index 9ddbd61..0000000 --- a/builds/utils/tmuxbird +++ /dev/null @@ -1,10 +0,0 @@ -tmux new-session -d -s tmuxbird "neomutt" -tmux split-window -fb -t tmuxbird:0 -l 3% -d 'watch -n 30 "mbsync --config=$HOME/.config/isync/config main; vdirsyncer sync; rbw sync"' -sleep 1 -tmux resize-pane -t 1 -U 5 -tmux split-window -fhb -t tmuxbird:0 -l 3% -d 'watch -n 30 "todo list"' -tmux rename-window mailview -tmux new-window -n calview "khal interactive" -tmux split-window -fhb -t tmuxbird:1 -l 10 -d 'todo shell' -tmux select-window -t 0 -tmux attach-session -t tmuxbird diff --git a/builds/utils/vpn b/builds/utils/vpn deleted file mode 100755 index 9c6306c..0000000 --- a/builds/utils/vpn +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -# a poor man's vpn -ip=$(dig +short beepboop.systems) -sshuttle --dns -r ryan@$ip:443 0/0 diff --git a/home/brave/default.nix b/home/brave/default.nix index 3d43428..b676fde 100644 --- a/home/brave/default.nix +++ b/home/brave/default.nix @@ -1,16 +1,9 @@ { lib, inputs, config, pkgs, home, ... }: -let - plib = import ../../lib { inherit pkgs; }; -in { +{ programs.chromium = { enable = true; - package = lib.mkForce (plib.mkPackageWrapper - pkgs.brave - "export HOME=$HOME/.cache/brave" - "" - "--args --disable-frame-rate-limit" - ); + package = pkgs.brave; extensions = [ { id = "ecnphlgnajanjnkcmbpancdjoidceilk"; } ]; diff --git a/home/chromium/default.nix b/home/chromium/default.nix deleted file mode 100644 index 66707b3..0000000 --- a/home/chromium/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ lib, inputs, config, pkgs, home, ... }: - -{ - home.packages = with pkgs; [ - ungoogled-chromium - ]; - - programs.chromium = { - enable = true; - package = pkgs.ungoogled-chromium; - extensions = [ - { id = "ecnphlgnajanjnkcmbpancdjoidceilk"; } - ]; - }; -} diff --git a/home/dunst/default.nix b/home/dunst/default.nix deleted file mode 100644 index f19dc94..0000000 --- a/home/dunst/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ lib, config, pkgs, home, ... }: - -{ - home.file = { - ".config/dunst/dunstrc" = { - source = ../../.config/dunst/dunstrc; - }; - ".config/dunst/notification_handler.sh" = { - source = ../../.config/dunst/notification_handler.sh; - }; - ".config/dunst/beep.m4a" = { - source = ../../.config/dunst/beep.m4a; - }; - }; -} diff --git a/home/emacs/default.nix b/home/emacs/default.nix deleted file mode 100644 index d529e14..0000000 --- a/home/emacs/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ lib, config, pkgs, home, ... }: - -{ - programs.emacs.enable = true; - - home.file = { - ".config/emacs/init.el" = { - source = ../../.config/emacs/init.el; - }; - }; -} diff --git a/home/tridactyl/default.nix b/home/tridactyl/default.nix deleted file mode 100644 index 5d01b01..0000000 --- a/home/tridactyl/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ lib, config, pkgs, home, ... }: - -{ - home.file = { - ".config/tridactyl/tridactylrc" = { - source = ../../.config/tridactyl/tridactylrc; - }; - }; -} diff --git a/home/x11-progs.nix b/home/x11-progs.nix index 6d13e9f..8bc5cdc 100644 --- a/home/x11-progs.nix +++ b/home/x11-progs.nix @@ -1,15 +1,13 @@ { lib, config, pkgs, ...}: -let - plib = import ../lib { inherit pkgs; }; -in { - home.packages = [ - pkgs.xclip - pkgs.xcape - pkgs.mpv - pkgs.sxiv - pkgs.xwallpaper - pkgs.xbrightness - pkgs.xdotool +{ + home.packages = with pkgs; [ + xclip + xcape + mpv + sxiv + xwallpaper + xbrightness + xdotool ]; } diff --git a/home/x11.nix b/home/x11.nix index 4d55cc4..988466f 100644 --- a/home/x11.nix +++ b/home/x11.nix @@ -4,10 +4,8 @@ imports = [ ./bspwm ./brave - ./dunst ./sx ./sxhkd - ./tridactyl ./zathura ./wallpapers ./vdirsyncer @@ -18,7 +16,6 @@ ./neomutt ./msmtp ./rbw - ./nws ./xscreensaver ./x11-progs.nix diff --git a/lappy/hardware-configuration.nix b/lappy/hardware-configuration.nix index d5030dd..80d56fe 100644 --- a/lappy/hardware-configuration.nix +++ b/lappy/hardware-configuration.nix @@ -5,7 +5,6 @@ [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot = { initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; initrd.kernelModules = [ ]; diff --git a/lib/default.nix b/lib/default.nix deleted file mode 100644 index 8e8de6e..0000000 --- a/lib/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ pkgs ? import {} }: -let - getPkgName = - pkg: - builtins.elemAt (builtins.split "-" pkg.name) 0; -in { - mkPackageWrapper = - pkg: - environ: - prefix: - postfix: - pkgs.writeScriptBin - (getPkgName pkg) - '' - #! ${pkgs.bash}/bin/bash - ${environ} - exec ${prefix} ${pkg}/bin/${getPkgName pkg} ${postfix} "$@" - ''; - mkQuarantinedPackage = - pkg: - pkgs.writeScriptBin - (getPkgName pkg) - '' - #! ${pkgs.bash}/bin/bash - export HOME=$HOME/.local/${getPkgName pkg} - exec ${pkg}/bin/${getPkgName pkg} - ''; -}