Merge branch 'main' into fixing

This commit is contained in:
2026-03-07 18:17:23 +00:00
12 changed files with 15 additions and 430 deletions
-38
View File
@@ -1,38 +0,0 @@
# Justfile for system updates
update: update-dnf update-flatpak update-uv update-rust update-tailscale cleanup
@echo "All updates completed!"
update-dnf:
@echo "Checking for dnf updates..."
sudo dnf update -y
update-flatpak:
@echo "Checking for flatpak updates..."
sudo flatpak update -y
cleanup:
@echo "Doing a quick clean up..."
sudo dnf clean all
check-restart:
@echo "Checking if we need a restart..."
sudo dnf needs-restarting
update-uv:
@echo "updating UV"
uv self update
uv tool install ruff@latest
update-rust:
@echo "Updating Rust"
rustup update
update-tailscale:
@echo "Updating Tailscale"
sudo tailscale update --yes
sync-dnd:
@echo "Syncing DnD GITs"
(cd ~/DnD && just git-sync)
(cd ~/source/dungeon_masters_vault && just git-sync)
-50
View File
@@ -1,50 +0,0 @@
# vim:ft=kitty
## name: Catppuccin Kitty Diff Mocha
## author: Catppuccin Org
## license: MIT
## upstream: https://github.com/catppuccin/kitty/blob/main/themes/diff-mocha.conf
## blurb: Soothing pastel theme for the high-spirited!
# text
foreground #cdd6f4
# base
background #1e1e2e
# subtext0
title_fg #a6adc8
# mantle
title_bg #181825
margin_bg #181825
# subtext1
margin_fg #a6adc8
# mantle
filler_bg #181825
# 30% red, 70% base
removed_bg #5e3f53
# 50% red, 50% base
highlight_removed_bg #89556b
# 40% red, 60% base
removed_margin_bg #734a5f
# 30% green, 70% base
added_bg #475a51
# 50% green, 50% base
highlight_added_bg #628168
# 40% green, 60% base
added_margin_bg #734a5f
# mantle
hunk_margin_bg #181825
hunk_bg #181825
# 40% yellow, 60% base
search_bg #766c62
# text
search_fg #cdd6f4
# 30% sky, 70% base
select_bg #3e5767
# text
select_fg #cdd6f4
+15 -15
View File
@@ -5,54 +5,54 @@
# Configuration # Configuration
BACKUP_DIR="/mnt/nas/Jake/git_backups" BACKUP_DIR="/mnt/nas/Jake/git_backups"
REPO_SOURCE="/mnt/bulk/temp" REPO_SOURCE="$HOME/source/"
# Function to restore a single project from latest backup # Function to restore a single project from latest backup
restore_project() { restore_project() {
local project_name="$1" local project_name="$1"
local latest_backup=$(find "$BACKUP_DIR" -maxdepth 1 -type d -name "*" | sort -r | head -n 1) local latest_backup=$(find "$BACKUP_DIR" -maxdepth 1 -type d -name "*" | sort -r | head -n 1)
if [ -z "$latest_backup" ]; then if [ -z "$latest_backup" ]; then
echo "Error: No backups found in $BACKUP_DIR" echo "Error: No backups found in $BACKUP_DIR"
exit 1 exit 1
fi fi
local project_backup_path="${latest_backup}/${project_name}" local project_backup_path="${latest_backup}/${project_name}"
if [ ! -d "$project_backup_path" ]; then if [ ! -d "$project_backup_path" ]; then
echo "Error: Backup for project '$project_name' not found in latest backup" echo "Error: Backup for project '$project_name' not found in latest backup"
exit 1 exit 1
fi fi
echo "Restoring $project_name from latest backup..." echo "Restoring $project_name from latest backup..."
# Create the project directory if it doesn't exist # Create the project directory if it doesn't exist
mkdir -p "$REPO_SOURCE/$project_name" mkdir -p "$REPO_SOURCE/$project_name"
# Extract the backup to the source directory # Extract the backup to the source directory
tar -xf "${project_backup_path}/backup.tar" -C "$REPO_SOURCE/$project_name" tar -xf "${project_backup_path}/backup.tar" -C "$REPO_SOURCE/$project_name"
echo "Successfully restored $project_name from backup" echo "Successfully restored $project_name from backup"
} }
# Main restore function # Main restore function
main_restore() { main_restore() {
local latest_backup=$(find "$BACKUP_DIR" -maxdepth 1 -type d -name "*" | sort -r | head -n 1) local latest_backup=$(find "$BACKUP_DIR" -maxdepth 1 -type d -name "*" | sort -r | head -n 1)
if [ -z "$latest_backup" ]; then if [ -z "$latest_backup" ]; then
echo "Error: No backups found in $BACKUP_DIR" echo "Error: No backups found in $BACKUP_DIR"
exit 1 exit 1
fi fi
echo "Latest backup directory: $latest_backup" echo "Latest backup directory: $latest_backup"
if [ $# -eq 0 ]; then if [ $# -eq 0 ]; then
# Restore all projects from latest backup # Restore all projects from latest backup
echo "Restoring all projects from latest backup..." echo "Restoring all projects from latest backup..."
# Get list of project directories in the backup # Get list of project directories in the backup
local projects=($(ls "$latest_backup")) local projects=($(ls "$latest_backup"))
for project in "${projects[@]}"; do for project in "${projects[@]}"; do
restore_project "$project" restore_project "$project"
done done
@@ -61,9 +61,9 @@ main_restore() {
local target_project="$1" local target_project="$1"
restore_project "$target_project" restore_project "$target_project"
fi fi
echo "Restore completed successfully!" echo "Restore completed successfully!"
} }
# Run main restore function # Run main restore function
main_restore "$@" main_restore "$@"
-82
View File
@@ -1,82 +0,0 @@
#!/usr/bin/env bash
# ------------------------------------------------------------------
# download_latest_appimage.sh
#
# Usage:
# ./download_latest_appimage.sh <owner>/<repo> [output_dir]
#
# Example:
# ./download_latest_appimage.sh Dygmalab/Bazecor /tmp
#
# The script uses the public GitHub API (no authentication token needed for
# a single request). If you hit rate limits, set GITHUB_TOKEN with a
# personal access token and the script will use it automatically.
# ------------------------------------------------------------------
set -euo pipefail
# ---------- Helper functions ----------
error() {
echo "$*" >&2
}
warn() {
echo "⚠️ $*"
}
# ---------- Argument parsing ----------
# if [[ $# -lt 1 ]]; then
# error "Missing repository argument."
# echo "Usage: $0 <owner>/<repo> [output_dir]"
# exit 1
# fi
REPO="Dygmalab/Bazecor" # e.g. Dygmalab/Bazecor
OUTDIR="$HOME/AppImages"
# Ensure output directory exists
mkdir -p "$OUTDIR"
# ---------- GitHub API ----------
API_URL="https://api.github.com/repos/${REPO}/releases/latest"
# If you have a token, uncomment the next line:
# AUTH_HEADER="Authorization: token $GITHUB_TOKEN"
# Fetch release metadata (JSON)
echo "🔎 Querying GitHub for latest release of ${REPO}..."
RELEASE_JSON=$(curl -sSL --fail \
"${API_URL}" \
${AUTH_HEADER:+-H "$AUTH_HEADER"})
# ---------- Find the AppImage asset ----------
APPIMAGE_URL=""
while IFS= read -r line; do
# Each line is a JSON object describing an asset.
# We look for a "name" field that ends with .AppImage (caseinsensitive)
if [[ "$line" =~ \"name\":\ *\"([^\"]+\.AppImage)\" ]]; then
APPIMAGE_NAME="${BASH_REMATCH[1]}"
# The download URL is in the "browser_download_url" field.
if [[ "$line" =~ \"browser_download_url\":\ *\"([^\"]+)\" ]]; then
APPIMAGE_URL="${BASH_REMATCH[1]}"
break
fi
fi
done < <(echo "$RELEASE_JSON" | jq -c '.assets[]')
if [[ -z $APPIMAGE_URL ]]; then
error "No AppImage asset found in the latest release."
exit 2
fi
echo "📥 Found AppImage: ${APPIMAGE_NAME}"
echo "🔗 Download URL: ${APPIMAGE_URL}"
# ---------- Download ----------
OUTFILE="${OUTDIR}/${APPIMAGE_NAME}"
echo "🚚 Downloading to ${OUTFILE} ..."
curl -L --fail \
"${APPIMAGE_URL}" \
-o "$OUTFILE"
chmod +x "$OUTFILE"
echo "✅ Done! AppImage saved as $OUTFILE"
-149
View File
@@ -1,149 +0,0 @@
#!/usr/bin/env bash
# ------------------------------------------------------------
# Fedora System Set Up Script
# ------------------------------------------------------------
# ============================================================
# PACKAGE LISTING
# ============================================================
# List all packages we want from dnf
package_list=(
"kitty"
"fastfetch"
"zsh"
"btop"
# "steam"
"code"
"just"
"neovim"
"fira-code-fonts"
)
# List all the flatpaks we want to install
flatpacks_to_install=(
"com.discordapp.Discord"
"com.spotify.Client"
"app.zen_browser.zen"
"md.obsidian.Obsidian"
)
# List all the folders we want to link from our dotfiles folder to our .config folder
folders_to_link=(
# "alacritty"
"git"
"zsh"
"kitty"
"starship.toml"
)
# ============================================================
# SCRIPT SETUP
# ============================================================
set -euo pipefail # safer shell behaviour
shopt -s expand_aliases # if you use aliases inside the script
# ============================================================
# SYSTEM UPDATE
# ============================================================
echo "==> Updating Fedora base packages..."
sudo dnf upgrade --refresh -y
# ============================================================
# REPOSITORY SETUP
# ============================================================
echo "==> Enabling RPM-Fusion repositories..."
sudo dnf install \
https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm \
https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm \
-y
# Prep for vs-code install
sudo rpm --import https://packages.microsoft.com/keys/microsoft.asc
echo -e "[code]\nname=Visual Studio Code\nbaseurl=https://packages.microsoft.com/yumrepos/vscode\nenabled=1\nautorefresh=1\ntype=rpm-md\ngpgcheck=1\ngpgkey=https://packages.microsoft.com/keys/microsoft.asc" | sudo tee /etc/yum.repos.d/vscode.repo > /dev/null
# ============================================================
# PACKAGE INSTALLATION
# ============================================================
# Create a string of packages
package_string=$(IFS=' ' ; echo "${package_list[@]}")
# Install packages listed
echo "==> Installing dnf Packages..."
sudo dnf install $package_string -y --skip-unavailable
# ============================================================
# FLATPAK SETUP
# ============================================================
# 5. Install Flatpak (if not present) and set up Flathub
if ! command -v flatpak &>/dev/null; then
echo "==> Installing Flatpak..."
sudo dnf install flatpak -y
fi
echo "==> Adding Flathub repository..."
sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
flatpack_string=$(IFS=' ' ; echo "${flatpacks_to_install[@]}")
echo "==> Installing flatpaks..."
flatpak install -y flathub $flatpack_string
# ============================================================
# WEB INSTALLATION
# ============================================================
# UV for Python Dev
curl -LsSf https://astral.sh/uv/install.sh | sh
# Rust, because we all love rust
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
# Bazecore for the Dygma Keyboard
./bazecore_grab.sh
# Starship because command line glory
curl -sS https://starship.rs/install.sh | sh
## Tailscale for that private network.
curl -fsSL https://tailscale.com/install.sh | sh
# ============================================================
# SYMBOLIC LINKING
# ============================================================
for folder in "${folders_to_link[@]}"; do
config_path="$HOME/dotfiles/$folder"
target_path="$HOME/.config/$folder"
ln -s "$config_path" "$target_path"
done
# Sym link other bits.
ln -s $HOME/dotfiles/git/gitconfig $HOME/.gitconfig
ln -s $HOME/dotfiles/.justfile $HOME/.justfile
# slightly tested zshrc sym link
sudo rm -f /etc/zshrc
sudo ln -s $HOME/dotfiles/zsh/.zshrc /etc/zshrc
# ============================================================
# NVIM SETUP
# ============================================================
# Untested nvim kickstart clone
git clone https://github.com/Jake-Pullen/kickstart.nvim.git $HOME/.config/nvim
# ============================================================
# SHELL SETUP
# ============================================================
chsh -s /bin/zsh
# ============================================================
# CLEANUP
# ============================================================
echo "==> Cleaning up package cache..."
sudo dnf clean all
echo "===================================================="
echo "All done! Give the system a reboot!"
-12
View File
@@ -1,12 +0,0 @@
# first remove the old lm studio (keeping one old version copy)
echo Removing old backup
rm -f ~/AppImages/LM-Studio.AppImage.old
echo Making new backup
mv ~/AppImages/LM-Studio.AppImage ~/AppImages/LM-Studio.AppImage.old
echo Bringing in new App
mv ~/Downloads/LM-Studio*.AppImage ~/AppImages/LM-Studio.AppImage
echo Making it executable
chmod +x ~/AppImages/LM-Studio.AppImage
-21
View File
@@ -1,21 +0,0 @@
// Zed keymap
//
// For information on binding keys, see the Zed
// documentation: https://zed.dev/docs/key-bindings
//
// To see the default key bindings run `zed: open default keymap`
// from the command palette.
[
{
"context": "Workspace",
"bindings": {
// "shift shift": "file_finder::Toggle"
}
},
{
"context": "Editor",
"bindings": {
// "j k": ["workspace::SendKeystrokes", "escape"]
}
}
]
-24
View File
@@ -1,24 +0,0 @@
// Zed settings
//
// For information on how to configure Zed, see the Zed
// documentation: https://zed.dev/docs/configuring-zed
//
// To see all of Zed's default settings without changing your
// custom settings, run `zed: open default settings` from the
// command palette (cmd-shift-p / ctrl-shift-p)
{
"assistant": {
"default_model": {
"provider": "ollama",
"model": "gemma3:latest"
},
"version": "2"
},
"ui_font_size": 16,
"buffer_font_size": 16,
"theme": {
"mode": "system",
"light": "Tokyo Night",
"dark": "One Dark"
}
}
-1
View File
@@ -1 +0,0 @@
. "$HOME/.cargo/env"
-37
View File
@@ -1,37 +0,0 @@
HISTFILE=~/.config/zsh/.histfile
HISTSIZE=5000
SAVEHIST=100000
setopt autocd extendedglob
unsetopt beep
bindkey -v
bindkey "^[[H" beginning-of-line
bindkey "^[[F" end-of-line
bindkey "^[[3~" delete-char
export PATH=$PATH:$HOME/.local/bin
export EDITOR=nvim
export GIT_EDITOR=nvim
# Fixing zsh history problems on multiple terminals
setopt inc_append_history
setopt share_history
setopt histignorealldups
# Alias: general
alias ..='cd ..'
alias la='ls -la'
alias wake_up='cd source/ai_web && ./run.sh >/dev/null 2>&1 & ~/AppImages/LM-Studio.AppImage >/dev/null 2>&1 &'
alias kill_ai='pkill -f "open-webui" && pkill -f "LM-Studio"'
alias mklink='ln -s "$(pwd)" ~/$(basename "$(pwd)")'
alias merlin='(cd ~/source/merlin && uv run merlin) && cd ~'
alias vlc_web='vlc --http-host=0.0.0.0 --http-port=6080 --http-password=banana'
alias update_mp3='rsync -av /home/devin/music/ /run/media/devin/3761-3261'
eval "$(starship init zsh)"
fastfetch
-1
View File
@@ -1 +0,0 @@
export ZDOTDIR="/home/devin/.config/zsh"