From b95ae4c5c9ff4d693d6424cce8a0d579754c4202 Mon Sep 17 00:00:00 2001 From: iceyrazor Date: Mon, 30 Jun 2025 00:05:45 -0500 Subject: [PATCH] - moved system scripts to here - config changes - fixed my backup scripts. rsync -a - added dmenu script - fixed finds in env.sh --- env/.config/.profile | 3 +- env/.config/hypr/hyprland.conf | 2 +- env/.local/bin/scripts/backup/backup-flash | 4 +-- env/.local/bin/scripts/backup/backup-tol | 4 +-- env/.local/bin/scripts/backup/backup-tol2 | 4 +-- env/.local/bin/scripts/backup/bbackup | 12 ++------ env/.local/bin/scripts/dmount | 35 ++++++++++++++++++++++ runs-all/env.sh | 9 +++--- 8 files changed, 51 insertions(+), 22 deletions(-) create mode 100755 env/.local/bin/scripts/dmount diff --git a/env/.config/.profile b/env/.config/.profile index 86d11d9..4dd36b5 100755 --- a/env/.config/.profile +++ b/env/.config/.profile @@ -61,9 +61,8 @@ alias lfk=~/.local/bin/lf-gadgets/lf-kitty/lf-kitty alias ovim=/usr/bin/vim alias vim=nvim alias notes="cd ~/stuff/notes && vim notes.md && cd ~" -alias ts="~/stuff/scripts/system/tmux-sessionizer.sh" +alias ts="tmux-sessionizer.sh" alias fman="bash -c 'compgen -c' | fzf | xargs man" -alias etask="$EDITOR ~/stuff/scripts/system/task.sh" alias LC="fukn loadkeys ~/.config/swapscape.map" diff --git a/env/.config/hypr/hyprland.conf b/env/.config/hypr/hyprland.conf index b352a52..884247d 100644 --- a/env/.config/hypr/hyprland.conf +++ b/env/.config/hypr/hyprland.conf @@ -298,7 +298,7 @@ bind = $mainMod SHIFT, Q, exit, bind = $mainMod, E, exec, $fileManager bind = $mainMod, space, togglefloating, bind = $mainMod, D, exec, $menu -bind = $mainMod SHIFT, D, exec, $HOME/stuff/scripts/system/rofi-search-web.sh +bind = $mainMod SHIFT, D, exec, $HOME/.local/bin/system/rofi-search-web.sh bind = $mainMod, P, pseudo, # dwindle bind = $mainMod SHIFT, i, togglesplit, # dwindle bind = $mainMod, f, fullscreen, 0 diff --git a/env/.local/bin/scripts/backup/backup-flash b/env/.local/bin/scripts/backup/backup-flash index c9ad023..732d191 100755 --- a/env/.local/bin/scripts/backup/backup-flash +++ b/env/.local/bin/scripts/backup/backup-flash @@ -2,12 +2,12 @@ cd ~/stuff/scripts fsync () { # t? - rsync -RUurvn --size-only --delete-after $exclude $syncfile "$target" + rsync -RUuavn --delete-after $exclude $syncfile "$target" printf "===commit these changes?\n" read - "y/n: " uinput if [ "$uinput" != "n" ] && [ "$uinput" != "N" ]; then printf "\n\n\n" - rsync -RUurv --progress --size-only --delete-after $exclude $syncfile "$target" + rsync -RUuav --progress --delete-after $exclude $syncfile "$target" printf "\n===end sync\n---------\n\n" fi } diff --git a/env/.local/bin/scripts/backup/backup-tol b/env/.local/bin/scripts/backup/backup-tol index d065b08..49e73aa 100755 --- a/env/.local/bin/scripts/backup/backup-tol +++ b/env/.local/bin/scripts/backup/backup-tol @@ -2,7 +2,7 @@ cd ~/ fsynca () { # t? - rsync -RUurvn --size-only --delete-after $exclude $syncfile "$target" + rsync -RUuavn --delete-after $exclude $syncfile "$target" } fsyncb () { @@ -10,7 +10,7 @@ fsyncb () { read -p "y/n: " uinput if [ "$uinput" != "n" ] && [ "$uinput" != "N" ]; then printf "\n\n\n" - rsync -RUurv --progress --size-only --delete-after $exclude $syncfile "$target" + rsync -RUuav --progress --delete-after $exclude $syncfile "$target" printf "\n===end sync\n---------\n\n" fi } diff --git a/env/.local/bin/scripts/backup/backup-tol2 b/env/.local/bin/scripts/backup/backup-tol2 index 1f0a66d..18dd1c7 100755 --- a/env/.local/bin/scripts/backup/backup-tol2 +++ b/env/.local/bin/scripts/backup/backup-tol2 @@ -2,7 +2,7 @@ cd ~/ fsynca () { # t? - rsync -RUurvn --size-only --delete-after $exclude $syncfile "$target" + rsync -RUuavn --delete-after $exclude $syncfile "$target" } fsyncb () { @@ -10,7 +10,7 @@ fsyncb () { read -p "y/n: " uinput if [ "$uinput" != "n" ] && [ "$uinput" != "N" ]; then printf "\n\n\n" - rsync -RUurv --progress --size-only --delete-after $exclude $syncfile "$target" + rsync -RUuav --progress --delete-after $exclude $syncfile "$target" printf "\n===end sync\n---------\n\n" fi } diff --git a/env/.local/bin/scripts/backup/bbackup b/env/.local/bin/scripts/backup/bbackup index 0401eed..f5674f0 100755 --- a/env/.local/bin/scripts/backup/bbackup +++ b/env/.local/bin/scripts/backup/bbackup @@ -2,7 +2,7 @@ cd ~/ fsynca () { # t? - rsync -RUurvn --size-only --delete-after $exclude $syncfile "$target" + rsync -RUuavn --delete-after $exclude $syncfile "$target" } fsyncb () { @@ -10,22 +10,16 @@ fsyncb () { read -p "y/n: " uinput if [ "$uinput" != "n" ] && [ "$uinput" != "N" ]; then printf "\n\n\n" - rsync -RUurv --progress --size-only --delete-after $exclude $syncfile "$target" + rsync -RUuav --progress --delete-after $exclude $syncfile "$target" printf "\n===end sync\n---------\n\n" fi } syncfile="stuff .surf/styles .config/eDEX-UI/ .gnupg .ssh .local/bin/lf-gadgets .config/FreeTube .config/wlxoverlay .config/newsboat .config/zsh .config/vesktop/themes .keepass .config/Pinta .config/cmus .config/cava .local/share/applications/custom .local/share/osu" -# se shit -syncfile="$syncfile /home/iceyrazor/.local/share/Steam/steamapps/compatdata/244850/pfx/drive_c/users/steamuser/AppData/Roaming/SpaceEngineers/Blueprints /home/iceyrazor/.local/share/Steam/steamapps/compatdata/244850/pfx/drive_c/users/steamuser/AppData/Roaming/SpaceEngineers/IngameScripts /home/iceyrazor/.local/share/Steam/steamapps/compatdata/244850/pfx/drive_c/users/steamuser/AppData/Roaming/SpaceEngineers/Saves" - target="/home/iceyrazor/mnt-backups/LINUX FILES/home/iceyrazor" -exclude="--exclude node_modules --exclude node_modules_23 --exclude dontsync --exclude **/target --exclude LinVAM/pyenv" +exclude="--exclude node_modules --exclude node_modules_23 --exclude **/target --exclude LinVAM/pyenv" fsynca -printf "==CC-survival unsynced?\n\n" -printf "==osu unsynced\n\n" - fsyncb diff --git a/env/.local/bin/scripts/dmount b/env/.local/bin/scripts/dmount new file mode 100755 index 0000000..6a3415c --- /dev/null +++ b/env/.local/bin/scripts/dmount @@ -0,0 +1,35 @@ +#!/bin/bash +sudo="sudo" +[ doas ] && sudo="doas" + +umo=0 + +while getopts "u" opt; do + case "$opt" in + u) umo=1 + ;; + esac +done + +shift $((OPTIND-1)) +[ "${1:-}" = "--" ] && shift + +if [ $umo == 1 ]; then + nf=4 +else + nf=3 +fi + + +parts="$(lsblk -rno path,size,type,mountpoint | grep -e part -e lvm | awk "NF==$nf {print \$1, \$2, \$3, \$4}")" + +# choice="$(printf "$parts" | rofi -dmenu "beans" | sed 's/ .*//')" +choice="$(printf "$parts" | fzf | sed 's/ .*//')" + +[ "$choice" == "" ] && exit 0 + +if [ $umo == 1 ]; then + $sudo umount $choice +else + $sudo mount $choice ~/u +fi diff --git a/runs-all/env.sh b/runs-all/env.sh index 55dc4e1..65c11a2 100755 --- a/runs-all/env.sh +++ b/runs-all/env.sh @@ -5,7 +5,6 @@ echo DEPLOYING ENV ALL cp -r $script_dir_2/../env/. "$DEV_ENV" [ -d "$script_dir_2/../env_private/env/" ] && cp -r $script_dir_2/../env_private/env/. "$DEV_ENV" -path_dirs="$(find $DEV_ENV/.local/bin/scripts -type d)" if [ ! -f "/etc/profile" ]; then echo NO /etc/profile @@ -14,12 +13,14 @@ else export PATH="" source /etc/profile paths="$PATH" - yt_cli_dir="$(find ~/stuff/scripts/**/youtube-playlist-cli -maxdepth 0 -type d)" + path_dirs="$(find $DEV_ENV/.local/bin/scripts -type d)" + yt_cli_dir="$(find ~/stuff/ -name youtube-playlist-cli -type d)" path_dirs="$path_dirs $yt_cli_dir -$(find ~/stuff/scripts/**/theme-setter -maxdepth 0 -type d) -$(find ~/stuff/scripts/system -maxdepth 2 -type d)" +$(find ~/stuff/ -name theme-setter -type d) +$(find $script_dir/keep/system -type d) +$(find $script_dir/env_private/keep/system -type d)" for s in $path_dirs; do echo "adding $s to path"