From 5cefa4019bbfb52a0df0239c1e29875658fe06d2 Mon Sep 17 00:00:00 2001 From: MangoPig Date: Sun, 31 May 2026 21:21:39 +0100 Subject: [PATCH] Remove old VM helpers --- .zsh_secrets.example | 2 + .zshrc | 22 ++++---- Makefile | 3 -- scripts/azure.sh | 22 -------- scripts/storagebox.sh | 116 ------------------------------------------ 5 files changed, 15 insertions(+), 150 deletions(-) delete mode 100644 scripts/azure.sh delete mode 100644 scripts/storagebox.sh diff --git a/.zsh_secrets.example b/.zsh_secrets.example index 0281d47..8dfb97e 100644 --- a/.zsh_secrets.example +++ b/.zsh_secrets.example @@ -17,6 +17,8 @@ export CONTEXT7_API_KEY="" export GITEA_ACCESS_TOKEN="" export NETDATA_TOKEN="" export OBSIDIAN_API_KEY="" +export GITHUB_TOKEN="" +export OPEN_ROUTER_API_KEY="" # Optional overrides # export VAULT_ADDR="http://192.168.30.53:8200" diff --git a/.zshrc b/.zshrc index 5e97735..5067bd8 100644 --- a/.zshrc +++ b/.zshrc @@ -3,6 +3,9 @@ # Zsh Configuration export ZSH="$HOME/.oh-my-zsh" +# Programming Languages Root +export PROG_DIR="$HOME/.programming" + PROMPT="%B%~%b :: " RPROMPT="%n@%m" @@ -11,11 +14,9 @@ plugins=(git zsh-syntax-highlighting zsh-autosuggestions sudo rclone rust nvm go source $ZSH/oh-my-zsh.sh -# Programming Languages Root -export PROG_DIR="$HOME/.programming" - # Go and GVM (Black Box) -export GVM_ROOT="$PROG_DIR/go" +export GOPATH="$PROG_DIR/go" +export GVM_ROOT="$GOPATH" [[ -s "$GVM_ROOT/scripts/gvm" ]] && source "$GVM_ROOT/scripts/gvm" # Node and NVM (Lazy Load) @@ -57,20 +58,23 @@ if [ -d "$RIG_HOME/bin" ]; then fi # Zoxide -eval "$(zoxide init --cmd cd zsh)" +if command -v zoxide >/dev/null 2>&1; then + eval "$(zoxide init --cmd cd zsh)" +fi # Source Aliases & Secrets [ -f ~/.zsh_aliases ] && source ~/.zsh_aliases [ -f ~/.zsh_secrets ] && source ~/.zsh_secrets # Add to PATH -export PATH="$HOME/.local/bin:$CARGO_HOME/bin:$PATH" -export PATH="$GOPATH/bin:$PATH" +export PATH="$HOME/.local/bin:$CARGO_HOME/bin:$GOPATH/bin:$PATH" # opencode -if ! pgrep -f "openchamber.*7891" > /dev/null; then +if command -v openchamber >/dev/null 2>&1 && ! pgrep -f "openchamber.*7891" > /dev/null; then openchamber --port 7891 >/dev/null 2>&1 fi # direnv -eval "$(direnv hook zsh)" +if command -v direnv >/dev/null 2>&1; then + eval "$(direnv hook zsh)" +fi diff --git a/Makefile b/Makefile index 958839f..685f0db 100644 --- a/Makefile +++ b/Makefile @@ -72,9 +72,6 @@ r: cpp: bash ./scripts/cpp.sh -storagebox: - bash ./scripts/storagebox.sh - # Docker Tests test-ubuntu: @echo "Ubuntu Test" diff --git a/scripts/azure.sh b/scripts/azure.sh deleted file mode 100644 index 3b6032d..0000000 --- a/scripts/azure.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash - -# Path: scripts/azure.sh - -echo "Checking disks..." -lsblk | grep nvme - -sudo mkfs.xfs -f /dev/nvme0n1 - -sudo mkdir -p /mnt/nvme - -sudo mount /dev/nvme0n1 /mnt/nvme - -sudo chown -R $USER:$USER /mnt/nvme - -echo "NVMe mounted at /mnt/nvme" - -df -h /mnt/nvme - -# rclone sync -P --transfers=16 hetzner-box:models/Qwen3-30B-A3B-Instruct-2507 /mnt/nvme/Qwen3-30B-A3B-Instruct-2507 - -# rclone sync -P --transfers=16 /mnt/nvme/Qwen3-70B-Instruct-2024-12-04 hetzner-box:models/Qwen3-70B-Instruct-2024-12-04 \ No newline at end of file diff --git a/scripts/storagebox.sh b/scripts/storagebox.sh deleted file mode 100644 index 96c9d0c..0000000 --- a/scripts/storagebox.sh +++ /dev/null @@ -1,116 +0,0 @@ -#!/bin/bash -set -e - -# Colors -BLUE='\033[1;34m' -YELLOW='\033[1;33m' -GREEN='\033[1;32m' -RED='\033[1;31m' -NC='\033[0m' - -SECRETS_FILE="$HOME/.zsh_secrets" -REMOTE_NAME="hetzner-box" - -# Dependency Check -if ! command -v rclone &> /dev/null; then - echo -e "${RED}Error: rclone is not installed.${NC}" - exit 1 -fi - -# Load Secrets -if [ -f "$SECRETS_FILE" ]; then - source "$SECRETS_FILE" -fi - -# Configure Remote (If missing) -if ! rclone listremotes | grep -q "^${REMOTE_NAME}:$"; then - echo -e "${BLUE}Configuration missing. Starting setup...${NC}" - - if [ -z "$HETZNER_USER" ]; then - DEFAULT_USER="u513875" - read -p "Enter Username [$DEFAULT_USER]: " INPUT_USER - HETZNER_USER="${INPUT_USER:-$DEFAULT_USER}" - fi - - if [ -z "$HETZNER_HOST" ]; then - DEFAULT_HOST="${HETZNER_USER}.your-storagebox.de" - read -p "Enter Host [$DEFAULT_HOST]: " INPUT_HOST - HETZNER_HOST="${INPUT_HOST:-$DEFAULT_HOST}" - fi - - if [ -z "$HETZNER_PASS" ]; then - echo -e "${YELLOW}Note: Passwords are obscured in config, but saving to secrets file uses plain text.${NC}" - read -s -p "Enter Password: " HETZNER_PASS - echo "" - fi - - # Save to secrets - if ! grep -q "HETZNER_USER" "$SECRETS_FILE" 2>/dev/null; then - echo -e "${BLUE}Saving credentials to $SECRETS_FILE...${NC}" - { - echo "" - echo "# Hetzner Storage Box" - echo "export HETZNER_USER=\"$HETZNER_USER\"" - echo "export HETZNER_HOST=\"$HETZNER_HOST\"" - echo "export HETZNER_PASS=\"$HETZNER_PASS\"" - } >> "$SECRETS_FILE" - fi - - OBSCURED_PASS=$(rclone obscure "$HETZNER_PASS") - rclone config create "$REMOTE_NAME" sftp \ - host "$HETZNER_HOST" \ - user "$HETZNER_USER" \ - pass "$OBSCURED_PASS" \ - port 23 \ - --non-interactive - - echo -e "${GREEN}Configuration created!${NC}" -fi - -# Interactive Menu -echo -e "${BLUE}--- Hetzner Storage Box Manager ---${NC}" -echo "1) List files (ls)" -echo "2) Upload (Copy LOCAL -> REMOTE)" -echo "3) Download (Copy REMOTE -> LOCAL)" -echo "q) Quit" - -read -p "Select option: " OPTION - -case $OPTION in - 1) - read -p "Enter depth [1]: " INPUT_DEPTH - DEPTH="${INPUT_DEPTH:-1}" - echo -e "${BLUE}Listing files on Hetzner...${NC}" - rclone ls "${REMOTE_NAME}:" --max-depth "$DEPTH" - ;; - 2) - read -p "Enter local folder/file to upload: " LOCAL_PATH - LOCAL_PATH=${LOCAL_PATH%/} - - read -p "Enter remote destination folder (e.g. Backup): " REMOTE_FOLDER - REMOTE_FOLDER=${REMOTE_FOLDER#/} - REMOTE_FOLDER=${REMOTE_FOLDER%/} - - echo -e "${YELLOW}Uploading '$LOCAL_PATH' to '${REMOTE_NAME}:$REMOTE_FOLDER'...${NC}" - rclone copy "$LOCAL_PATH" "${REMOTE_NAME}:$REMOTE_FOLDER" -P - ;; - 3) - echo -e "${BLUE}Contents of Root:${NC}" - rclone lsd "${REMOTE_NAME}:" - - read -p "Enter remote path to download (e.g. models/Test): " REMOTE_PATH - REMOTE_PATH=${REMOTE_PATH#/} - - read -p "Enter local destination folder: " LOCAL_DEST - mkdir -p "$LOCAL_DEST" - - echo -e "${YELLOW}Downloading '${REMOTE_NAME}:$REMOTE_PATH' to '$LOCAL_DEST'...${NC}" - rclone copy "${REMOTE_NAME}:$REMOTE_PATH" "$LOCAL_DEST" -P - ;; - q) - exit 0 - ;; - *) - echo "Invalid option" - ;; -esac \ No newline at end of file