remove unused scripts, renamed the rest, updated zsh conf to reflect this
This commit is contained in:
@@ -1,99 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
|
||||
# --- SUDO CHECK ---
|
||||
if [ "$EUID" -ne 0 ]; then
|
||||
echo "This script requires root privileges. Re-running with sudo..."
|
||||
exec sudo "$0" "$@"
|
||||
fi
|
||||
|
||||
# --- HANDLE OPTIONS ---
|
||||
BORG_PASSPHRASE=""
|
||||
SHOW_FOLDERS_ONLY=false
|
||||
SHOW_FILES=false # Default to showing files and directories
|
||||
|
||||
while getopts "k:fp" opt; do
|
||||
case "$opt" in
|
||||
k)
|
||||
BORG_PASSPHRASE=$(<"$OPTARG")
|
||||
if [ -z "$BORG_PASSPHRASE" ]; then
|
||||
echo "Error: The key file is empty."
|
||||
exit 1
|
||||
fi
|
||||
echo "Using passphrase from key file: $OPTARG"
|
||||
;;
|
||||
f)
|
||||
SHOW_FOLDERS_ONLY=true
|
||||
echo "Only directories will be shown in fzf by default."
|
||||
SHOW_FILES=false
|
||||
;;
|
||||
p)
|
||||
SHOW_FILES=true
|
||||
echo "Both files and directories will be shown in fzf."
|
||||
;;
|
||||
*)
|
||||
echo "Usage: $0 [-k passphrase_file] [-f] [-p] <repo>"
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
done
|
||||
shift $((OPTIND - 1))
|
||||
|
||||
# --- FALLBACK TO /run/secrets/borg_passwd IF NO KEY FILE ---
|
||||
if [ -z "$BORG_PASSPHRASE" ]; then
|
||||
if [ $# -eq 0 ]; then
|
||||
BORG_PASSPHRASE=$(<"/run/secrets/borg_passwd")
|
||||
echo "Using passphrase from /run/secrets/borg_passwd"
|
||||
else
|
||||
# Prompt user for passphrase if neither -k nor /run/secrets/borg_passwd is available
|
||||
read -s -p "Enter Borg repository passphrase: " BORG_PASSPHRASE
|
||||
echo
|
||||
fi
|
||||
fi
|
||||
|
||||
export BORG_PASSPHRASE
|
||||
|
||||
# --- DEFAULT REPO ---
|
||||
REPO="${1:-/holocron/archives/servers/snowbelle}"
|
||||
|
||||
# --- CHECK REQUIRED COMMANDS ---
|
||||
for cmd in borg fzf find tree cp mkdir; do
|
||||
command -v "$cmd" >/dev/null || { echo "Error: '$cmd' is required but not installed."; exit 1; }
|
||||
done
|
||||
|
||||
# --- LIST ARCHIVES (sorted, newest last) ---
|
||||
mapfile -t archives < <(borg list --format="{archive}{NL}" "$REPO" | sort -r)
|
||||
if [ ${#archives[@]} -eq 0 ]; then
|
||||
echo "No archives found in $REPO"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# --- FZF ARCHIVE SELECT ---
|
||||
selected=$(printf '%s\n' "${archives[@]}" | fzf --prompt="Select archive: " --height=40% --border)
|
||||
if [ -z "$selected" ]; then
|
||||
echo "No archive selected."
|
||||
exit 1
|
||||
fi
|
||||
echo "Selected archive: $selected"
|
||||
|
||||
# --- GENERATE A UNIQUE, SHORTER MOUNT POINT ---
|
||||
MOUNT_POINT="/tmp/$(uuidgen | sha256sum | head -c 2)-restore-${selected}"
|
||||
mkdir -p "$MOUNT_POINT"
|
||||
|
||||
# --- MOUNT ARCHIVE ---
|
||||
echo "Mounting '$selected' to $MOUNT_POINT..."
|
||||
borg mount "$REPO::$selected" "$MOUNT_POINT"
|
||||
|
||||
cleanup() {
|
||||
echo "Unmounting archive..."
|
||||
borg umount "$MOUNT_POINT" >/dev/null 2>&1 || true
|
||||
rmdir "$MOUNT_POINT" >/dev/null 2>&1 || true
|
||||
}
|
||||
trap cleanup EXIT INT TERM
|
||||
|
||||
if [ ! -d "$MOUNT_POINT" ]; then
|
||||
echo "Error: mount failed."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
lf $MOUNT_POINT
|
||||
@@ -1,26 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
set -e
|
||||
pushd ~/.nix
|
||||
# nvim flake.nix
|
||||
# alejandra . &>/dev/null
|
||||
# git diff -U0 *.nix
|
||||
|
||||
# add generation comment to flake.nix
|
||||
gen=$(nixos-rebuild list-generations | grep current)
|
||||
if sed -n '3p' flake.nix | grep -q '^# generation:'; then
|
||||
# replace the comment on line 3
|
||||
sed -i "3s/^# generation:.*/# generation: $gen/" flake.nix
|
||||
else
|
||||
# insert comment on line 3
|
||||
sed -i "3i# generation: $gen" flake.nix
|
||||
fi
|
||||
|
||||
git diff -U0 $(find . -name '*.nix')
|
||||
|
||||
echo "nixos rebuilding..."
|
||||
#sudo nixos-rebuild switch --flake ~/.nix#snowbelle &>.nixos-switch-log || (
|
||||
# cat .nixos-switch-log | grep --color error && false)
|
||||
sudo nixos-rebuild switch --flake ~/.nix#snowbelle 2>&1 | tee .nixos-switch-log | grep --color=always -E "error|$" && true
|
||||
|
||||
git commit -am "$gen"
|
||||
popd
|
||||
@@ -76,9 +76,8 @@ in {
|
||||
egrep = "egrep --color=auto";
|
||||
|
||||
# --- scripts ---
|
||||
rebuild = "sh ${home_dir}/.nix/bin/rebuild.sh";
|
||||
perms = "sudo sh ${home_dir}/.nix/bin/perms.sh";
|
||||
bb = "sudo sh ${home_dir}/.nix/bin/borg_lf.sh";
|
||||
rebuild = "sh ${home_dir}/.nix/bin/rebuild";
|
||||
perms = "sudo sh ${home_dir}/.nix/bin/fix-perms";
|
||||
|
||||
# --- git ---
|
||||
status = "git status";
|
||||
|
||||
@@ -60,7 +60,7 @@ in {
|
||||
applications = 1.0;
|
||||
terminal = 0.9;
|
||||
desktop = 1.0;
|
||||
popups = 0.99;
|
||||
popups = 0.9;
|
||||
};
|
||||
|
||||
targets = {
|
||||
|
||||
@@ -16,24 +16,24 @@ in {
|
||||
programs.${program} = {
|
||||
enable = true;
|
||||
settings = {
|
||||
anchor = "top";
|
||||
width = "100%";
|
||||
height = 25;
|
||||
horizontal = true;
|
||||
# anchor = "top";
|
||||
# width = "100%";
|
||||
# height = 25;
|
||||
# horizontal = true;
|
||||
font-size = lib.mkDefault 12;
|
||||
prompt-text = " select: ";
|
||||
outline-width = 0;
|
||||
border-width = 0;
|
||||
corner-radius = 9;
|
||||
# outline-width = 0;
|
||||
# border-width = 0;
|
||||
# corner-radius = 9;
|
||||
background-color = lib.mkDefault "#2f1730";
|
||||
selection-color = lib.mkDefault "#ffffff";
|
||||
text-color = lib.mkDefault "#888888";
|
||||
min-input-width = 120;
|
||||
result-spacing = 15;
|
||||
padding-top = 0;
|
||||
padding-bottom = 0;
|
||||
padding-left = 0;
|
||||
padding-right = 0;
|
||||
# min-input-width = 120;
|
||||
# result-spacing = 15;
|
||||
# padding-top = 0;
|
||||
# padding-bottom = 0;
|
||||
# padding-left = 0;
|
||||
# padding-right = 0;
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user