Compare commits
178 Commits
e54f91bcd9
...
trunk
| Author | SHA1 | Date | |
|---|---|---|---|
| 1f4494d333 | |||
| 85255adb2c | |||
| f251a6f5c7 | |||
| 1f84cf19c7 | |||
| 0e49c1b9ee | |||
| 3ff5251b15 | |||
| 007c66c007 | |||
| d37a0ce652 | |||
| 5ab6c9e4c8 | |||
| fccec4d504 | |||
| 8feda54866 | |||
| 7179e6f047 | |||
| 1da9d994de | |||
| e213c64481 | |||
| 49ac3c2bf5 | |||
| 8acebb13cc | |||
| ff08538bae | |||
| 494ac6cf57 | |||
| 4cfddd2c7e | |||
| 60509f93f0 | |||
| 96d8fd1129 | |||
| 39264279e0 | |||
| 07c9533255 | |||
| 015f416169 | |||
| 35d8c83423 | |||
| b488af297a | |||
| dbb5560793 | |||
| 7bcfef3ccf | |||
| a1fd3b3af2 | |||
| a45d9014dd | |||
| 80451e9430 | |||
| df1a77f73e | |||
| 6f51671dbb | |||
| a238d2b61c | |||
|
62dd3f5d7c
|
|||
| 8b8dc8cde8 | |||
| 3047ff97b4 | |||
| 1c963f5563 | |||
| c02f2853c1 | |||
| d73a561b9d | |||
| 7d97acfdfb | |||
| cfb55f980d | |||
| 1a67b02d7c | |||
| 0196b1d8b2 | |||
| d7a6a85841 | |||
| cc7aca0fce | |||
| 6b393c7e4f | |||
| c9bcda6043 | |||
| 7ce43bf8e7 | |||
| 5a451bcaa1 | |||
| b4bba876ae | |||
| 005d0451f5 | |||
| d20a1787c2 | |||
| 6bb1a13741 | |||
| b21060e78d | |||
| 8caa3b6fe7 | |||
| 6fb6dc7abb | |||
| 4a6eb5059c | |||
| d92a192a7f | |||
| 51c3ae6d1e | |||
| 2ea0b96230 | |||
| f7ece5059d | |||
| b84a2d7628 | |||
| b78a43d40a | |||
| f5ff1a6639 | |||
| 0534a04108 | |||
| 4af26da42f | |||
| d014733441 | |||
| 38c0191ad2 | |||
| 2bbbd49a07 | |||
| 38a22b5255 | |||
| a787a7dfc5 | |||
| 4349ccb132 | |||
| 96920b6b3d | |||
| b97d7e4cb1 | |||
| 59927a4e3d | |||
| 076653fd15 | |||
| 63dcc450b6 | |||
| c15704eb22 | |||
| 85f7a2889c | |||
| 6bfea61ffe | |||
| 4e0cc2a322 | |||
| 7ef99c8dd1 | |||
| 1655c0a867 | |||
| 724c63f9ff | |||
| 5813db8160 | |||
| cdf8403991 | |||
| 10488b90c9 | |||
| bcb1b88861 | |||
| e27be65861 | |||
| 0e0e58b909 | |||
| 4e3a31cf87 | |||
| 58e68a003a | |||
| 82d61d54eb | |||
| fa981032d4 | |||
| 5090fa9cd4 | |||
| 125d639f9f | |||
| 9ad80827ee | |||
| f0fa2540b5 | |||
| 0bfe74abb7 | |||
| 766e20ffc4 | |||
| 178fba9c84 | |||
| eef41bbca8 | |||
| a0c728f147 | |||
| 35645a3e9c | |||
| 67002a94dd | |||
| 6beb28477f | |||
| dc03836ac0 | |||
| 646ba6d63f | |||
| e34b5161d4 | |||
| 81c59857e5 | |||
| 7576364d43 | |||
| f31eefe6eb | |||
| 788155194f | |||
| 777c4f3192 | |||
| e7ed3e584d | |||
| af9d2553d5 | |||
| 14c67a8bb3 | |||
| 97d2610240 | |||
| 2e36efa1c3 | |||
| 8a781d6b2a | |||
| c8a036edc2 | |||
| f0a8d8f0fb | |||
| 303c759bb4 | |||
| c243c4393f | |||
| de4822bc68 | |||
| ed3046e18a | |||
| e3546caeb5 | |||
| cc083128a3 | |||
| 9faad0e16c | |||
| e50f503270 | |||
| 8a502bdf15 | |||
| 32d737f011 | |||
| 7f84ae360c | |||
| bce6234c10 | |||
| 7572b52d6f | |||
| 68ca7ff5f8 | |||
| 51d9300990 | |||
| 183eb27980 | |||
| 3f689d46f4 | |||
| 2a576d8d39 | |||
| e92206ae43 | |||
| 733145692f | |||
| ad8b20fd0c | |||
| d9c20efa16 | |||
| 3bbe306485 | |||
| f9ac7944b3 | |||
| eff39f2218 | |||
| cdbb5f913d | |||
| e329c17546 | |||
| 85c8b9ec1c | |||
| 96fd9d96c1 | |||
| 090889dff2 | |||
| 8c4a82a73f | |||
| f448ce43ec | |||
| 2fb0dc4c50 | |||
| 2ed9add88e | |||
| 881d4dd78a | |||
| ad487e6715 | |||
| f107cf19c7 | |||
| f5bc0400ae | |||
| 96ca6c6ea0 | |||
| 610513edb7 | |||
| f49978d587 | |||
| cb4234630b | |||
| 992616c1ca | |||
| 7b39e418c9 | |||
| adf9d1ee4a | |||
| 0c4aed6591 | |||
| 1f8fe59423 | |||
| 0fc620e7da | |||
| 245f06fd3a | |||
| d39fb7af39 | |||
| 6ddebc86d7 | |||
| e2047cba7b | |||
| d7ae540ebf | |||
| 0fae0e72d3 | |||
| 3304d04d9d |
@@ -1,203 +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"
|
|
||||||
|
|
||||||
if [ ! -d "$MOUNT_POINT" ]; then
|
|
||||||
echo "Error: mount failed."
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
# --- LIST FILES AND DIRECTORIES ---
|
|
||||||
echo "Scanning files and directories..."
|
|
||||||
if command -v fd >/dev/null 2>&1; then
|
|
||||||
# List both files and directories with fd
|
|
||||||
if [ "$SHOW_FILES" = true ]; then
|
|
||||||
files=$(fd . "$MOUNT_POINT" | sort) # Show both files and directories
|
|
||||||
else
|
|
||||||
files=$(fd --type d . "$MOUNT_POINT" | sort) # Only directories
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
# Fall back to find if fd is not available
|
|
||||||
if [ "$SHOW_FILES" = true ]; then
|
|
||||||
files=$(find "$MOUNT_POINT" | sort) # Show both files and directories
|
|
||||||
else
|
|
||||||
files=$(find "$MOUNT_POINT" -type d | sort) # Only directories
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -z "$files" ]; then
|
|
||||||
echo "No files or directories found in archive."
|
|
||||||
borg umount "$MOUNT_POINT"
|
|
||||||
rm -rf "$MOUNT_POINT"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
# --- FZF FILE/DIRECTORY SELECTION ---
|
|
||||||
if [ "$SHOW_FILES" = true ]; then
|
|
||||||
# If showing files and directories, we pass everything to fzf
|
|
||||||
selected_items=$(printf '%s\n' "$files" | sed "s|$MOUNT_POINT/||" | tac | fzf \
|
|
||||||
--multi \
|
|
||||||
--height=50% \
|
|
||||||
--border \
|
|
||||||
--prompt="Select files or directories to restore: " \
|
|
||||||
--preview "tree -C -L 5 $MOUNT_POINT/$(dirname {})" \
|
|
||||||
--preview-window=right:50% \
|
|
||||||
--delimiter='/' \
|
|
||||||
--with-nth=1..)
|
|
||||||
else
|
|
||||||
# If only showing directories, pass directories to fzf
|
|
||||||
selected_items=$(printf '%s\n' "$files" | sed "s|$MOUNT_POINT/||" | tac | fzf \
|
|
||||||
--multi \
|
|
||||||
--height=50% \
|
|
||||||
--border \
|
|
||||||
--prompt="Select directories to restore: " \
|
|
||||||
--preview "tree -C -d -L 3 $MOUNT_POINT/$(dirname {})" \
|
|
||||||
--preview-window=right:50% \
|
|
||||||
--delimiter='/' \
|
|
||||||
--with-nth=1..)
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -z "$selected_items" ]; then
|
|
||||||
echo "No items selected. Exiting."
|
|
||||||
borg umount "$MOUNT_POINT"
|
|
||||||
rm -rf "$MOUNT_POINT"
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
# --- SUMMARY OF SELECTED ITEMS ---
|
|
||||||
echo "Selected items:"
|
|
||||||
for item in $selected_items; do
|
|
||||||
echo " $item"
|
|
||||||
done
|
|
||||||
|
|
||||||
# --- OPTIONS MENU (concise) ---
|
|
||||||
# Default to option 1 if no input is given
|
|
||||||
echo "Select restore destination: 1) Restore to ./${selected}_restore 2) Restore to original dirs 3) Quit"
|
|
||||||
read -p "Enter your choice (1/2/3) [default: 1]: " choice
|
|
||||||
# Default to option 1 if user presses Enter without providing input
|
|
||||||
choice="${choice:-1}"
|
|
||||||
|
|
||||||
# --- SET RESTORE DESTINATION BASED ON USER CHOICE ---
|
|
||||||
case "$choice" in
|
|
||||||
1)
|
|
||||||
DEST="./${selected}_restore"
|
|
||||||
;;
|
|
||||||
2)
|
|
||||||
DEST="$MOUNT_POINT"
|
|
||||||
;;
|
|
||||||
3)
|
|
||||||
echo "Quitting. No items restored."
|
|
||||||
borg umount "$MOUNT_POINT"
|
|
||||||
rm -rf "$MOUNT_POINT"
|
|
||||||
exit 0
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
echo "Invalid choice. Exiting."
|
|
||||||
borg umount "$MOUNT_POINT"
|
|
||||||
rm -rf "$MOUNT_POINT"
|
|
||||||
exit 1
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
mkdir -p "$DEST"
|
|
||||||
|
|
||||||
# --- RESTORE SELECTED ITEMS (FILES OR DIRECTORIES) ---
|
|
||||||
echo "Restoring selected items..."
|
|
||||||
while IFS= read -r item; do
|
|
||||||
dest_path="$DEST/$item"
|
|
||||||
mkdir -p "$(dirname "$dest_path")"
|
|
||||||
if [ -d "$MOUNT_POINT/$item" ]; then
|
|
||||||
cp -r "$MOUNT_POINT/$item" "$dest_path"
|
|
||||||
else
|
|
||||||
cp -a "$MOUNT_POINT/$item" "$dest_path"
|
|
||||||
fi
|
|
||||||
echo "Restored: $item"
|
|
||||||
done <<< "$selected_items"
|
|
||||||
|
|
||||||
# --- CLEANUP ---
|
|
||||||
borg umount "$MOUNT_POINT"
|
|
||||||
rm -rf "$MOUNT_POINT"
|
|
||||||
echo "Restore complete."
|
|
||||||
|
|
||||||
@@ -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
|
|
||||||
@@ -26,6 +26,8 @@ echo "files:"
|
|||||||
git status --short
|
git status --short
|
||||||
read -rp "commit message: " commit_msg
|
read -rp "commit message: " commit_msg
|
||||||
echo "rebuilding nixos with flake.nix..."
|
echo "rebuilding nixos with flake.nix..."
|
||||||
|
#if ! sudo nixos-rebuild switch --flake .#"$hostname" 2>&1 | tee "$logfile"; then
|
||||||
|
#if ! nh os switch 2>&1 | tee "$logfile"; then
|
||||||
if ! sudo nixos-rebuild switch --flake .#"$hostname" 2>&1 | tee "$logfile"; then
|
if ! sudo nixos-rebuild switch --flake .#"$hostname" 2>&1 | tee "$logfile"; then
|
||||||
echo "rebuild failed; exited with no commit"
|
echo "rebuild failed; exited with no commit"
|
||||||
exit 1
|
exit 1
|
||||||
@@ -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
|
|
||||||
1010
flake.lock
generated
40
flake.nix
@@ -4,14 +4,14 @@
|
|||||||
{
|
{
|
||||||
description = "blakes nix config";
|
description = "blakes nix config";
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = "nixpkgs/nixos-25.05";
|
nixpkgs.url = "nixpkgs/nixos-25.11";
|
||||||
nixpkgs-unstable.url = "nixpkgs/nixos-unstable";
|
nixpkgs-unstable.url = "nixpkgs/nixos-unstable";
|
||||||
nix-darwin = {
|
nix-darwin = {
|
||||||
url = "github:LnL7/nix-darwin";
|
url = "github:nix-darwin/nix-darwin/master";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs-unstable";
|
||||||
};
|
};
|
||||||
home-manager = {
|
home-manager = {
|
||||||
url = "github:nix-community/home-manager/release-25.05";
|
url = "github:nix-community/home-manager/release-25.11";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
home-manager-unstable = {
|
home-manager-unstable = {
|
||||||
@@ -19,6 +19,7 @@
|
|||||||
inputs.nixpkgs.follows = "nixpkgs-unstable";
|
inputs.nixpkgs.follows = "nixpkgs-unstable";
|
||||||
};
|
};
|
||||||
nix-homebrew.url = "github:zhaofengli/nix-homebrew";
|
nix-homebrew.url = "github:zhaofengli/nix-homebrew";
|
||||||
|
nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=latest";
|
||||||
sops-nix = {
|
sops-nix = {
|
||||||
url = "github:Mic92/sops-nix";
|
url = "github:Mic92/sops-nix";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
@@ -27,6 +28,14 @@
|
|||||||
url = "github:nix-community/disko/latest";
|
url = "github:nix-community/disko/latest";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
lanzaboote = {
|
||||||
|
url = "github:nix-community/lanzaboote/v0.4.3";
|
||||||
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
};
|
||||||
|
watershot = {
|
||||||
|
url = "github:Kirottu/watershot";
|
||||||
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
};
|
||||||
vpn-confinement = {
|
vpn-confinement = {
|
||||||
url = "github:Maroka-chan/VPN-Confinement";
|
url = "github:Maroka-chan/VPN-Confinement";
|
||||||
};
|
};
|
||||||
@@ -35,7 +44,7 @@
|
|||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
autoaspm = {
|
autoaspm = {
|
||||||
url = "github:notthebee/AutoASPM";
|
url = "git+https://git.notthebe.ee/notthebee/AutoASPM.git";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
stylix = {
|
stylix = {
|
||||||
@@ -43,6 +52,10 @@
|
|||||||
inputs.nixpkgs.follows = "nixpkgs-unstable";
|
inputs.nixpkgs.follows = "nixpkgs-unstable";
|
||||||
};
|
};
|
||||||
copyparty.url = "github:9001/copyparty";
|
copyparty.url = "github:9001/copyparty";
|
||||||
|
slippi = {
|
||||||
|
url = "github:lytedev/slippi-nix";
|
||||||
|
inputs.nixpkgs.follows = "nixpkgs-unstable";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
outputs = {
|
outputs = {
|
||||||
self,
|
self,
|
||||||
@@ -74,9 +87,19 @@
|
|||||||
specialArgs = {inherit inputs stable_pkgs unstable_pkgs;};
|
specialArgs = {inherit inputs stable_pkgs unstable_pkgs;};
|
||||||
modules = [
|
modules = [
|
||||||
./hosts/nixos/yveltal/configuration.nix
|
./hosts/nixos/yveltal/configuration.nix
|
||||||
|
./hosts/nixos/yveltal/disko.nix
|
||||||
|
inputs.home-manager-unstable.nixosModules.default
|
||||||
|
inputs.disko.nixosModules.disko
|
||||||
|
];
|
||||||
|
};
|
||||||
|
mew = nixpkgs-unstable.lib.nixosSystem {
|
||||||
|
system = systems.x86_64;
|
||||||
|
specialArgs = {inherit inputs stable_pkgs unstable_pkgs;};
|
||||||
|
modules = [
|
||||||
|
./hosts/nixos/mew/configuration.nix
|
||||||
|
./hosts/nixos/mew/disko.nix
|
||||||
inputs.home-manager-unstable.nixosModules.default
|
inputs.home-manager-unstable.nixosModules.default
|
||||||
inputs.disko.nixosModules.disko
|
inputs.disko.nixosModules.disko
|
||||||
./hosts/nixos/yveltal/disko.nix
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
vaniville = nixpkgs.lib.nixosSystem {
|
vaniville = nixpkgs.lib.nixosSystem {
|
||||||
@@ -93,14 +116,15 @@
|
|||||||
system = systems.darwin;
|
system = systems.darwin;
|
||||||
specialArgs = {inherit inputs stable_pkgs unstable_pkgs nix-homebrew;};
|
specialArgs = {inherit inputs stable_pkgs unstable_pkgs nix-homebrew;};
|
||||||
modules = [
|
modules = [
|
||||||
./hosts/darwin/cen-it-07/configuration.nix
|
#./hosts/darwin/cen-it-07/configuration.nix
|
||||||
inputs.home-manager.darwinModules.default
|
inputs.home-manager.darwinModules.default
|
||||||
nix-homebrew.darwinModules.nix-homebrew
|
nix-homebrew.darwinModules.nix-homebrew
|
||||||
{
|
{
|
||||||
nix-homebrew = {
|
nix-homebrew = {
|
||||||
enable = true; # install homebrew
|
enable = true; # install homebrew
|
||||||
enableRosetta = true; # install homebrew for rosetta as well
|
enableRosetta = true; # install homebrew for rosetta as well
|
||||||
user = "blake"; # user owning homebrew prefix
|
autoMigrate = true;
|
||||||
|
user = "bhelderman"; # user owning homebrew prefix
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -5,67 +5,116 @@
|
|||||||
inputs,
|
inputs,
|
||||||
...
|
...
|
||||||
}: {
|
}: {
|
||||||
|
|
||||||
imports = [
|
imports = [
|
||||||
inputs.autoaspm.nixosModules.default
|
inputs.autoaspm.nixosModules.default
|
||||||
];
|
];
|
||||||
|
|
||||||
|
# set timezone
|
||||||
|
time.timeZone = "America/Chicago";
|
||||||
|
|
||||||
|
nix = {
|
||||||
|
# garbage collect & remove builds older then 14 days
|
||||||
|
gc = {
|
||||||
|
automatic = true;
|
||||||
|
dates = "daily";
|
||||||
|
options = "--delete-older-than 14d";
|
||||||
|
persistent = true;
|
||||||
|
};
|
||||||
|
# optimise nix store, dedupe and such
|
||||||
|
optimise = {
|
||||||
|
automatic = true;
|
||||||
|
dates = [ "daily" ];
|
||||||
|
};
|
||||||
|
# the goats
|
||||||
|
settings = {
|
||||||
|
substituters = [
|
||||||
|
"https://cache.nixos.org"
|
||||||
|
];
|
||||||
|
trusted-public-keys = [
|
||||||
|
];
|
||||||
|
experimental-features = lib.mkDefault [
|
||||||
|
"nix-command"
|
||||||
|
"flakes"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
# allow proprietary packages
|
||||||
|
nixpkgs = {
|
||||||
|
config = {
|
||||||
|
allowUnfree = true;
|
||||||
|
allowUnfreePredicate = _: true;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
# power management
|
||||||
|
services.autoaspm.enable = true;
|
||||||
|
powerManagement.powertop.enable = true;
|
||||||
|
|
||||||
|
# things are better this way
|
||||||
|
users.defaultUserShell = pkgs.zsh;
|
||||||
|
|
||||||
# base system package install list
|
# base system package install list
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
wget
|
wget
|
||||||
curl
|
curl
|
||||||
dig
|
dig
|
||||||
|
nmap
|
||||||
rsync
|
rsync
|
||||||
|
iperf3
|
||||||
|
jq
|
||||||
git
|
git
|
||||||
age
|
age
|
||||||
fzf
|
|
||||||
neofetch
|
|
||||||
usbutils
|
|
||||||
pciutils
|
|
||||||
python3
|
|
||||||
vim
|
vim
|
||||||
lf
|
ncdu
|
||||||
btop
|
btop
|
||||||
powertop
|
powertop
|
||||||
dig
|
iotop
|
||||||
|
cifs-utils
|
||||||
|
usbutils
|
||||||
|
pciutils
|
||||||
|
lm_sensors
|
||||||
];
|
];
|
||||||
|
|
||||||
# set timezone
|
# nice to have passwordless sudo
|
||||||
time.timeZone = "America/Chicago";
|
security.sudo = {
|
||||||
|
extraRules = [
|
||||||
# allow proprietary packages
|
{
|
||||||
nixpkgs.config.allowUnfree = true;
|
users = ["blake"];
|
||||||
|
commands = [
|
||||||
# power management
|
{
|
||||||
services.autoaspm.enable = true;
|
command = "/run/current-system/sw/bin/nixos-rebuild";
|
||||||
powerManagement.powertop.enable = true;
|
options = ["NOPASSWD"];
|
||||||
|
}
|
||||||
# enable flakes
|
{
|
||||||
nix.settings.experimental-features = ["nix-command" "flakes"];
|
command = "/run/current-system/sw/bin/systemctl";
|
||||||
users.defaultUserShell = pkgs.zsh;
|
options = ["NOPASSWD"];
|
||||||
|
}
|
||||||
# passwordless rebuild
|
{
|
||||||
security.sudo.extraRules = [
|
command = "/run/current-system/sw/bin/journalctl";
|
||||||
{
|
options = ["NOPASSWD"];
|
||||||
users = ["blake"];
|
}
|
||||||
commands = [
|
{
|
||||||
{
|
command = "/run/current-system/sw/bin/tailscale";
|
||||||
command = "/run/current-system/sw/bin/nixos-rebuild";
|
options = ["NOPASSWD"];
|
||||||
options = ["NOPASSWD"];
|
}
|
||||||
}
|
{
|
||||||
{
|
command = "/etc/profiles/per-user/blake/bin/nom";
|
||||||
command = "/run/current-system/sw/bin/systemctl";
|
options = ["NOPASSWD"];
|
||||||
options = ["NOPASSWD"];
|
}
|
||||||
}
|
{
|
||||||
{
|
command = "/etc/profiles/per-user/blake/bin/nom-build";
|
||||||
command = "/run/current-system/sw/bin/journalctl";
|
options = ["NOPASSWD"];
|
||||||
options = ["NOPASSWD"];
|
}
|
||||||
}
|
{
|
||||||
{
|
command = "/etc/profiles/per-user/blake/bin/nom-shell";
|
||||||
command = "/run/current-system/sw/bin/tailscale";
|
options = ["NOPASSWD"];
|
||||||
options = ["NOPASSWD"];
|
}
|
||||||
}
|
];
|
||||||
];
|
}
|
||||||
}
|
];
|
||||||
];
|
extraConfig = ''
|
||||||
|
Defaults insults
|
||||||
|
'';
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
70
hosts/nixos/froakie/disko.nix
Normal file
@@ -0,0 +1,70 @@
|
|||||||
|
{
|
||||||
|
disko.devices = {
|
||||||
|
disk = {
|
||||||
|
main = {
|
||||||
|
type = "disk";
|
||||||
|
device = ""; # disk id here
|
||||||
|
content = {
|
||||||
|
type = "gpt";
|
||||||
|
partitions = {
|
||||||
|
ESP = {
|
||||||
|
size = "1G";
|
||||||
|
type = "EF00";
|
||||||
|
content = {
|
||||||
|
type = "filesystem";
|
||||||
|
format = "vfat";
|
||||||
|
mountpoint = "/boot";
|
||||||
|
mountOptions = [ "umask=0077" ];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
luks = {
|
||||||
|
size = "100%";
|
||||||
|
content = {
|
||||||
|
type = "luks";
|
||||||
|
name = "crypted";
|
||||||
|
# disable settings.keyFile if you want to use interactive password entry
|
||||||
|
#passwordFile = "/tmp/secret.key"; # Interactive
|
||||||
|
settings = {
|
||||||
|
allowDiscards = true;
|
||||||
|
#keyFile = "/tmp/secret.key";
|
||||||
|
};
|
||||||
|
#additionalKeyFiles = [ "/tmp/additionalSecret.key" ];
|
||||||
|
content = {
|
||||||
|
type = "btrfs";
|
||||||
|
extraArgs = [ "-f" ];
|
||||||
|
subvolumes = {
|
||||||
|
"@root" = {
|
||||||
|
mountpoint = "/";
|
||||||
|
mountOptions = [
|
||||||
|
"compress=zstd"
|
||||||
|
"noatime"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
"@home" = {
|
||||||
|
mountpoint = "/home";
|
||||||
|
mountOptions = [
|
||||||
|
"compress=zstd"
|
||||||
|
"noatime"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
"@nix" = {
|
||||||
|
mountpoint = "/nix";
|
||||||
|
mountOptions = [
|
||||||
|
"compress=zstd"
|
||||||
|
"noatime"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
"@swap" = {
|
||||||
|
mountpoint = "/.swapvol";
|
||||||
|
swap.swapfile.size = "32G";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
113
hosts/nixos/mew/configuration.nix
Normal file
@@ -0,0 +1,113 @@
|
|||||||
|
{
|
||||||
|
pkgs,
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
modulesPath,
|
||||||
|
inputs,
|
||||||
|
stable_pkgs,
|
||||||
|
unstable_pkgs,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
|
imports = [
|
||||||
|
# Include the results of the hardware scan.
|
||||||
|
(modulesPath + "/installer/scan/not-detected.nix")
|
||||||
|
#./hardware-configuration.nix
|
||||||
|
../../nixos
|
||||||
|
../../../users/blake
|
||||||
|
../../../modules/desktop
|
||||||
|
../../../modules/system
|
||||||
|
];
|
||||||
|
|
||||||
|
# home grown nixos modules
|
||||||
|
system = {
|
||||||
|
secure_boot.enable = false;
|
||||||
|
cifs_mounts.enable = true;
|
||||||
|
udiskie.enable = true;
|
||||||
|
ssh.enable = true;
|
||||||
|
sops.enable = true;
|
||||||
|
japanese.enable = true;
|
||||||
|
yubikey.enable = true;
|
||||||
|
yubikey.lock_on_remove = false;
|
||||||
|
tailscale.enable = true;
|
||||||
|
syncthing.enable = true;
|
||||||
|
flatpak.enable = true;
|
||||||
|
graphics = {
|
||||||
|
enable = true;
|
||||||
|
vendor = "amd";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
desktop = {
|
||||||
|
pipewire.enable = true;
|
||||||
|
hypr.enable = true;
|
||||||
|
greetd.enable = true;
|
||||||
|
};
|
||||||
|
gaming = {
|
||||||
|
steam.enable = true;
|
||||||
|
lutris.enable = true;
|
||||||
|
proton_ge.enable = true;
|
||||||
|
gamemode.enable = true;
|
||||||
|
mangohud.enable = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
# import home grown host specific home-manager modules
|
||||||
|
home-manager.users.blake.imports = [
|
||||||
|
../../../users/blake/hosts/yveltal.nix
|
||||||
|
];
|
||||||
|
|
||||||
|
# fix power buttons
|
||||||
|
# move this to a laptops file at some point
|
||||||
|
services.logind.settings.Login = {
|
||||||
|
HandlePowerKey = "suspend-then-hibernate";
|
||||||
|
HandleLidSwitch = "suspend-then-hibernate";
|
||||||
|
};
|
||||||
|
# sets the delay before hibernation for ^
|
||||||
|
systemd.sleep.extraConfig = ''
|
||||||
|
HibernateDelaySec=1800
|
||||||
|
'';
|
||||||
|
|
||||||
|
# boot (systemd is growing on me)
|
||||||
|
boot = {
|
||||||
|
kernelModules = [ "kvm-amd" ];
|
||||||
|
extraModulePackages = [];
|
||||||
|
loader = {
|
||||||
|
systemd-boot.enable = true; # systemd your pretty cool ya know
|
||||||
|
efi.canTouchEfiVariables = true;
|
||||||
|
};
|
||||||
|
initrd = {
|
||||||
|
systemd.enable = true; # better logging
|
||||||
|
availableKernelModules = ["xhci_pci" "thunderbolt" "vmd" "nvme" "usb_storage" "sd_mod" "ahci"];
|
||||||
|
kernelModules = [];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
# setup hostname and networking stack
|
||||||
|
networking = {
|
||||||
|
hostName = "mew"; # hostname
|
||||||
|
useDHCP = lib.mkDefault true;
|
||||||
|
interfaces = {
|
||||||
|
wlp7s0.useDHCP = lib.mkDefault true;
|
||||||
|
};
|
||||||
|
firewall = {
|
||||||
|
enable = true;
|
||||||
|
allowedTCPPorts = [22];
|
||||||
|
allowedUDPPorts = [51820]; # wireguard
|
||||||
|
};
|
||||||
|
networkmanager = {
|
||||||
|
enable = true; # the goat
|
||||||
|
dns = "systemd-resolved"; # the backup dancer!
|
||||||
|
};
|
||||||
|
};
|
||||||
|
services.resolved = {
|
||||||
|
enable = true;
|
||||||
|
fallbackDns = ["1.1.1.1" "9.9.9.9"];
|
||||||
|
dnsovertls = "opportunistic";
|
||||||
|
};
|
||||||
|
|
||||||
|
hardware.bluetooth.enable = true;
|
||||||
|
|
||||||
|
system.stateVersion = "25.05"; # stays here : )
|
||||||
|
|
||||||
|
# hardware shit
|
||||||
|
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||||
|
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||||
|
}
|
||||||
70
hosts/nixos/mew/disko.nix
Normal file
@@ -0,0 +1,70 @@
|
|||||||
|
{
|
||||||
|
disko.devices = {
|
||||||
|
disk = {
|
||||||
|
main = {
|
||||||
|
type = "disk";
|
||||||
|
device = "/dev/disk/by-id/nvme-MTFDHBA512TDV-1AZ1AABHA_UJUND0170FW7O0"; # disk id here
|
||||||
|
content = {
|
||||||
|
type = "gpt";
|
||||||
|
partitions = {
|
||||||
|
ESP = {
|
||||||
|
size = "1G";
|
||||||
|
type = "EF00";
|
||||||
|
content = {
|
||||||
|
type = "filesystem";
|
||||||
|
format = "vfat";
|
||||||
|
mountpoint = "/boot";
|
||||||
|
mountOptions = [ "umask=0077" ];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
luks = {
|
||||||
|
size = "100%";
|
||||||
|
content = {
|
||||||
|
type = "luks";
|
||||||
|
name = "crypted";
|
||||||
|
# disable settings.keyFile if you want to use interactive password entry
|
||||||
|
#passwordFile = "/tmp/secret.key"; # Interactive
|
||||||
|
settings = {
|
||||||
|
allowDiscards = true;
|
||||||
|
#keyFile = "/tmp/secret.key";
|
||||||
|
};
|
||||||
|
#additionalKeyFiles = [ "/tmp/additionalSecret.key" ];
|
||||||
|
content = {
|
||||||
|
type = "btrfs";
|
||||||
|
extraArgs = [ "-f" ];
|
||||||
|
subvolumes = {
|
||||||
|
"@root" = {
|
||||||
|
mountpoint = "/";
|
||||||
|
mountOptions = [
|
||||||
|
"compress=zstd"
|
||||||
|
"noatime"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
"@home" = {
|
||||||
|
mountpoint = "/home";
|
||||||
|
mountOptions = [
|
||||||
|
"compress=zstd"
|
||||||
|
"noatime"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
"@nix" = {
|
||||||
|
mountpoint = "/nix";
|
||||||
|
mountOptions = [
|
||||||
|
"compress=zstd"
|
||||||
|
"noatime"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
"@swap" = {
|
||||||
|
mountpoint = "/.swapvol";
|
||||||
|
swap.swapfile.size = "32G";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -14,6 +14,7 @@ in
|
|||||||
../../../modules/holocron
|
../../../modules/holocron
|
||||||
../../../modules/homelab
|
../../../modules/homelab
|
||||||
../../../modules/gameservers/minecraft_recpro
|
../../../modules/gameservers/minecraft_recpro
|
||||||
|
../../../modules/gameservers/minecraft_modded
|
||||||
];
|
];
|
||||||
|
|
||||||
home-manager.users.blake.imports = [
|
home-manager.users.blake.imports = [
|
||||||
@@ -25,11 +26,14 @@ in
|
|||||||
sops.enable = true;
|
sops.enable = true;
|
||||||
podman.enable = true;
|
podman.enable = true;
|
||||||
yubikey.enable = true;
|
yubikey.enable = true;
|
||||||
nvidia.enable = true;
|
graphics = {
|
||||||
|
enable = true;
|
||||||
|
vendor = "nvidia";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
holocron = {
|
holocron = {
|
||||||
syncthing.enable = true;
|
syncthing.enable = true;
|
||||||
copyparty.enable = true;
|
copyparty.enable = false;
|
||||||
ensure_perms.enable = false;
|
ensure_perms.enable = false;
|
||||||
zfs.enable = true;
|
zfs.enable = true;
|
||||||
smb.enable = true;
|
smb.enable = true;
|
||||||
@@ -38,6 +42,7 @@ in
|
|||||||
homelab = {
|
homelab = {
|
||||||
enable = true;
|
enable = true;
|
||||||
tailscale.enable = true;
|
tailscale.enable = true;
|
||||||
|
dnsmasq.enable = true;
|
||||||
backups.enable = true;
|
backups.enable = true;
|
||||||
motd.enable = true;
|
motd.enable = true;
|
||||||
postfix.enable = true;
|
postfix.enable = true;
|
||||||
@@ -62,6 +67,7 @@ in
|
|||||||
};
|
};
|
||||||
gameservers = {
|
gameservers = {
|
||||||
minecraft_recpro.enable = true;
|
minecraft_recpro.enable = true;
|
||||||
|
minecraft_modded.enable = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
# boot (systemd is going on me)
|
# boot (systemd is going on me)
|
||||||
|
|||||||
@@ -1,66 +1,112 @@
|
|||||||
{ config, lib, inputs, stable_pkgs, unstable_pkgs, ... }:
|
|
||||||
|
|
||||||
{
|
{
|
||||||
imports =
|
pkgs,
|
||||||
[ # Include the results of the hardware scan.
|
config,
|
||||||
./hardware-configuration.nix
|
lib,
|
||||||
../../nixos
|
modulesPath,
|
||||||
../../../modules/desktop/hypr
|
inputs,
|
||||||
../../../modules/desktop/greetd
|
stable_pkgs,
|
||||||
../../../users/blake
|
unstable_pkgs,
|
||||||
../../../modules/system
|
...
|
||||||
];
|
}: {
|
||||||
|
imports = [
|
||||||
home-manager.users.blake.imports = [
|
# Include the results of the hardware scan.
|
||||||
../../../users/blake/hosts/yveltal.nix
|
(modulesPath + "/installer/scan/not-detected.nix")
|
||||||
|
#./hardware-configuration.nix
|
||||||
|
../../nixos
|
||||||
|
../../../users/blake
|
||||||
|
../../../modules/desktop
|
||||||
|
../../../modules/system
|
||||||
];
|
];
|
||||||
|
|
||||||
|
# home grown nixos modules
|
||||||
system = {
|
system = {
|
||||||
|
secure_boot.enable = true;
|
||||||
|
cifs_mounts.enable = true;
|
||||||
|
udiskie.enable = true;
|
||||||
ssh.enable = true;
|
ssh.enable = true;
|
||||||
sops.enable = true;
|
sops.enable = true;
|
||||||
yubikey.enable = true;
|
yubikey.enable = true;
|
||||||
|
yubikey.lock_on_remove = true;
|
||||||
tailscale.enable = true;
|
tailscale.enable = true;
|
||||||
syncthing.enable = true;
|
syncthing.enable = true;
|
||||||
|
flatpak.enable = true;
|
||||||
|
graphics = {
|
||||||
|
enable = true;
|
||||||
|
vendor = "intel";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
desktop = {
|
||||||
|
pipewire.enable = true;
|
||||||
|
hypr.enable = true;
|
||||||
|
greetd.enable = true;
|
||||||
|
};
|
||||||
|
gaming = {
|
||||||
|
steam.enable = true;
|
||||||
|
lutris.enable = true;
|
||||||
|
proton_ge.enable = true;
|
||||||
|
gamemode.enable = true;
|
||||||
|
mangohud.enable = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
# import home grown host specific home-manager modules
|
||||||
|
home-manager.users.blake.imports = [
|
||||||
|
../../../users/blake/hosts/yveltal.nix
|
||||||
|
];
|
||||||
|
|
||||||
# fix power buttons
|
# fix power buttons
|
||||||
|
# move this to a laptops file at some point
|
||||||
services.logind.settings.Login = {
|
services.logind.settings.Login = {
|
||||||
HandlePowerKey = "suspend";
|
HandlePowerKey = "suspend-then-hibernate";
|
||||||
HandleLidSwitch = "suspend";
|
HandleLidSwitch = "suspend-then-hibernate";
|
||||||
#HibernateDelaySec = "30min";
|
|
||||||
};
|
};
|
||||||
|
# sets the delay before hibernation for ^
|
||||||
|
systemd.sleep.extraConfig = ''
|
||||||
|
HibernateDelaySec=1800
|
||||||
|
'';
|
||||||
|
|
||||||
# boot (systemd is going on me)
|
# boot (systemd is growing on me)
|
||||||
boot.loader.systemd-boot.enable = true; # systemd your pretty cool ya know
|
boot = {
|
||||||
boot.loader.efi.canTouchEfiVariables = true;
|
kernelModules = ["kvm-intel"];
|
||||||
boot.initrd.systemd.enable = true; # better logging
|
extraModulePackages = [];
|
||||||
|
loader = {
|
||||||
|
systemd-boot.enable = true; # systemd your pretty cool ya know
|
||||||
|
efi.canTouchEfiVariables = true;
|
||||||
|
};
|
||||||
|
initrd = {
|
||||||
|
systemd.enable = true; # better logging
|
||||||
|
availableKernelModules = ["xhci_pci" "thunderbolt" "vmd" "nvme" "usb_storage" "sd_mod"];
|
||||||
|
kernelModules = [];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
# setup hostname and networking stack
|
# setup hostname and networking stack
|
||||||
services.resolved = {
|
|
||||||
enable = true;
|
|
||||||
fallbackDns = [ "1.1.1.1" "9.9.9.9" ];
|
|
||||||
dnsovertls = "opportunistic";
|
|
||||||
};
|
|
||||||
networking = {
|
networking = {
|
||||||
hostName = "yveltal"; # hostname
|
hostName = "yveltal"; # hostname
|
||||||
|
useDHCP = lib.mkDefault true;
|
||||||
|
interfaces = {
|
||||||
|
wlp0s20f3.useDHCP = lib.mkDefault true;
|
||||||
|
};
|
||||||
|
firewall = {
|
||||||
|
enable = true;
|
||||||
|
allowedTCPPorts = [22];
|
||||||
|
allowedUDPPorts = [51820]; # wireguard
|
||||||
|
};
|
||||||
networkmanager = {
|
networkmanager = {
|
||||||
enable = true; # the goat
|
enable = true; # the goat
|
||||||
dns = "systemd-resolved"; # the backup dancer!
|
dns = "systemd-resolved"; # the backup dancer!
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
services.resolved = {
|
||||||
|
enable = true;
|
||||||
|
fallbackDns = ["1.1.1.1" "9.9.9.9"];
|
||||||
|
dnsovertls = "opportunistic";
|
||||||
|
};
|
||||||
|
|
||||||
hardware.bluetooth.enable = true;
|
hardware.bluetooth.enable = true;
|
||||||
|
|
||||||
# Open ports in the firewall.
|
|
||||||
networking.firewall.allowedTCPPorts = [
|
|
||||||
22
|
|
||||||
];
|
|
||||||
|
|
||||||
networking.firewall.allowedUDPPorts = [ 51820 ];
|
|
||||||
# Or disable the firewall altogether.
|
|
||||||
networking.firewall.enable = true;
|
|
||||||
|
|
||||||
system.stateVersion = "25.05"; # stays here : )
|
system.stateVersion = "25.05"; # stays here : )
|
||||||
|
|
||||||
|
# hardware shit
|
||||||
|
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||||
|
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,59 +0,0 @@
|
|||||||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
|
||||||
# and may be overwritten by future invocations. Please make changes
|
|
||||||
# to /etc/nixos/configuration.nix instead.
|
|
||||||
{ config, lib, pkgs, modulesPath, ... }:
|
|
||||||
|
|
||||||
{
|
|
||||||
imports =
|
|
||||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
|
||||||
];
|
|
||||||
|
|
||||||
boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "vmd" "nvme" "usb_storage" "sd_mod" ];
|
|
||||||
boot.initrd.kernelModules = [ ];
|
|
||||||
boot.kernelModules = [ "kvm-intel" ];
|
|
||||||
boot.extraModulePackages = [ ];
|
|
||||||
|
|
||||||
fileSystems."/" =
|
|
||||||
{ device = "/dev/mapper/crypted";
|
|
||||||
fsType = "btrfs";
|
|
||||||
options = [ "subvol=@root" ];
|
|
||||||
};
|
|
||||||
|
|
||||||
boot.initrd.luks.devices."crypted".device = "/dev/disk/by-partlabel/disk-main-luks";
|
|
||||||
|
|
||||||
fileSystems."/.swapvol" =
|
|
||||||
{ device = "/dev/mapper/crypted";
|
|
||||||
fsType = "btrfs";
|
|
||||||
options = [ "subvol=@swap" ];
|
|
||||||
};
|
|
||||||
|
|
||||||
fileSystems."/boot" =
|
|
||||||
{ device = "/dev/disk/by-partlabel/disk-main-ESP";
|
|
||||||
fsType = "vfat";
|
|
||||||
options = [ "fmask=0077" "dmask=0077" ];
|
|
||||||
};
|
|
||||||
|
|
||||||
fileSystems."/home" =
|
|
||||||
{ device = "/dev/mapper/crypted";
|
|
||||||
fsType = "btrfs";
|
|
||||||
options = [ "subvol=@home" ];
|
|
||||||
};
|
|
||||||
|
|
||||||
fileSystems."/nix" =
|
|
||||||
{ device = "/dev/mapper/crypted";
|
|
||||||
fsType = "btrfs";
|
|
||||||
options = [ "subvol=@nix" ];
|
|
||||||
};
|
|
||||||
|
|
||||||
swapDevices = [ ];
|
|
||||||
|
|
||||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
|
||||||
# (the default) this is the recommended approach. When using systemd-networkd it's
|
|
||||||
# still possible to use this option, but it's recommended to use it in conjunction
|
|
||||||
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
|
|
||||||
networking.useDHCP = lib.mkDefault true;
|
|
||||||
# networking.interfaces.wlp0s20f3.useDHCP = lib.mkDefault true;
|
|
||||||
|
|
||||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
|
||||||
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
|
||||||
}
|
|
||||||
@@ -1,11 +1,13 @@
|
|||||||
{
|
{
|
||||||
pkgs,
|
pkgs,
|
||||||
lib,
|
|
||||||
config,
|
config,
|
||||||
|
lib,
|
||||||
...
|
...
|
||||||
}: {
|
}: {
|
||||||
imports = [
|
imports = [
|
||||||
./librewolf
|
./pipewire
|
||||||
./firefox
|
./hypr
|
||||||
|
./greetd
|
||||||
|
./gaming
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
16
modules/desktop/gaming/default.nix
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
{
|
||||||
|
pkgs,
|
||||||
|
config,
|
||||||
|
inputs,
|
||||||
|
lib,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
|
imports = [
|
||||||
|
inputs.slippi.nixosModules.default # gcc drivers
|
||||||
|
./steam
|
||||||
|
./lutris
|
||||||
|
./proton_ge
|
||||||
|
./gamemode
|
||||||
|
./mangohud
|
||||||
|
];
|
||||||
|
}
|
||||||
20
modules/desktop/gaming/gamemode/default.nix
Normal file
@@ -0,0 +1,20 @@
|
|||||||
|
{
|
||||||
|
pkgs,
|
||||||
|
lib,
|
||||||
|
config,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
|
cfg = config.gaming.gamemode;
|
||||||
|
in {
|
||||||
|
options.gaming.gamemode = {
|
||||||
|
enable = lib.mkEnableOption "enable lutris";
|
||||||
|
};
|
||||||
|
|
||||||
|
config = lib.mkIf cfg.enable {
|
||||||
|
|
||||||
|
# enable gamemode for game optimizations
|
||||||
|
# requires setting launch option `gamemoderun %command%`
|
||||||
|
programs.gamemode.enable = true;
|
||||||
|
|
||||||
|
};
|
||||||
|
}
|
||||||
19
modules/desktop/gaming/lutris/default.nix
Normal file
@@ -0,0 +1,19 @@
|
|||||||
|
{
|
||||||
|
pkgs,
|
||||||
|
lib,
|
||||||
|
config,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
|
cfg = config.gaming.lutris;
|
||||||
|
in {
|
||||||
|
options.gaming.lutris = {
|
||||||
|
enable = lib.mkEnableOption "enable lutris";
|
||||||
|
};
|
||||||
|
|
||||||
|
config = lib.mkIf cfg.enable {
|
||||||
|
environment.systemPackages = with pkgs; [
|
||||||
|
lutris
|
||||||
|
wine
|
||||||
|
];
|
||||||
|
};
|
||||||
|
}
|
||||||
20
modules/desktop/gaming/mangohud/default.nix
Normal file
@@ -0,0 +1,20 @@
|
|||||||
|
{
|
||||||
|
pkgs,
|
||||||
|
lib,
|
||||||
|
config,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
|
cfg = config.gaming.mangohud;
|
||||||
|
in {
|
||||||
|
options.gaming.mangohud = {
|
||||||
|
enable = lib.mkEnableOption "enable lutris";
|
||||||
|
};
|
||||||
|
|
||||||
|
config = lib.mkIf cfg.enable {
|
||||||
|
# preformance overlay
|
||||||
|
# requires setting launch option `mangohud %command%`
|
||||||
|
environment.systemPackages = with pkgs; [
|
||||||
|
mangohud
|
||||||
|
];
|
||||||
|
};
|
||||||
|
}
|
||||||
24
modules/desktop/gaming/proton_ge/default.nix
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
{
|
||||||
|
pkgs,
|
||||||
|
lib,
|
||||||
|
config,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
|
cfg = config.gaming.proton_ge;
|
||||||
|
in {
|
||||||
|
options.gaming.proton_ge = {
|
||||||
|
enable = lib.mkEnableOption "enable proton ge";
|
||||||
|
};
|
||||||
|
|
||||||
|
# this is an imperitive install after rebuild run `protonup`
|
||||||
|
config = lib.mkIf cfg.enable {
|
||||||
|
environment.systemPackages = with pkgs; [
|
||||||
|
protonup-ng
|
||||||
|
];
|
||||||
|
|
||||||
|
# tells `protonup` what path to use
|
||||||
|
environment.sessionVariables = {
|
||||||
|
STEAM_EXTRA_COMPACT_TOOLS_PATHS = "/home/blake/.steam/root/compatibilitytools.d";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
22
modules/desktop/gaming/steam/default.nix
Normal file
@@ -0,0 +1,22 @@
|
|||||||
|
{
|
||||||
|
pkgs,
|
||||||
|
lib,
|
||||||
|
config,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
|
cfg = config.gaming.steam;
|
||||||
|
in {
|
||||||
|
options.gaming.steam = {
|
||||||
|
enable = lib.mkEnableOption "enable steam";
|
||||||
|
};
|
||||||
|
|
||||||
|
config = lib.mkIf cfg.enable {
|
||||||
|
programs.steam = {
|
||||||
|
enable = true;
|
||||||
|
gamescopeSession.enable = true; # requires setting launch option `gamescope <options> -- %command%`
|
||||||
|
remotePlay.openFirewall = true; # open ports for remote play
|
||||||
|
#dedicatedServer.openFirewall = true; # open ports for source dedicated server
|
||||||
|
protontricks.enable = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -3,25 +3,32 @@
|
|||||||
lib,
|
lib,
|
||||||
config,
|
config,
|
||||||
...
|
...
|
||||||
}: {
|
}: let
|
||||||
|
cfg = config.desktop.greetd;
|
||||||
|
in {
|
||||||
|
options.desktop.greetd = {
|
||||||
|
enable = lib.mkEnableOption "enable greetd with tuigreet";
|
||||||
|
};
|
||||||
|
|
||||||
services.greetd = {
|
config = lib.mkIf cfg.enable {
|
||||||
enable = true;
|
services.greetd = {
|
||||||
# tuigreet command to run
|
enable = true;
|
||||||
settings = {
|
# tuigreet command to run
|
||||||
default_session = {
|
settings = {
|
||||||
user = "greeter";
|
default_session = {
|
||||||
command = "${pkgs.tuigreet}/bin/tuigreet -c Hyprland -t --greeting \"howdy o/\" --user-menu --remember --remember-user-session --power-shutdown \"systemctl poweroff\" --power-reboot \"systemctl reboot\"";
|
user = "greeter";
|
||||||
|
command = "${pkgs.tuigreet}/bin/tuigreet -c Hyprland -t --greeting \"howdy o/\" --user-menu --remember --remember-user-session --power-shutdown \"systemctl poweroff\" --power-reboot \"systemctl reboot\"";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
|
||||||
|
|
||||||
# allow yubikey signin with u2f
|
# allow yubikey signin with u2f
|
||||||
security.pam.services.greetd.u2fAuth = true;
|
security.pam.services.greetd.u2fAuth = true;
|
||||||
|
|
||||||
# ensure the user exists
|
# ensure the user exists
|
||||||
users.users.greeter = {
|
users.users.greeter = {
|
||||||
isSystemUser = true;
|
isSystemUser = true;
|
||||||
description = "user for greetd";
|
description = "user for greetd";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,12 +3,20 @@
|
|||||||
lib,
|
lib,
|
||||||
config,
|
config,
|
||||||
...
|
...
|
||||||
}: {
|
}: let
|
||||||
|
cfg = config.desktop.hypr;
|
||||||
|
in {
|
||||||
|
options.desktop.hypr = {
|
||||||
|
enable = lib.mkEnableOption "enable hypr on nixos side";
|
||||||
|
};
|
||||||
|
|
||||||
# enable hyprland
|
config = lib.mkIf cfg.enable {
|
||||||
programs.hyprland.enable = true;
|
# enable hyprland
|
||||||
|
programs.hyprland.enable = true;
|
||||||
|
|
||||||
|
# give hyprlock perms to unlock
|
||||||
# give hyprlock perms to unlock
|
security.pam.services.hyprlock = {
|
||||||
security.pam.services.hyprlock = {};
|
enable = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
136
modules/desktop/pipewire/default.nix
Normal file
@@ -0,0 +1,136 @@
|
|||||||
|
{
|
||||||
|
pkgs,
|
||||||
|
lib,
|
||||||
|
config,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
|
cfg = config.desktop.pipewire;
|
||||||
|
in {
|
||||||
|
options.desktop.pipewire = {
|
||||||
|
enable = lib.mkEnableOption "enable pipewire for sound!";
|
||||||
|
};
|
||||||
|
|
||||||
|
config = lib.mkIf cfg.enable {
|
||||||
|
security.rtkit.enable = true;
|
||||||
|
|
||||||
|
environment.systemPackages = with pkgs; [
|
||||||
|
qpwgraph # patching software
|
||||||
|
pavucontrol # volume mixer
|
||||||
|
pulsemixer
|
||||||
|
];
|
||||||
|
|
||||||
|
services.pipewire = {
|
||||||
|
enable = true;
|
||||||
|
alsa = {
|
||||||
|
enable = true;
|
||||||
|
support32Bit = true;
|
||||||
|
};
|
||||||
|
pulse.enable = true;
|
||||||
|
jack.enable = true;
|
||||||
|
|
||||||
|
wireplumber = {
|
||||||
|
enable = true;
|
||||||
|
extraConfig = {
|
||||||
|
"90-yveltal-renames" = {
|
||||||
|
"monitor.alsa.rules" = [
|
||||||
|
# audio sinks
|
||||||
|
{
|
||||||
|
matches = [
|
||||||
|
{
|
||||||
|
"node.name" = "alsa_output.pci-0000_00_1f.3-platform-skl_hda_dsp_generic.HiFi__Speaker__sink";
|
||||||
|
}
|
||||||
|
];
|
||||||
|
actions = {
|
||||||
|
"update-props" = {
|
||||||
|
"node.description" = "Speakers / 3.5mm";
|
||||||
|
"node.nick" = "Speakers / 3.5mm";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
|
{
|
||||||
|
matches = [
|
||||||
|
{
|
||||||
|
"node.name" = "alsa_output.pci-0000_00_1f.3-platform-skl_hda_dsp_generic.HiFi__HDMI1__sink";
|
||||||
|
}
|
||||||
|
];
|
||||||
|
actions = {
|
||||||
|
"update-props" = {
|
||||||
|
"node.description" = "HDMI / DP 1";
|
||||||
|
"node.nick" = "HDMI / DP 1";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
|
{
|
||||||
|
matches = [
|
||||||
|
{
|
||||||
|
"node.name" = "alsa_output.pci-0000_00_1f.3-platform-skl_hda_dsp_generic.HiFi__HDMI2__sink";
|
||||||
|
}
|
||||||
|
];
|
||||||
|
actions = {
|
||||||
|
"update-props" = {
|
||||||
|
"node.description" = "HDMI / DP 2";
|
||||||
|
"node.nick" = "HDMI / DP 2";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
|
{
|
||||||
|
matches = [
|
||||||
|
{
|
||||||
|
"node.name" = "alsa_output.pci-0000_00_1f.3-platform-skl_hda_dsp_generic.HiFi__HDMI3__sink";
|
||||||
|
}
|
||||||
|
];
|
||||||
|
actions = {
|
||||||
|
"update-props" = {
|
||||||
|
"node.description" = "HDMI / DP 3";
|
||||||
|
"node.nick" = "HDMI / DP 3";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
|
# audio sources
|
||||||
|
{
|
||||||
|
matches = [
|
||||||
|
{
|
||||||
|
"node.name" = "alsa_input.pci-0000_00_1f.3-platform-skl_hda_dsp_generic.HiFi__Headset__source";
|
||||||
|
}
|
||||||
|
];
|
||||||
|
actions = {
|
||||||
|
"update-props" = {
|
||||||
|
"node.description" = "3.5mm Mic";
|
||||||
|
"node.nick" = "3.5mm Mic";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
|
{
|
||||||
|
matches = [
|
||||||
|
{
|
||||||
|
"node.name" = "alsa_input.pci-0000_00_1f.3-platform-skl_hda_dsp_generic.HiFi__Mic1__source";
|
||||||
|
}
|
||||||
|
];
|
||||||
|
actions = {
|
||||||
|
"update-props" = {
|
||||||
|
"node.description" = "Laptop Mic";
|
||||||
|
"node.nick" = "Laptop Mic";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
|
# audio controllers
|
||||||
|
{
|
||||||
|
matches = [
|
||||||
|
{
|
||||||
|
"device.name" = "alsa_card.pci-0000_00_1f.3-platform-skl_hda_dsp_generic";
|
||||||
|
}
|
||||||
|
];
|
||||||
|
actions = {
|
||||||
|
"update-props" = {
|
||||||
|
"node.description" = "Laptop Controller";
|
||||||
|
"node.nick" = "Laptop Controller";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
|
];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
156
modules/gameservers/minecraft_modded/default.nix
Normal file
@@ -0,0 +1,156 @@
|
|||||||
|
{
|
||||||
|
pkgs,
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
|
service = "minecraft_modded";
|
||||||
|
cfg = config.gameservers.${service};
|
||||||
|
sec = config.sops.secrets;
|
||||||
|
servers = {
|
||||||
|
cobblemon = {
|
||||||
|
data_dir = "/var/lib/gameservers/minecraft_modded/cobblemon";
|
||||||
|
start_file = "start.sh";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
in {
|
||||||
|
options.gameservers.${service} = {
|
||||||
|
enable = lib.mkEnableOption "enables ${service}";
|
||||||
|
url = lib.mkOption {
|
||||||
|
type = lib.types.str;
|
||||||
|
default = "mc.recoil.pro";
|
||||||
|
description = "set domain for ${service}";
|
||||||
|
};
|
||||||
|
data_dir = lib.mkOption {
|
||||||
|
type = lib.types.str;
|
||||||
|
default = "/var/lib/gameservers/${service}";
|
||||||
|
description = "set data directory for ${service}";
|
||||||
|
};
|
||||||
|
ids = lib.mkOption {
|
||||||
|
type = lib.types.int;
|
||||||
|
default = 25565;
|
||||||
|
description = "set uid and pid of ${service} user (matches port by default)";
|
||||||
|
};
|
||||||
|
backup = lib.mkOption {
|
||||||
|
type = lib.types.bool;
|
||||||
|
default = false;
|
||||||
|
description = "enable backups for ${service}";
|
||||||
|
};
|
||||||
|
motd = lib.mkOption {
|
||||||
|
type = lib.types.nullOr lib.types.str;
|
||||||
|
default = "velocity";
|
||||||
|
};
|
||||||
|
backup_repo = lib.mkOption {
|
||||||
|
type = lib.types.path;
|
||||||
|
default = "/holocron/archives/gameservers/minecraft/modded";
|
||||||
|
description = "path to take hourly backups to with borg!";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
config = lib.mkIf cfg.enable {
|
||||||
|
|
||||||
|
# declare ${service} user
|
||||||
|
users.users.minecraft = lib.mkDefault {
|
||||||
|
description = "minecraft server user";
|
||||||
|
uid = lib.mkForce cfg.ids;
|
||||||
|
isSystemUser = true;
|
||||||
|
shell = pkgs.bash;
|
||||||
|
group = "minecraft";
|
||||||
|
extraGroups = [];
|
||||||
|
};
|
||||||
|
|
||||||
|
systemd.tmpfiles.rules =
|
||||||
|
lib.attrsets.mapAttrsToList (
|
||||||
|
name: cfg: "d ${cfg.data_dir} 0770 minecraft minecraft -"
|
||||||
|
)
|
||||||
|
servers;
|
||||||
|
|
||||||
|
# Create a systemd service per server running in tmux
|
||||||
|
systemd.services =
|
||||||
|
lib.attrsets.mapAttrs (name: srv: {
|
||||||
|
description = "minecraft_recpro: ${name}";
|
||||||
|
after = ["network.target"];
|
||||||
|
wants = ["network.target"];
|
||||||
|
serviceConfig = {
|
||||||
|
User = "minecraft";
|
||||||
|
Group = "minecraft";
|
||||||
|
WorkingDirectory = srv.data_dir;
|
||||||
|
UMask = "0007";
|
||||||
|
ExecStart = "${pkgs.openjdk21}/bin/java -Xms4G -Xmx12G -XX:+UseG1GC -XX:+ParallelRefProcEnabled -XX:MaxGCPauseMillis=200 -XX:+UnlockExperimentalVMOptions -XX:+AlwaysPreTouch -XX:G1NewSizePercent=30 -XX:G1MaxNewSizePercent=40 -XX:G1HeapRegionSize=8M -XX:G1ReservePercent=20 -XX:G1HeapWastePercent=5 -XX:G1MixedGCCountTarget=4 -XX:InitiatingHeapOccupancyPercent=15 -XX:G1MixedGCLiveThresholdPercent=90 -XX:G1RSetUpdatingPauseTimePercent=5 -XX:SurvivorRatio=32 -XX:+PerfDisableSharedMem -XX:MaxTenuringThreshold=1 -Dusing.aikars.flags=https://mcflags.emc.gs -Daikars.new.flags=true @libraries/net/neoforged/neoforge/21.1.211/unix_args.txt";
|
||||||
|
#ExecStart = "${srv.data_dir}/${srv.start_file}";
|
||||||
|
Restart = "on-failure";
|
||||||
|
KillMode = "process";
|
||||||
|
};
|
||||||
|
wantedBy = ["multi-user.target"];
|
||||||
|
})
|
||||||
|
servers;
|
||||||
|
|
||||||
|
environment.systemPackages = with pkgs; [openjdk21 mcrcon];
|
||||||
|
|
||||||
|
# services.mysql = {
|
||||||
|
# enable = true;
|
||||||
|
# package = pkgs.mariadb;
|
||||||
|
# ensureDatabases = ["minecraft_recpro_db"];
|
||||||
|
# ensureUsers = [
|
||||||
|
# {
|
||||||
|
# name = "minecraft";
|
||||||
|
# ensurePermissions = {"minecraft_recpro_db.*" = "ALL PRIVILEGES";};
|
||||||
|
# }
|
||||||
|
# ];
|
||||||
|
# initialScript = pkgs.writeText "minecraft_recpro-init.sql" ''
|
||||||
|
# CREATE USER IF NOT EXISTS 'minecraft_recpro'@'localhost' IDENTIFIED BY 'IKNOWTHISISBADIJUSTNEEDTHISTOWORKRNPLS';
|
||||||
|
# GRANT ALL PRIVILEGES ON minecraft_recpro_db.* TO 'minecraft_recpro'@'localhost';
|
||||||
|
# FLUSH PRIVILEGES;
|
||||||
|
# '';
|
||||||
|
# };
|
||||||
|
|
||||||
|
# open firewall
|
||||||
|
networking.firewall.allowedTCPPorts = [25778];
|
||||||
|
|
||||||
|
# sops.secrets = {
|
||||||
|
# "velocity_forwarding" = {
|
||||||
|
# owner = "minecraft";
|
||||||
|
# group = "minecraft";
|
||||||
|
# path = "/var/lib/gameservers/minecraft_recpro/velocity/forwarding.secret";
|
||||||
|
# mode = "0400";
|
||||||
|
# };
|
||||||
|
# "minecraft_recpro_db_passwd" = {
|
||||||
|
# owner = "mysql";
|
||||||
|
# group = "mysql";
|
||||||
|
# };
|
||||||
|
# };
|
||||||
|
|
||||||
|
# backups minecraft_recpro with borg!
|
||||||
|
services.borgbackup.jobs.${service} = {
|
||||||
|
archiveBaseName = service;
|
||||||
|
repo = cfg.backup_repo;
|
||||||
|
paths = lib.flatten (
|
||||||
|
lib.attrValues (
|
||||||
|
lib.mapAttrs (_: srv:
|
||||||
|
[srv.data_dir]
|
||||||
|
++ (
|
||||||
|
if builtins.hasAttr "db_dump" srv
|
||||||
|
then [srv.db_dump]
|
||||||
|
else []
|
||||||
|
))
|
||||||
|
servers
|
||||||
|
)
|
||||||
|
);
|
||||||
|
compression = "auto,zstd";
|
||||||
|
#preHook = "systemctl start mysql-backup.service";
|
||||||
|
startAt = "*-*-* *:00:00";
|
||||||
|
group = "archives";
|
||||||
|
encryption.mode = "repokey-blake2";
|
||||||
|
encryption.passCommand = "cat ${config.sops.secrets."borg_passwd".path}";
|
||||||
|
extraArgs = ["--verbose" "--show-rc" "--umask" "0007"];
|
||||||
|
extraCreateArgs = ["--list" "--stats" "--filter" "AME"];
|
||||||
|
prune.keep = {
|
||||||
|
within = "1d"; # Keep all archives from the last day
|
||||||
|
hourly = 24;
|
||||||
|
daily = 7;
|
||||||
|
weekly = 12;
|
||||||
|
monthly = -1; # Keep at least one archive for each month
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -102,7 +102,7 @@ in {
|
|||||||
flags = {
|
flags = {
|
||||||
chmod_f = 660;
|
chmod_f = 660;
|
||||||
chmod_d = 770;
|
chmod_d = 770;
|
||||||
gid = 700;
|
gid = "700";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
"/users/blake" = {
|
"/users/blake" = {
|
||||||
@@ -113,7 +113,7 @@ in {
|
|||||||
flags = {
|
flags = {
|
||||||
chmod_f = 660;
|
chmod_f = 660;
|
||||||
chmod_d = 770;
|
chmod_d = 770;
|
||||||
gid = 1000;
|
gid = "1000";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ in {
|
|||||||
dataDir = "/var/lib/syncthing";
|
dataDir = "/var/lib/syncthing";
|
||||||
guiAddress = "0.0.0.0:2222";
|
guiAddress = "0.0.0.0:2222";
|
||||||
openDefaultPorts = true;
|
openDefaultPorts = true;
|
||||||
extraFlags = ["--no-default-folder"];
|
#extraFlags = ["--no-default-folder"];
|
||||||
key = sec."${service}/snowbelle/key".path;
|
key = sec."${service}/snowbelle/key".path;
|
||||||
cert = sec."${service}/snowbelle/cert".path;
|
cert = sec."${service}/snowbelle/cert".path;
|
||||||
settings = {
|
settings = {
|
||||||
@@ -31,11 +31,12 @@ in {
|
|||||||
"zygarde" = {id = "UYLTF52-VVKUR7F-JN33HQZ-RFNWGL3-JER52LA-GZD2LPJ-QIFEE7K-MNMZRQ5";};
|
"zygarde" = {id = "UYLTF52-VVKUR7F-JN33HQZ-RFNWGL3-JER52LA-GZD2LPJ-QIFEE7K-MNMZRQ5";};
|
||||||
"yveltal" = {id = "ZVSQ4WJ-7OICYOZ-3ECES4X-KH37IPB-TKHKUJG-BSEGXVM-AHYY5C3-VKG44AX";};
|
"yveltal" = {id = "ZVSQ4WJ-7OICYOZ-3ECES4X-KH37IPB-TKHKUJG-BSEGXVM-AHYY5C3-VKG44AX";};
|
||||||
"CEN-IT-07" = {id = "DPYKA4Z-3PX7JB2-FBEOXXX-SC7TLT2-QC5P2IR-SXOPJGX-QO3DMII-5B7UCA4";};
|
"CEN-IT-07" = {id = "DPYKA4Z-3PX7JB2-FBEOXXX-SC7TLT2-QC5P2IR-SXOPJGX-QO3DMII-5B7UCA4";};
|
||||||
|
"CEN-IT-00007" = {id = "XBPXGYU-DUJSLDH-6BDNF4D-CO2COC3-N3FM6W5-IHZOJBM-Z2N77RI-IVAV5AH";};
|
||||||
};
|
};
|
||||||
folders = {
|
folders = {
|
||||||
"holocron" = {
|
"holocron" = {
|
||||||
path = "/holocron/users/blake/holocron";
|
path = "/holocron/users/blake/holocron";
|
||||||
devices = ["lugia" "zygarde" "CEN-IT-07" "yveltal"];
|
devices = ["lugia" "zygarde" "CEN-IT-07" "CEN-IT-00007" "yveltal"];
|
||||||
id = "5voxg-c3he2";
|
id = "5voxg-c3he2";
|
||||||
versioning = {
|
versioning = {
|
||||||
type = "staggered";
|
type = "staggered";
|
||||||
|
|||||||
@@ -78,7 +78,7 @@ in
|
|||||||
# add to caddy for reverse proxy
|
# add to caddy for reverse proxy
|
||||||
services.caddy.virtualHosts."${cfg.url}" = {
|
services.caddy.virtualHosts."${cfg.url}" = {
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
tls ${sec."ssl_blakedheld_crt".path} ${sec."ssl_blakedheld_key".path}
|
tls internal
|
||||||
reverse_proxy 127.0.0.1:${toString cfg.port}
|
reverse_proxy 127.0.0.1:${toString cfg.port}
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -74,7 +74,7 @@ in
|
|||||||
# add to caddy for reverse proxy
|
# add to caddy for reverse proxy
|
||||||
services.caddy.virtualHosts."${cfg.url}" = {
|
services.caddy.virtualHosts."${cfg.url}" = {
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
tls ${sec."ssl_blakedheld_crt".path} ${sec."ssl_blakedheld_key".path}
|
tls internal
|
||||||
reverse_proxy 127.0.0.1:${toString cfg.port}
|
reverse_proxy 127.0.0.1:${toString cfg.port}
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -80,7 +80,7 @@ in
|
|||||||
# add to caddy for reverse proxy
|
# add to caddy for reverse proxy
|
||||||
services.caddy.virtualHosts."${cfg.url}" = {
|
services.caddy.virtualHosts."${cfg.url}" = {
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
tls ${sec."ssl_blakedheld_crt".path} ${sec."ssl_blakedheld_key".path}
|
tls internal
|
||||||
reverse_proxy 127.0.0.1:${toString cfg.port}
|
reverse_proxy 127.0.0.1:${toString cfg.port}
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -86,7 +86,7 @@ in
|
|||||||
# add to caddy for reverse proxy
|
# add to caddy for reverse proxy
|
||||||
services.caddy.virtualHosts."${cfg.url}" = {
|
services.caddy.virtualHosts."${cfg.url}" = {
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
tls ${sec."ssl_blakedheld_crt".path} ${sec."ssl_blakedheld_key".path}
|
tls internal
|
||||||
reverse_proxy 127.0.0.1:${toString cfg.port}
|
reverse_proxy 127.0.0.1:${toString cfg.port}
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -83,8 +83,9 @@ in
|
|||||||
|
|
||||||
# add to caddy for reverse proxy
|
# add to caddy for reverse proxy
|
||||||
services.caddy.virtualHosts."${cfg.url}" = {
|
services.caddy.virtualHosts."${cfg.url}" = {
|
||||||
|
# tls ${sec."ssl_blakedheld_crt".path} ${sec."ssl_blakedheld_key".path}
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
tls ${sec."ssl_blakedheld_crt".path} ${sec."ssl_blakedheld_key".path}
|
tls internal
|
||||||
reverse_proxy 127.0.0.1:${toString cfg.port}
|
reverse_proxy 127.0.0.1:${toString cfg.port}
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -42,6 +42,7 @@ in
|
|||||||
# the order determines the order in glance :3
|
# the order determines the order in glance :3
|
||||||
imports = [
|
imports = [
|
||||||
./motd
|
./motd
|
||||||
|
./dnsmasq
|
||||||
./backups
|
./backups
|
||||||
./glance
|
./glance
|
||||||
./postfix
|
./postfix
|
||||||
|
|||||||
42
modules/homelab/dnsmasq/default.nix
Normal file
@@ -0,0 +1,42 @@
|
|||||||
|
{
|
||||||
|
pkgs,
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
|
service = "dnsmasq";
|
||||||
|
cfg = config.homelab.${service};
|
||||||
|
sec = config.sops.secrets;
|
||||||
|
homelab = config.homelab;
|
||||||
|
in {
|
||||||
|
options.homelab.${service} = {
|
||||||
|
enable = lib.mkEnableOption "enables ${service}";
|
||||||
|
port = lib.mkOption {
|
||||||
|
type = lib.types.int;
|
||||||
|
default = 53;
|
||||||
|
description = "set port for ${service} (default: ${toString cfg.port}";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
config = lib.mkIf cfg.enable {
|
||||||
|
# enable the ${service} service
|
||||||
|
services.${service} = {
|
||||||
|
enable = true;
|
||||||
|
settings = {
|
||||||
|
listen-address = "10.10.0.10"; # your LAN IP
|
||||||
|
#interface = "enp89s0";
|
||||||
|
bind-interfaces = true;
|
||||||
|
address = "/snowbelle.lan/10.10.0.10";
|
||||||
|
server = [ # upstream dns
|
||||||
|
"9.9.9.9"
|
||||||
|
"1.1.1.1"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
# open firewall
|
||||||
|
networking.firewall.allowedTCPPorts = [ cfg.port ];
|
||||||
|
networking.firewall.allowedUDPPorts = [ cfg.port ];
|
||||||
|
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
{ pkgs, config, lib, ... }:
|
{ pkgs, nixpkgs-unstable, config, lib, ... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
service = "gitea";
|
service = "gitea";
|
||||||
@@ -62,6 +62,10 @@ in
|
|||||||
createHome = true;
|
createHome = true;
|
||||||
group = service;
|
group = service;
|
||||||
extraGroups = [];
|
extraGroups = [];
|
||||||
|
# if you wanna attempt system ssh again
|
||||||
|
#openssh.authorizedKeys.keyFiles = [
|
||||||
|
# "${cfg.data_dir}/.ssh/authorized_keys"
|
||||||
|
#];
|
||||||
};
|
};
|
||||||
|
|
||||||
# declare the gitea service
|
# declare the gitea service
|
||||||
@@ -73,16 +77,26 @@ in
|
|||||||
appName = "gitea";
|
appName = "gitea";
|
||||||
settings = {
|
settings = {
|
||||||
server = {
|
server = {
|
||||||
|
# http config
|
||||||
ROOT_URL = "https://git.blakedheld.xyz";
|
ROOT_URL = "https://git.blakedheld.xyz";
|
||||||
DOMAIN = "git.blakedheld.xyz";
|
DOMAIN = "git.blakedheld.xyz";
|
||||||
HTTP_PORT = cfg.port;
|
HTTP_PORT = cfg.port;
|
||||||
SSH_PORT = cfg.ssh_port;
|
# local network config
|
||||||
START_SSH_SERVER = true;
|
#LOCAL_ROOT_URL = "https://git.snowbelle.lan";
|
||||||
ENABLE_PUSH_CREATE_USER = true;
|
|
||||||
ALLOW_LOCALNETWORKS = true;
|
ALLOW_LOCALNETWORKS = true;
|
||||||
ALLOWED_DOMAINS = "10.10.0.10";
|
ALLOWED_DOMAINS = "10.10.0.10";
|
||||||
SKIP_TLS_VERIFY = true;
|
SKIP_TLS_VERIFY = true;
|
||||||
|
# configure for system ssh (trying to use the systms on nix sucks)
|
||||||
|
SSH_PORT = cfg.ssh_port;
|
||||||
|
START_SSH_SERVER = true;
|
||||||
|
# SSH_PORT = 22;
|
||||||
|
# START_SSH_SERVER = false;
|
||||||
|
# SSH_ROOT_PATH = "${cfg.data_dir}/.ssh";
|
||||||
|
# SSH_CREATE_AUTHORIZED_KEYS_FILE = true;
|
||||||
|
# actual git config
|
||||||
|
DEFAULT_BRANCH = "trunk";
|
||||||
|
ENABLE_PUSH_CREATE_USER = true;
|
||||||
|
DEFAULT_PUSH_CREATE_PRIVATE = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
database = {
|
database = {
|
||||||
@@ -99,8 +113,13 @@ in
|
|||||||
networking.firewall.allowedTCPPorts = [ cfg.port cfg.ssh_port ];
|
networking.firewall.allowedTCPPorts = [ cfg.port cfg.ssh_port ];
|
||||||
|
|
||||||
# add to caddy for reverse proxy
|
# add to caddy for reverse proxy
|
||||||
|
services.caddy.virtualHosts."git.${homelab.public_domain}" = {
|
||||||
|
extraConfig = ''
|
||||||
|
reverse_proxy localhost:${toString cfg.port} {
|
||||||
|
}
|
||||||
|
'';
|
||||||
|
};
|
||||||
services.caddy.virtualHosts."${cfg.url}" = {
|
services.caddy.virtualHosts."${cfg.url}" = {
|
||||||
serverAliases = [ "git.${homelab.public_domain}" ];
|
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
tls ${sec."ssl_blakedheld_crt".path} ${sec."ssl_blakedheld_key".path}
|
tls ${sec."ssl_blakedheld_crt".path} ${sec."ssl_blakedheld_key".path}
|
||||||
reverse_proxy localhost:${toString cfg.port} {
|
reverse_proxy localhost:${toString cfg.port} {
|
||||||
@@ -108,6 +127,7 @@ in
|
|||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
# add to glance
|
# add to glance
|
||||||
homelab.glance.links.services = [{
|
homelab.glance.links.services = [{
|
||||||
title = service;
|
title = service;
|
||||||
|
|||||||
@@ -242,6 +242,13 @@ in
|
|||||||
cache = "5s";
|
cache = "5s";
|
||||||
template = "<div style=\"display:flex; align-items:center; gap:12px;\">\n <div style=\"width:40px; height:40px; flex-shrink:0; border-radius:4px; display:flex; justify-content:center; align-items:center; overflow:hidden;\">\n {{ if .JSON.Bool \"online\" }}\n <img src=\"{{ .JSON.String \"icon\" | safeURL }}\" width=\"64\" height=\"64\" style=\"object-fit:contain;\">\n {{ else }}\n <svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 20 20\" fill=\"currentColor\" style=\"width:32px; height:32px; opacity:0.5;\">\n <path fill-rule=\"evenodd\" d=\"M1 5.25A2.25 2.25 0 0 1 3.25 3h13.5A2.25 2.25 0 0 1 19 5.25v9.5A2.25 2.25 0 0 1 16.75 17H3.25A2.25 2.25 0 0 1 1 14.75v-9.5Zm1.5 5.81v3.69c0 .414.336.75.75.75h13.5a.75.75 0 0 0 .75-.75v-2.69l-2.22-2.219a.75.75 0 0 0-1.06 0l-1.91 1.909.47.47a.75.75 0 1 1-1.06 1.06L6.53 8.091a.75.75 0 0 0-1.06 0l-2.97 2.97ZM12 7a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z\" clip-rule=\"evenodd\" />\n </svg>\n {{ end }}\n </div>\n\n <div style=\"flex-grow:1; min-width:0;\">\n <a class=\"size-h4 block text-truncate color-highlight\">\n {{ .JSON.String \"host\" }}\n {{ if .JSON.Bool \"online\" }}\n <span\n style=\"width: 8px; height: 8px; border-radius: 50%; background-color: var(--color-positive); display: inline-block; vertical-align: middle;\"\n data-popover-type=\"text\"\n data-popover-text=\"Online\"\n ></span>\n {{ else }}\n <span\n style=\"width: 8px; height: 8px; border-radius: 50%; background-color: var(--color-negative); display: inline-block; vertical-align: middle;\"\n data-popover-type=\"text\"\n data-popover-text=\"Offline\"\n ></span>\n {{ end }}\n </a>\n\n <ul class=\"list-horizontal-text\">\n <li>\n {{ if .JSON.Bool \"online\" }}\n <span>{{ .JSON.String \"version.name_clean\" }}</span>\n {{ else }}\n <span>Offline</span>\n {{ end }}\n </li>\n {{ if .JSON.Bool \"online\" }}\n <li data-popover-type=\"html\">\n <div data-popover-html>\n {{ range .JSON.Array \"players.list\" }}{{ .String \"name_clean\" }}<br>{{ end }}\n </div>\n <p style=\"display:inline-flex;align-items:center;\">\n <svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 24 24\" fill=\"currentColor\" class=\"size-6\" style=\"height:1em;vertical-align:middle;margin-right:0.5em;\">\n <path fill-rule=\"evenodd\" d=\"M7.5 6a4.5 4.5 0 1 1 9 0 4.5 4.5 0 0 1-9 0ZM3.751 20.105a8.25 8.25 0 0 1 16.498 0 .75.75 0 0 1-.437.695A18.683 18.683 0 0 1 12 22.5c-2.786 0-5.433-.608-7.812-1.7a.75.75 0 0 1-.437-.695Z\" clip-rule=\"evenodd\" />\n </svg>\n {{ .JSON.Int \"players.online\" | formatNumber }}/{{ .JSON.Int \"players.max\" | formatNumber }} players\n </p>\n </li>\n {{ else }}\n <li>\n <p style=\"display:inline-flex;align-items:center;\">\n <svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 24 24\" fill=\"currentColor\" class=\"size-6\" style=\"height:1em;vertical-align:middle;margin-right:0.5em;opacity:0.5;\">\n <path fill-rule=\"evenodd\" d=\"M7.5 6a4.5 4.5 0 1 1 9 0 4.5 4.5 0 0 1-9 0ZM3.751 20.105a8.25 8.25 0 0 1 16.498 0 .75.75 0 0 1-.437.695A18.683 18.683 0 0 1 12 22.5c-2.786 0-5.433-.608-7.812-1.7a.75.75 0 0 1-.437-.695Z\" clip-rule=\"evenodd\" />\n </svg>\n 0 players\n </p>\n </li>\n {{ end }}\n </ul>\n </div>\n</div>";
|
template = "<div style=\"display:flex; align-items:center; gap:12px;\">\n <div style=\"width:40px; height:40px; flex-shrink:0; border-radius:4px; display:flex; justify-content:center; align-items:center; overflow:hidden;\">\n {{ if .JSON.Bool \"online\" }}\n <img src=\"{{ .JSON.String \"icon\" | safeURL }}\" width=\"64\" height=\"64\" style=\"object-fit:contain;\">\n {{ else }}\n <svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 20 20\" fill=\"currentColor\" style=\"width:32px; height:32px; opacity:0.5;\">\n <path fill-rule=\"evenodd\" d=\"M1 5.25A2.25 2.25 0 0 1 3.25 3h13.5A2.25 2.25 0 0 1 19 5.25v9.5A2.25 2.25 0 0 1 16.75 17H3.25A2.25 2.25 0 0 1 1 14.75v-9.5Zm1.5 5.81v3.69c0 .414.336.75.75.75h13.5a.75.75 0 0 0 .75-.75v-2.69l-2.22-2.219a.75.75 0 0 0-1.06 0l-1.91 1.909.47.47a.75.75 0 1 1-1.06 1.06L6.53 8.091a.75.75 0 0 0-1.06 0l-2.97 2.97ZM12 7a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z\" clip-rule=\"evenodd\" />\n </svg>\n {{ end }}\n </div>\n\n <div style=\"flex-grow:1; min-width:0;\">\n <a class=\"size-h4 block text-truncate color-highlight\">\n {{ .JSON.String \"host\" }}\n {{ if .JSON.Bool \"online\" }}\n <span\n style=\"width: 8px; height: 8px; border-radius: 50%; background-color: var(--color-positive); display: inline-block; vertical-align: middle;\"\n data-popover-type=\"text\"\n data-popover-text=\"Online\"\n ></span>\n {{ else }}\n <span\n style=\"width: 8px; height: 8px; border-radius: 50%; background-color: var(--color-negative); display: inline-block; vertical-align: middle;\"\n data-popover-type=\"text\"\n data-popover-text=\"Offline\"\n ></span>\n {{ end }}\n </a>\n\n <ul class=\"list-horizontal-text\">\n <li>\n {{ if .JSON.Bool \"online\" }}\n <span>{{ .JSON.String \"version.name_clean\" }}</span>\n {{ else }}\n <span>Offline</span>\n {{ end }}\n </li>\n {{ if .JSON.Bool \"online\" }}\n <li data-popover-type=\"html\">\n <div data-popover-html>\n {{ range .JSON.Array \"players.list\" }}{{ .String \"name_clean\" }}<br>{{ end }}\n </div>\n <p style=\"display:inline-flex;align-items:center;\">\n <svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 24 24\" fill=\"currentColor\" class=\"size-6\" style=\"height:1em;vertical-align:middle;margin-right:0.5em;\">\n <path fill-rule=\"evenodd\" d=\"M7.5 6a4.5 4.5 0 1 1 9 0 4.5 4.5 0 0 1-9 0ZM3.751 20.105a8.25 8.25 0 0 1 16.498 0 .75.75 0 0 1-.437.695A18.683 18.683 0 0 1 12 22.5c-2.786 0-5.433-.608-7.812-1.7a.75.75 0 0 1-.437-.695Z\" clip-rule=\"evenodd\" />\n </svg>\n {{ .JSON.Int \"players.online\" | formatNumber }}/{{ .JSON.Int \"players.max\" | formatNumber }} players\n </p>\n </li>\n {{ else }}\n <li>\n <p style=\"display:inline-flex;align-items:center;\">\n <svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 24 24\" fill=\"currentColor\" class=\"size-6\" style=\"height:1em;vertical-align:middle;margin-right:0.5em;opacity:0.5;\">\n <path fill-rule=\"evenodd\" d=\"M7.5 6a4.5 4.5 0 1 1 9 0 4.5 4.5 0 0 1-9 0ZM3.751 20.105a8.25 8.25 0 0 1 16.498 0 .75.75 0 0 1-.437.695A18.683 18.683 0 0 1 12 22.5c-2.786 0-5.433-.608-7.812-1.7a.75.75 0 0 1-.437-.695Z\" clip-rule=\"evenodd\" />\n </svg>\n 0 players\n </p>\n </li>\n {{ end }}\n </ul>\n </div>\n</div>";
|
||||||
}
|
}
|
||||||
|
{
|
||||||
|
type = "custom-api";
|
||||||
|
title = "cobblemon";
|
||||||
|
url = "https://api.mcstatus.io/v2/status/java/cobblemon.recoil.pro";
|
||||||
|
cache = "5s";
|
||||||
|
template = "<div style=\"display:flex; align-items:center; gap:12px;\">\n <div style=\"width:40px; height:40px; flex-shrink:0; border-radius:4px; display:flex; justify-content:center; align-items:center; overflow:hidden;\">\n {{ if .JSON.Bool \"online\" }}\n <img src=\"{{ .JSON.String \"icon\" | safeURL }}\" width=\"64\" height=\"64\" style=\"object-fit:contain;\">\n {{ else }}\n <svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 20 20\" fill=\"currentColor\" style=\"width:32px; height:32px; opacity:0.5;\">\n <path fill-rule=\"evenodd\" d=\"M1 5.25A2.25 2.25 0 0 1 3.25 3h13.5A2.25 2.25 0 0 1 19 5.25v9.5A2.25 2.25 0 0 1 16.75 17H3.25A2.25 2.25 0 0 1 1 14.75v-9.5Zm1.5 5.81v3.69c0 .414.336.75.75.75h13.5a.75.75 0 0 0 .75-.75v-2.69l-2.22-2.219a.75.75 0 0 0-1.06 0l-1.91 1.909.47.47a.75.75 0 1 1-1.06 1.06L6.53 8.091a.75.75 0 0 0-1.06 0l-2.97 2.97ZM12 7a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z\" clip-rule=\"evenodd\" />\n </svg>\n {{ end }}\n </div>\n\n <div style=\"flex-grow:1; min-width:0;\">\n <a class=\"size-h4 block text-truncate color-highlight\">\n {{ .JSON.String \"host\" }}\n {{ if .JSON.Bool \"online\" }}\n <span\n style=\"width: 8px; height: 8px; border-radius: 50%; background-color: var(--color-positive); display: inline-block; vertical-align: middle;\"\n data-popover-type=\"text\"\n data-popover-text=\"Online\"\n ></span>\n {{ else }}\n <span\n style=\"width: 8px; height: 8px; border-radius: 50%; background-color: var(--color-negative); display: inline-block; vertical-align: middle;\"\n data-popover-type=\"text\"\n data-popover-text=\"Offline\"\n ></span>\n {{ end }}\n </a>\n\n <ul class=\"list-horizontal-text\">\n <li>\n {{ if .JSON.Bool \"online\" }}\n <span>{{ .JSON.String \"version.name_clean\" }}</span>\n {{ else }}\n <span>Offline</span>\n {{ end }}\n </li>\n {{ if .JSON.Bool \"online\" }}\n <li data-popover-type=\"html\">\n <div data-popover-html>\n {{ range .JSON.Array \"players.list\" }}{{ .String \"name_clean\" }}<br>{{ end }}\n </div>\n <p style=\"display:inline-flex;align-items:center;\">\n <svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 24 24\" fill=\"currentColor\" class=\"size-6\" style=\"height:1em;vertical-align:middle;margin-right:0.5em;\">\n <path fill-rule=\"evenodd\" d=\"M7.5 6a4.5 4.5 0 1 1 9 0 4.5 4.5 0 0 1-9 0ZM3.751 20.105a8.25 8.25 0 0 1 16.498 0 .75.75 0 0 1-.437.695A18.683 18.683 0 0 1 12 22.5c-2.786 0-5.433-.608-7.812-1.7a.75.75 0 0 1-.437-.695Z\" clip-rule=\"evenodd\" />\n </svg>\n {{ .JSON.Int \"players.online\" | formatNumber }}/{{ .JSON.Int \"players.max\" | formatNumber }} players\n </p>\n </li>\n {{ else }}\n <li>\n <p style=\"display:inline-flex;align-items:center;\">\n <svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 24 24\" fill=\"currentColor\" class=\"size-6\" style=\"height:1em;vertical-align:middle;margin-right:0.5em;opacity:0.5;\">\n <path fill-rule=\"evenodd\" d=\"M7.5 6a4.5 4.5 0 1 1 9 0 4.5 4.5 0 0 1-9 0ZM3.751 20.105a8.25 8.25 0 0 1 16.498 0 .75.75 0 0 1-.437.695A18.683 18.683 0 0 1 12 22.5c-2.786 0-5.433-.608-7.812-1.7a.75.75 0 0 1-.437-.695Z\" clip-rule=\"evenodd\" />\n </svg>\n 0 players\n </p>\n </li>\n {{ end }}\n </ul>\n </div>\n</div>";
|
||||||
|
}
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -78,7 +78,7 @@ in {
|
|||||||
|
|
||||||
# --- gameservers ---
|
# --- gameservers ---
|
||||||
echo -e "''${headings}gameservers:''${reset}"
|
echo -e "''${headings}gameservers:''${reset}"
|
||||||
for service in velocity smp superflat bento; do
|
for service in velocity smp superflat bento cobblemon; do
|
||||||
status=$(systemctl is-active $service 2>/dev/null)
|
status=$(systemctl is-active $service 2>/dev/null)
|
||||||
if [ "$status" = "active" ]; then
|
if [ "$status" = "active" ]; then
|
||||||
printf "%-32s%s\n" " ''${active}[$service]''${reset}" "running"
|
printf "%-32s%s\n" " ''${active}[$service]''${reset}" "running"
|
||||||
|
|||||||
@@ -60,13 +60,11 @@ in {
|
|||||||
# enable the ${service} service
|
# enable the ${service} service
|
||||||
services.postfix = {
|
services.postfix = {
|
||||||
enable = true;
|
enable = true;
|
||||||
relayHost = "smtp.gmail.com";
|
settings.main = {
|
||||||
relayPort = cfg.port;
|
relayhost = ["smtp.gmail.com:${toString cfg.port}"];
|
||||||
config = {
|
|
||||||
#smtp_use_tls = "yes";
|
|
||||||
smtp_tls_security_level = "may";
|
smtp_tls_security_level = "may";
|
||||||
smtp_sasl_auth_enable = "yes";
|
smtp_sasl_auth_enable = "yes";
|
||||||
smtp_sasl_security_options = "";
|
smtp_sasl_security_options = "noanonymous";
|
||||||
smtp_sasl_password_maps = "texthash:${config.sops.secrets."postfix_passwd".path}";
|
smtp_sasl_password_maps = "texthash:${config.sops.secrets."postfix_passwd".path}";
|
||||||
# optional: Forward mails to root (e.g. from cron jobs, smartd)
|
# optional: Forward mails to root (e.g. from cron jobs, smartd)
|
||||||
# to me privately and to my work email:
|
# to me privately and to my work email:
|
||||||
|
|||||||
@@ -117,7 +117,7 @@ in
|
|||||||
# add to caddy for reverse proxy
|
# add to caddy for reverse proxy
|
||||||
services.caddy.virtualHosts."${cfg.url}" = {
|
services.caddy.virtualHosts."${cfg.url}" = {
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
tls ${sec."ssl_blakedheld_crt".path} ${sec."ssl_blakedheld_key".path}
|
tls internal
|
||||||
reverse_proxy 127.0.0.1:${toString cfg.port}
|
reverse_proxy 127.0.0.1:${toString cfg.port}
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -4,22 +4,26 @@
|
|||||||
lib,
|
lib,
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
cfg = config.system.tailscale;
|
cfg = config.homelab.tailscale;
|
||||||
authkey_file = config.sops.secrets."tailscale_authkey".path;
|
authkey_file = config.sops.secrets."tailscale_authkey".path;
|
||||||
in {
|
in {
|
||||||
options.system.tailscale = {
|
options.homelab.tailscale = {
|
||||||
enable = lib.mkEnableOption "enables tailscale";
|
enable = lib.mkEnableOption "enables tailscale";
|
||||||
};
|
};
|
||||||
|
|
||||||
config = lib.mkIf cfg.enable {
|
config = lib.mkIf cfg.enable {
|
||||||
services.tailscale = {
|
services.tailscale = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
openFirewall = true;
|
||||||
useRoutingFeatures = "both";
|
useRoutingFeatures = "both";
|
||||||
authKeyFile = authkey_file;
|
authKeyFile = authkey_file;
|
||||||
extraUpFlags = [
|
extraSetFlags = [
|
||||||
|
"--advertise-routes=10.10.0.10/32" # advertise self
|
||||||
"--accept-routes=false" # true is equilivant to useRoutingFeatures = "client" (breaks shit)
|
"--accept-routes=false" # true is equilivant to useRoutingFeatures = "client" (breaks shit)
|
||||||
"--accept-dns=true" # explicitly allow resolved
|
"--accept-dns=true" # explicitly allow resolved
|
||||||
];
|
];
|
||||||
|
extraUpFlags = [
|
||||||
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
# network config
|
# network config
|
||||||
|
|||||||
72
modules/system/cifs_mounts/default.nix
Normal file
@@ -0,0 +1,72 @@
|
|||||||
|
{
|
||||||
|
pkgs,
|
||||||
|
inputs,
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
|
cfg = config.system.cifs_mounts;
|
||||||
|
sec = config.sops.secrets;
|
||||||
|
in {
|
||||||
|
options.system.cifs_mounts = {
|
||||||
|
enable = lib.mkEnableOption "enables mounting holocron fileshare on the client side";
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
config = lib.mkIf cfg.enable {
|
||||||
|
|
||||||
|
environment.systemPackages = with pkgs; [
|
||||||
|
cifs-utils
|
||||||
|
];
|
||||||
|
|
||||||
|
fileSystems."/media/holocron/blake" = {
|
||||||
|
device = "//10.10.0.10/users/blake";
|
||||||
|
fsType = "cifs";
|
||||||
|
options = [
|
||||||
|
"x-systemd.automount"
|
||||||
|
"noauto"
|
||||||
|
"_netdev"
|
||||||
|
"credentials=${sec."holocron_creds".path}"
|
||||||
|
"uid=1000"
|
||||||
|
"gid=1000"
|
||||||
|
"file_mode=0664"
|
||||||
|
"dir_mode=0775"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
fileSystems."/media/holocron/archives" = {
|
||||||
|
device = "//10.10.0.10/archives";
|
||||||
|
fsType = "cifs";
|
||||||
|
options = [
|
||||||
|
"x-systemd.automount"
|
||||||
|
"noauto"
|
||||||
|
"_netdev"
|
||||||
|
"credentials=${sec."holocron_creds".path}"
|
||||||
|
"uid=1000"
|
||||||
|
"gid=1000"
|
||||||
|
"file_mode=0664"
|
||||||
|
"dir_mode=0775"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
fileSystems."/media/holocron/media" = {
|
||||||
|
device = "//10.10.0.10/media";
|
||||||
|
fsType = "cifs";
|
||||||
|
options = [
|
||||||
|
"x-systemd.automount"
|
||||||
|
"noauto"
|
||||||
|
"_netdev"
|
||||||
|
"credentials=${sec."holocron_creds".path}"
|
||||||
|
"uid=1000"
|
||||||
|
"gid=1000"
|
||||||
|
"file_mode=0664"
|
||||||
|
"dir_mode=0775"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
# manage secrets with sops
|
||||||
|
sops.secrets = {
|
||||||
|
"holocron_creds" = {
|
||||||
|
owner = "blake";
|
||||||
|
group = "blake";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -11,18 +11,17 @@
|
|||||||
./podman
|
./podman
|
||||||
./yubikey
|
./yubikey
|
||||||
./tailscale
|
./tailscale
|
||||||
|
./japanese
|
||||||
./vpns
|
./vpns
|
||||||
./vpn-confinement
|
./vpn-confinement
|
||||||
./syncthing
|
./syncthing
|
||||||
./nvidia
|
./graphics
|
||||||
|
./flatpak
|
||||||
|
./secure_boot
|
||||||
|
./cifs_mounts
|
||||||
|
./udiskie
|
||||||
];
|
];
|
||||||
|
|
||||||
system.ssh.enable = lib.mkDefault true;
|
system.ssh.enable = lib.mkDefault true;
|
||||||
system.sops.enable = lib.mkDefault true;
|
system.sops.enable = lib.mkDefault true;
|
||||||
system.docker.enable = lib.mkDefault false;
|
|
||||||
system.tailscale.enable = lib.mkDefault false;
|
|
||||||
system.vpns.enable = lib.mkDefault false;
|
|
||||||
system.vpn-confinement.enable = lib.mkDefault false;
|
|
||||||
system.syncthing.enable = lib.mkDefault false;
|
|
||||||
system.nvidia.enable = lib.mkDefault false;
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,8 +9,11 @@ in
|
|||||||
};
|
};
|
||||||
|
|
||||||
config = lib.mkIf cfg.enable {
|
config = lib.mkIf cfg.enable {
|
||||||
|
|
||||||
virtualisation.docker = {
|
virtualisation.docker = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
daemon.settings.features.cdi = true;
|
||||||
|
rootless.daemon.settings.features.cdi = true;
|
||||||
daemon.settings = {
|
daemon.settings = {
|
||||||
experimental = true;
|
experimental = true;
|
||||||
};
|
};
|
||||||
|
|||||||
19
modules/system/flatpak/default.nix
Normal file
@@ -0,0 +1,19 @@
|
|||||||
|
{
|
||||||
|
pkgs,
|
||||||
|
inputs,
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
|
cfg = config.system.flatpak;
|
||||||
|
in {
|
||||||
|
options.system.flatpak = {
|
||||||
|
enable = lib.mkEnableOption "enables nix-flatpak on nixos side";
|
||||||
|
};
|
||||||
|
|
||||||
|
imports = [inputs.nix-flatpak.nixosModules.nix-flatpak];
|
||||||
|
|
||||||
|
config = lib.mkIf cfg.enable {
|
||||||
|
services.flatpak.enable = true;
|
||||||
|
};
|
||||||
|
}
|
||||||
89
modules/system/graphics/default.nix
Normal file
@@ -0,0 +1,89 @@
|
|||||||
|
{
|
||||||
|
pkgs,
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
|
cfg = config.system.graphics;
|
||||||
|
in {
|
||||||
|
options.system.graphics = {
|
||||||
|
enable = lib.mkEnableOption "enables nvidia";
|
||||||
|
vendor = lib.mkOption {
|
||||||
|
type = lib.types.enum ["intel" "amd" "nvidia"];
|
||||||
|
default = "intel";
|
||||||
|
description = ''
|
||||||
|
set the vendor of your graphics device
|
||||||
|
supported options are "intel" "amd" "nvidia"
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
config = lib.mkIf cfg.enable (lib.mkMerge [
|
||||||
|
{
|
||||||
|
hardware.graphics.enable = true;
|
||||||
|
hardware.graphics.enable32Bit = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
(lib.mkIf (cfg.vendor == "intel") {
|
||||||
|
services.xserver.videoDrivers = ["modesetting"];
|
||||||
|
|
||||||
|
# userspace tools
|
||||||
|
environment.systemPackages = with pkgs; [
|
||||||
|
intel-gpu-tools
|
||||||
|
];
|
||||||
|
|
||||||
|
hardware.graphics.extraPackages = with pkgs; [
|
||||||
|
# Required for modern Intel GPUs (Xe iGPU and ARC)
|
||||||
|
intel-media-driver # VA-API (iHD) userspace
|
||||||
|
vpl-gpu-rt # oneVPL (QSV) runtime
|
||||||
|
|
||||||
|
# Optional (compute / tooling):
|
||||||
|
intel-compute-runtime # OpenCL (NEO) + Level Zero for Arc/Xe
|
||||||
|
];
|
||||||
|
|
||||||
|
environment.sessionVariables = {
|
||||||
|
LIBVA_DRIVER_NAME = "iHD"; # Prefer the modern iHD backend
|
||||||
|
};
|
||||||
|
})
|
||||||
|
|
||||||
|
(lib.mkIf (cfg.vendor == "amd") {
|
||||||
|
boot.initrd.kernelModules = ["amdgpu"];
|
||||||
|
services.xserver.videoDrivers = ["amdgpu"];
|
||||||
|
|
||||||
|
# userspace tools
|
||||||
|
environment.systemPackages = with pkgs; [
|
||||||
|
radeontop
|
||||||
|
];
|
||||||
|
|
||||||
|
# enable amd vulkan (program will choose this or regular)
|
||||||
|
hardware.graphics.extraPackages = with pkgs; [
|
||||||
|
rocmPackages.clr.icd # enable open cl (compute framework like cuda)
|
||||||
|
];
|
||||||
|
# ^ but 32 bit
|
||||||
|
hardware.graphics.extraPackages32 = with pkgs; [
|
||||||
|
];
|
||||||
|
|
||||||
|
# make hip work (extension on cli.icd ^)
|
||||||
|
systemd.tmpfiles.rules = [
|
||||||
|
"L+ /opt/rocm/hip - - - - ${pkgs.rocmPackages.clr}"
|
||||||
|
];
|
||||||
|
})
|
||||||
|
|
||||||
|
(lib.mkIf (cfg.vendor == "nvidia") {
|
||||||
|
boot.kernelModules = ["nvidia" "nvidia_modeset" "nvidia_uvm" "nvidia_drm"];
|
||||||
|
services.xserver.videoDrivers = ["nvidia"];
|
||||||
|
|
||||||
|
# enable nvidia proprietary driver
|
||||||
|
hardware.nvidia = {
|
||||||
|
modesetting.enable = true; # required
|
||||||
|
open = false; # use proprietary driver
|
||||||
|
nvidiaSettings = true; # no shit
|
||||||
|
powerManagement.enable = false; # can cause sleep issues
|
||||||
|
package = config.boot.kernelPackages.nvidiaPackages.stable;
|
||||||
|
};
|
||||||
|
|
||||||
|
# enable docker gpu passthrough
|
||||||
|
hardware.nvidia-container-toolkit.enable = true;
|
||||||
|
})
|
||||||
|
]);
|
||||||
|
}
|
||||||
52
modules/system/japanese/default.nix
Normal file
@@ -0,0 +1,52 @@
|
|||||||
|
{
|
||||||
|
pkgs,
|
||||||
|
inputs,
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
|
cfg = config.system.japanese;
|
||||||
|
in {
|
||||||
|
options.system.japanese = {
|
||||||
|
enable = lib.mkEnableOption "enables japanese tools";
|
||||||
|
};
|
||||||
|
|
||||||
|
config = lib.mkIf cfg.enable {
|
||||||
|
|
||||||
|
# japanese input
|
||||||
|
i18n.inputMethod = {
|
||||||
|
enabled = "fcitx5";
|
||||||
|
|
||||||
|
fcitx5.addons = with pkgs; [
|
||||||
|
fcitx5-mozc
|
||||||
|
fcitx5-gtk
|
||||||
|
fcitx5-qt
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
|
environment.systemPackages = with pkgs; [
|
||||||
|
fcitx5
|
||||||
|
fcitx5-configtool
|
||||||
|
];
|
||||||
|
|
||||||
|
# fonts for japanese
|
||||||
|
fonts = {
|
||||||
|
enableDefaultPackages = true;
|
||||||
|
packages = with pkgs; [
|
||||||
|
noto-fonts
|
||||||
|
noto-fonts-cjk
|
||||||
|
noto-fonts-emoji
|
||||||
|
source-han-sans
|
||||||
|
source-han-serif
|
||||||
|
];
|
||||||
|
|
||||||
|
fontconfig = {
|
||||||
|
defaultFonts = {
|
||||||
|
serif = [ "Noto Serif CJK JP" ];
|
||||||
|
sansSerif = [ "Noto Sans CJK JP" ];
|
||||||
|
monospace = [ "Noto Sans Mono CJK JP" ];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -1,37 +0,0 @@
|
|||||||
{
|
|
||||||
pkgs,
|
|
||||||
config,
|
|
||||||
lib,
|
|
||||||
...
|
|
||||||
}: let
|
|
||||||
cfg = config.system.nvidia;
|
|
||||||
in {
|
|
||||||
options.system.nvidia = {
|
|
||||||
enable = lib.mkEnableOption "enables nvidia";
|
|
||||||
};
|
|
||||||
|
|
||||||
config = lib.mkIf cfg.enable {
|
|
||||||
services.xserver.videoDrivers = ["nvidia"];
|
|
||||||
boot.kernelModules = ["nvidia" "nvidia_modeset" "nvidia_uvm" "nvidia_drm"];
|
|
||||||
# boot.kernelModules = [ "nvidia" ];
|
|
||||||
|
|
||||||
hardware.graphics = {
|
|
||||||
enable = true;
|
|
||||||
enable32Bit = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
# enable nvidia proprietary driver
|
|
||||||
hardware.nvidia = {
|
|
||||||
modesetting.enable = true; # required
|
|
||||||
open = false; # use proprietary driver
|
|
||||||
nvidiaSettings = true; # no shit
|
|
||||||
powerManagement.enable = false; # can cause sleep issues
|
|
||||||
package = config.boot.kernelPackages.nvidiaPackages.stable;
|
|
||||||
};
|
|
||||||
|
|
||||||
# enable docker gpu passthrough
|
|
||||||
hardware.nvidia-container-toolkit.enable = true;
|
|
||||||
virtualisation.docker.daemon.settings.features.cdi = true;
|
|
||||||
virtualisation.docker.rootless.daemon.settings.features.cdi = true;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
43
modules/system/secure_boot/default.nix
Normal file
@@ -0,0 +1,43 @@
|
|||||||
|
{
|
||||||
|
pkgs,
|
||||||
|
inputs,
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
|
cfg = config.system.secure_boot;
|
||||||
|
in {
|
||||||
|
options.system.secure_boot = {
|
||||||
|
enable = lib.mkEnableOption "enables secureboot with lanzaboote";
|
||||||
|
};
|
||||||
|
|
||||||
|
imports = [inputs.lanzaboote.nixosModules.lanzaboote];
|
||||||
|
|
||||||
|
config = lib.mkIf cfg.enable {
|
||||||
|
# install userspace secureboot tools
|
||||||
|
environment.systemPackages = with pkgs; [
|
||||||
|
sbctl
|
||||||
|
e2fsprogs
|
||||||
|
];
|
||||||
|
|
||||||
|
# force disable systemd-boot so lanzaboote can be used
|
||||||
|
boot.loader.systemd-boot.enable = lib.mkForce false;
|
||||||
|
|
||||||
|
/*
|
||||||
|
this uses the project lanzaboote for secureboot (extension on systemd)
|
||||||
|
setup guide can be found here: https://github.com/nix-community/lanzaboote/blob/master/docs/QUICK_START.md
|
||||||
|
tldr:
|
||||||
|
while currently using systemd-boot
|
||||||
|
generate keys with `nix-shell -p --run "sudo sbctl create-keys"`
|
||||||
|
rebuild with this module enabled then check `sudo sbctl verify`
|
||||||
|
reboot and enable secureboot setup mode in bios
|
||||||
|
check that setup mode is enabled with `sudo sbctl status`
|
||||||
|
enroll keys with `sudo sbctl enroll-keys` use the `--microsoft` flag to incude their keys for compatibality
|
||||||
|
reboot (disable secureboot setup mode if not done automatically) then check secure boot status with `sudo bootctl status`
|
||||||
|
*/
|
||||||
|
boot.lanzaboote = {
|
||||||
|
enable = true;
|
||||||
|
pkiBundle = "/var/lib/sbctl";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -13,7 +13,7 @@ in
|
|||||||
services.openssh = {
|
services.openssh = {
|
||||||
enable = true;
|
enable = true;
|
||||||
settings = {
|
settings = {
|
||||||
PasswordAuthentication = true;
|
PasswordAuthentication = false;
|
||||||
PermitRootLogin = "no";
|
PermitRootLogin = "no";
|
||||||
X11Forwarding = false;
|
X11Forwarding = false;
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -34,13 +34,15 @@ in {
|
|||||||
"snowbelle" = {id = "6WQ6ATA-5AT4RUM-NW67PAL-N62CPNV-ALRFG3P-5BDRO22-HWFC2Q4-5S5BDA5";};
|
"snowbelle" = {id = "6WQ6ATA-5AT4RUM-NW67PAL-N62CPNV-ALRFG3P-5BDRO22-HWFC2Q4-5S5BDA5";};
|
||||||
"lugia" = {id = "BKKSFPH-YEOVVAB-DTT7KK3-UDKAEJ2-PC6ECG7-Y76ZIVP-JRYMMXS-RTZYVQ3";};
|
"lugia" = {id = "BKKSFPH-YEOVVAB-DTT7KK3-UDKAEJ2-PC6ECG7-Y76ZIVP-JRYMMXS-RTZYVQ3";};
|
||||||
"zygarde" = {id = "UYLTF52-VVKUR7F-JN33HQZ-RFNWGL3-JER52LA-GZD2LPJ-QIFEE7K-MNMZRQ5";};
|
"zygarde" = {id = "UYLTF52-VVKUR7F-JN33HQZ-RFNWGL3-JER52LA-GZD2LPJ-QIFEE7K-MNMZRQ5";};
|
||||||
|
"mew" = {id = "7ZC2NAS-QONQKAL-Z54NPMB-7TRXM6M-K7Z6PZD-FG4AI4H-V7SMFJN-JOYBHQO";};
|
||||||
"yveltal" = {id = "ZVSQ4WJ-7OICYOZ-3ECES4X-KH37IPB-TKHKUJG-BSEGXVM-AHYY5C3-VKG44AX";};
|
"yveltal" = {id = "ZVSQ4WJ-7OICYOZ-3ECES4X-KH37IPB-TKHKUJG-BSEGXVM-AHYY5C3-VKG44AX";};
|
||||||
"CEN-IT-07" = {id = "DPYKA4Z-3PX7JB2-FBEOXXX-SC7TLT2-QC5P2IR-SXOPJGX-QO3DMII-5B7UCA4";};
|
"CEN-IT-07" = {id = "DPYKA4Z-3PX7JB2-FBEOXXX-SC7TLT2-QC5P2IR-SXOPJGX-QO3DMII-5B7UCA4";};
|
||||||
|
"CEN-IT-00007" = {id = "XBPXGYU-DUJSLDH-6BDNF4D-CO2COC3-N3FM6W5-IHZOJBM-Z2N77RI-IVAV5AH";};
|
||||||
};
|
};
|
||||||
folders = {
|
folders = {
|
||||||
"holocron" = {
|
"holocron" = {
|
||||||
path = "/home/blake/holocron";
|
path = "/home/blake/holocron";
|
||||||
devices = ["lugia" "zygarde" "CEN-IT-07" "snowbelle"];
|
devices = ["lugia" "zygarde" "mew" "yveltal" "CEN-IT-07" "CEN-IT-00007" "snowbelle"];
|
||||||
id = "5voxg-c3he2";
|
id = "5voxg-c3he2";
|
||||||
versioning = {
|
versioning = {
|
||||||
type = "staggered";
|
type = "staggered";
|
||||||
|
|||||||
@@ -16,11 +16,14 @@ in {
|
|||||||
enable = true;
|
enable = true;
|
||||||
useRoutingFeatures = "both";
|
useRoutingFeatures = "both";
|
||||||
#authKeyFile = authkey_file;
|
#authKeyFile = authkey_file;
|
||||||
extraUpFlags = [
|
extraSetFlags = [
|
||||||
"--accept-routes=true" # true is equilivant to useRoutingFeatures = "client" (breaks shit)
|
"--accept-routes=true" # true is equilivant to useRoutingFeatures = "client" (breaks shit)
|
||||||
"--accept-dns=true" # explicitly allow resolved
|
"--accept-dns=true" # explicitly allow resolved
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
systemd.services.tailscaled = {
|
||||||
|
after = [ "remote-fs.target" ]; # keep tailscale up until remote mounts are unmounted
|
||||||
|
};
|
||||||
|
|
||||||
# network config
|
# network config
|
||||||
networking.firewall.trustedInterfaces = ["tailscale0"];
|
networking.firewall.trustedInterfaces = ["tailscale0"];
|
||||||
|
|||||||
16
modules/system/udiskie/default.nix
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
{
|
||||||
|
pkgs,
|
||||||
|
lib,
|
||||||
|
config,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
|
cfg = config.system.udiskie;
|
||||||
|
in {
|
||||||
|
options.system.udiskie = {
|
||||||
|
enable = lib.mkEnableOption "enable udiskie for automount on nixos side";
|
||||||
|
};
|
||||||
|
|
||||||
|
config = lib.mkIf cfg.enable {
|
||||||
|
services.udisks2.enable = true;
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -5,7 +5,7 @@
|
|||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
/*
|
/*
|
||||||
# to enroll a yubikey (works like .ssh/known_hosts)
|
# to enroll a yubikey with pam (works like .ssh/known_hosts)
|
||||||
nix-shell -p pam_u2f
|
nix-shell -p pam_u2f
|
||||||
mkdir -p ~/.config/Yubico
|
mkdir -p ~/.config/Yubico
|
||||||
pamu2fcfg > ~/.config/Yubico/u2f_keys
|
pamu2fcfg > ~/.config/Yubico/u2f_keys
|
||||||
@@ -15,6 +15,9 @@ pamu2fcfg -n >> ~/.config/Yubico/u2f_keys (to add additional yubikeys)
|
|||||||
nix-shell -p pamtester
|
nix-shell -p pamtester
|
||||||
pamtester login <username> authenticate
|
pamtester login <username> authenticate
|
||||||
pamtester sudo <username> authenticate
|
pamtester sudo <username> authenticate
|
||||||
|
|
||||||
|
# to enroll yubikey with luks
|
||||||
|
`sudo systemd-cryptenroll --fido2-device=auto /dev/<disk>`
|
||||||
*/
|
*/
|
||||||
let
|
let
|
||||||
service = "yubikey";
|
service = "yubikey";
|
||||||
@@ -43,9 +46,18 @@ in {
|
|||||||
yubikey-manager
|
yubikey-manager
|
||||||
];
|
];
|
||||||
|
|
||||||
|
# enable smartcard
|
||||||
|
services.pcscd.enable = true;
|
||||||
|
|
||||||
|
# enables it for everything
|
||||||
|
security.pam.u2f = lib.mkIf (cfg.mode == "u2f") {
|
||||||
|
enable = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
# selectivlt edit what u2f is enabled for
|
||||||
security.pam.services = lib.mkIf (cfg.mode == "u2f") {
|
security.pam.services = lib.mkIf (cfg.mode == "u2f") {
|
||||||
login.u2fAuth = true;
|
#login.u2fAuth = true;
|
||||||
sudo.u2fAuth = true;
|
#sudo.u2fAuth = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
security.pam.yubico = lib.mkIf (cfg.mode == "challenge-response") {
|
security.pam.yubico = lib.mkIf (cfg.mode == "challenge-response") {
|
||||||
|
|||||||
@@ -6,6 +6,8 @@ klefki_auth_map: ENC[AES256_GCM,data:u8OBLtT/,iv:THW21BDyhyFIjcwixsAnaAODofxbuQZ
|
|||||||
tailscale_authkey: ENC[AES256_GCM,data:SU0k3asrJd+WZ86VbC4w8TDJp+MqsbyagrzCfDcgTzO5yvBjpWAKbJ7A+VxgQvdu4+S2jMYbdrONPp3YbQ==,iv:VMYmGVk5GpUQApKKQYhdOw/cYCXrXxEZJJwHfQL4MjQ=,tag:7ruaoCDxuFQ7tE/JLJ37Xw==,type:str]
|
tailscale_authkey: ENC[AES256_GCM,data:SU0k3asrJd+WZ86VbC4w8TDJp+MqsbyagrzCfDcgTzO5yvBjpWAKbJ7A+VxgQvdu4+S2jMYbdrONPp3YbQ==,iv:VMYmGVk5GpUQApKKQYhdOw/cYCXrXxEZJJwHfQL4MjQ=,tag:7ruaoCDxuFQ7tE/JLJ37Xw==,type:str]
|
||||||
#ENC[AES256_GCM,data:bEbCic+ZDAA5ieNedCbiVbJrse17,iv:UwRYlis6NPB/RUcv+YnPxrGdbIcF4hrNiZt19YvWZNQ=,tag:m6PVlzPNnahX7X7KzMUj7A==,type:comment]
|
#ENC[AES256_GCM,data:bEbCic+ZDAA5ieNedCbiVbJrse17,iv:UwRYlis6NPB/RUcv+YnPxrGdbIcF4hrNiZt19YvWZNQ=,tag:m6PVlzPNnahX7X7KzMUj7A==,type:comment]
|
||||||
borg_passwd: ENC[AES256_GCM,data:XOMJtr+DRs7xn5Iclc49iTzK9cFJyc/fSXJjhdKa9jdN,iv:YB8z7zNYjh6NpSxQb1TfPxAYUdzThdVfNZIe6tO5grA=,tag:bO6kZ3cLJDL4IQoWmGvRdg==,type:str]
|
borg_passwd: ENC[AES256_GCM,data:XOMJtr+DRs7xn5Iclc49iTzK9cFJyc/fSXJjhdKa9jdN,iv:YB8z7zNYjh6NpSxQb1TfPxAYUdzThdVfNZIe6tO5grA=,tag:bO6kZ3cLJDL4IQoWmGvRdg==,type:str]
|
||||||
|
#ENC[AES256_GCM,data:ztRwuY0mTMDmwV5HqVR7Dmc+dCWcrVRtWZGEL1abE/WUcA==,iv:mmaWfHRiENJUGNhyUBFo1z7PdzVPH1OUZrVhkce6KV0=,tag:GKEvT0qkzTtimQXDueKPdw==,type:comment]
|
||||||
|
holocron_creds: ENC[AES256_GCM,data:2QXtXrN5w0UFn70GZOsYFPdtPwjLcuUdtkEam5aZ83N6LEDqPWJi,iv:kUS9pq5CX19vqHumc6QjY+Xpd4N+Ge7oCcQYtMFh+WM=,tag:IUA1ZVThF91EdHrwmS624g==,type:str]
|
||||||
#ENC[AES256_GCM,data:VdbMrwGKUKNJHw==,iv:OLwBh6KQXR/H8eRgp/hH8k3QfIkK/ydL735kx/dpc8E=,tag:N+v+ym6RMbvW4IckbiLK8Q==,type:comment]
|
#ENC[AES256_GCM,data:VdbMrwGKUKNJHw==,iv:OLwBh6KQXR/H8eRgp/hH8k3QfIkK/ydL735kx/dpc8E=,tag:N+v+ym6RMbvW4IckbiLK8Q==,type:comment]
|
||||||
syncthing:
|
syncthing:
|
||||||
gui_passwd: ENC[AES256_GCM,data:CicGIe5dT8lJVchCcE4wg3E8va3RYR8d53MISkE=,iv:8ziDDyQvU8ABaKKwYlcHmvm8Qybk4G+q5F0Ghqluu9w=,tag:YlyNPE04KD3detL1QUTrgQ==,type:str]
|
gui_passwd: ENC[AES256_GCM,data:CicGIe5dT8lJVchCcE4wg3E8va3RYR8d53MISkE=,iv:8ziDDyQvU8ABaKKwYlcHmvm8Qybk4G+q5F0Ghqluu9w=,tag:YlyNPE04KD3detL1QUTrgQ==,type:str]
|
||||||
@@ -15,6 +17,9 @@ syncthing:
|
|||||||
yveltal:
|
yveltal:
|
||||||
key: ENC[AES256_GCM,data:unUnEeDhCqHUZCJtGCbj5rmrLx+9GiUTl75K3HdkI94YfCLNYCBACYu2v/7FbNIEsjVoQEA5/gKEcUHzVq6LaHM2w9GSo6tjkegdzTUgbHBJf4ssJ38z5rQkMc7tbzsA0NUHBPklz1eyjkW96HQPD0REcwA3CIc=,iv:PZ7vfhIpwPpMz4P04bewNhRuahmpukasgYb8fL/EJBE=,tag:G1HDyPAVSdm/fwqTXTT3PQ==,type:str]
|
key: ENC[AES256_GCM,data:unUnEeDhCqHUZCJtGCbj5rmrLx+9GiUTl75K3HdkI94YfCLNYCBACYu2v/7FbNIEsjVoQEA5/gKEcUHzVq6LaHM2w9GSo6tjkegdzTUgbHBJf4ssJ38z5rQkMc7tbzsA0NUHBPklz1eyjkW96HQPD0REcwA3CIc=,iv:PZ7vfhIpwPpMz4P04bewNhRuahmpukasgYb8fL/EJBE=,tag:G1HDyPAVSdm/fwqTXTT3PQ==,type:str]
|
||||||
cert: ENC[AES256_GCM,data:yLq2dNjdMiRj4reyZWsSqZ+1rw4DTwKBZoQHzeKb8YBn63ub4TZPlnOjSTt2DwOQwrJDNhsaeGscZ6J7rLxF/rtH6YnR8XxQuOu/NNIcZ4m9EqhsXyznSx4Q+0gamUXujRgGRVH5FNrfiFoqP3VuNghoX+NLxfX0BcVruEjbmLUWVVzY0yS0ufzxegM8WFAxuKhcr1NlhBU65TxKUtbj4vcByzWHkfLGIb5ICnGeF/p9/FvpFSavw3nLdybDLJ6EKEeaxy6t984fkuotAvk54kLbF4yt0q5mjDxy0U6xtn1hg3x03IRAPjKDRdpDmzYf4XxykEb74JX9q2zjUhb2l1ORWcZu/uKvEiuZWDJRmJ4ypOiyZOCqTvY6s2iDhEjmMKxlNr2mhuz9Hn6b3KoQjePIEd1eS/VEmo09pEuUlhlAEziVcdnpeRyWlN2xpv4ps90gLxJ1Mj9nAZwRqFOQl0V4N5OBHEqMBE1nQv4afMpGX5QF2UotTpNfka+LdKwc1iHHtpHZYmG1/LVwz3jDv4XnVLdDWojFA/8eJIWVq1BsUTYSy+Q27bsoTX4iL0Y/OAHRzXZTqYc4aiAWJoaNTNgmagZ9C03SA6qePlGe/5azI3f54rC2m1/JDUtYW3IABHSFUaVnTdWnD4GDNSYRJIknyUwXR4sE3pRD979prmgtepOyETOAVgEeUVKz1leJZ2HyyhjFU41TL0IN/sl+YPD9bC3Nmw7OsxMFGPC4l5vn64DVp7HHRSKyJvZ5fG8s4nSzyZAKomkocOpKHEuQPyyerZpL1lne/m2B/y7/W2ouAGxcawZOSU6f74mn5wM=,iv:Ggag5SNUFkhMWS0u1kwkD5tGjiMv4i041bCESl5XOdc=,tag:pPISz0eBWzHcPHsC8dVG3g==,type:str]
|
cert: ENC[AES256_GCM,data:yLq2dNjdMiRj4reyZWsSqZ+1rw4DTwKBZoQHzeKb8YBn63ub4TZPlnOjSTt2DwOQwrJDNhsaeGscZ6J7rLxF/rtH6YnR8XxQuOu/NNIcZ4m9EqhsXyznSx4Q+0gamUXujRgGRVH5FNrfiFoqP3VuNghoX+NLxfX0BcVruEjbmLUWVVzY0yS0ufzxegM8WFAxuKhcr1NlhBU65TxKUtbj4vcByzWHkfLGIb5ICnGeF/p9/FvpFSavw3nLdybDLJ6EKEeaxy6t984fkuotAvk54kLbF4yt0q5mjDxy0U6xtn1hg3x03IRAPjKDRdpDmzYf4XxykEb74JX9q2zjUhb2l1ORWcZu/uKvEiuZWDJRmJ4ypOiyZOCqTvY6s2iDhEjmMKxlNr2mhuz9Hn6b3KoQjePIEd1eS/VEmo09pEuUlhlAEziVcdnpeRyWlN2xpv4ps90gLxJ1Mj9nAZwRqFOQl0V4N5OBHEqMBE1nQv4afMpGX5QF2UotTpNfka+LdKwc1iHHtpHZYmG1/LVwz3jDv4XnVLdDWojFA/8eJIWVq1BsUTYSy+Q27bsoTX4iL0Y/OAHRzXZTqYc4aiAWJoaNTNgmagZ9C03SA6qePlGe/5azI3f54rC2m1/JDUtYW3IABHSFUaVnTdWnD4GDNSYRJIknyUwXR4sE3pRD979prmgtepOyETOAVgEeUVKz1leJZ2HyyhjFU41TL0IN/sl+YPD9bC3Nmw7OsxMFGPC4l5vn64DVp7HHRSKyJvZ5fG8s4nSzyZAKomkocOpKHEuQPyyerZpL1lne/m2B/y7/W2ouAGxcawZOSU6f74mn5wM=,iv:Ggag5SNUFkhMWS0u1kwkD5tGjiMv4i041bCESl5XOdc=,tag:pPISz0eBWzHcPHsC8dVG3g==,type:str]
|
||||||
|
mew:
|
||||||
|
key: ENC[AES256_GCM,data:8i2thp667lKEXR0cIaEOLHPXWlhFS38FvbtHgni3i0dTBx9DYtJbGogNaWMlA8r2HzBHkG3Jg0nJs7IOrJWugnGLNLbvhdsxBswEndOBaed4vq+SSN6ssxdjjyFd38wlIZNZsytjPFhyRgDLJ+0rftcIQXPjBhU=,iv:IZ3zWD/ZpalOzSAJQubo/y4LcEzHMEcl+C4GB3Q/nac=,tag:IKEwIkuvHE6qrUoCEqI2Ug==,type:str]
|
||||||
|
cert: ENC[AES256_GCM,data:uvNZYmQnexXTr/Sz7vLQIJK93MmsoiJfCAL8/rLVQH0D+1nVaM472lqR5pP0qhLKuYhFUESxhAotVtqLpOWK1MfAxuk2RHv8mvbtIJkheRmsIWw7dAAABIkmgnelI03P2Tk2129I95vMM1lybu4W6m9VslwJF8X/4rCxshdbuz9mcjwxBpUEDr1V76DO3bgQUuPwizx17ON8gNd+NtRqPPaXlGrfLCFv1Fib3YFd7+WRkERki9ZO7Q0quY75G4Jseb28QaiM2BT7jfECJo4x7rMePMV303sIrF9paaUKTuSiCUsamLsi5Hwr907y2lHB9Gocwio7tnSRSRhHHcWLI8dQktzW7Flqs8+MZGZ1oJBQO7kQDefF1q4mddADimoqD9F1NsOiOmqqZRRB37alLGmRjeYBIlA6q/FgN9BAj9h0cG3oN1MUXPRGzDfggg5TLjBM2FbG/N3xgncZ2AzTPOcLtrtc0I2PYk3FFxgzpHWnjS2t7CQo/JxqdXbdy9nTHIqbrnKIQ/FtS7/p+cgQcU815UMsJm3qP+hPLCyNuziYq3Vt/X7C3eTnrqemXjEeJ/SJxb+Oul5GS1OL14dNsJllFNuj33Zep/hyQvHnf/HW7kXAfDqIP9zn85EFriAZEuaKwbHB2pkvbWKFxrpXJFhjnPFDKxGOjAmsLmil4paFKdt5hK7rp0mmoIMN+mMFbYx333llik0qk27yYTQwOR3eeCGqHODUU+izUT8NuQBezyxsEmEYu/YBcpatcYylwKgIFcC058oltsxlbxRg5Rrdk5FOqj7Uui0qwFXvYesz6Tiq/rGmcOPlcE5xw14=,iv:LePpzWGDTV1ONwt1uHUptMW1dO1SwwUKrtCEerc/DEc=,tag:a5B/7hmIxvLXU90Stcq7zA==,type:str]
|
||||||
#ENC[AES256_GCM,data:A0ITyGOGMIoyVOcn5JOi1RAtqUM=,iv:+wWpmFbeLiX/Ae53pj0QmnYY3MEzOMib4cqbePUKtGI=,tag:JHXvrN4bOH+oD3Q70pUuew==,type:comment]
|
#ENC[AES256_GCM,data:A0ITyGOGMIoyVOcn5JOi1RAtqUM=,iv:+wWpmFbeLiX/Ae53pj0QmnYY3MEzOMib4cqbePUKtGI=,tag:JHXvrN4bOH+oD3Q70pUuew==,type:comment]
|
||||||
pia_auth: ENC[AES256_GCM,data:rwAu4f5XVS4v4FCLj2zXAegIZeRPLIzUVv6TCrdfg9RGSDJYHgVAX0aFXCBQsDQju9RDycXmc9Id8IuyYN8=,iv:kEA4ADQyUI+zlQoZOKi81dw5BLE1oesqhVf6bfiLgB4=,tag:VHT2uPNW27F3KRM7ZhWdCw==,type:str]
|
pia_auth: ENC[AES256_GCM,data:rwAu4f5XVS4v4FCLj2zXAegIZeRPLIzUVv6TCrdfg9RGSDJYHgVAX0aFXCBQsDQju9RDycXmc9Id8IuyYN8=,iv:kEA4ADQyUI+zlQoZOKi81dw5BLE1oesqhVf6bfiLgB4=,tag:VHT2uPNW27F3KRM7ZhWdCw==,type:str]
|
||||||
#ENC[AES256_GCM,data:mbIgMJBhL8nWJzl8q2dFL8XtO1Xa1Q==,iv:caYHYp1boK9wRgCcQe40HTWT/HxAIvYe+HyaruI53Vc=,tag:S6wowhAHObEcs7z8FimZ1g==,type:comment]
|
#ENC[AES256_GCM,data:mbIgMJBhL8nWJzl8q2dFL8XtO1Xa1Q==,iv:caYHYp1boK9wRgCcQe40HTWT/HxAIvYe+HyaruI53Vc=,tag:S6wowhAHObEcs7z8FimZ1g==,type:comment]
|
||||||
@@ -30,6 +35,7 @@ minecraft_recpro_db_passwd: ENC[AES256_GCM,data:dPAkdEX0hBigo/lND2r3ShxnS4Jc5wTI
|
|||||||
mosquitto_hashed_passwd: ENC[AES256_GCM,data:k1Lnr8ZTDpzXMoRmRH61X41boX/D8Rm1KPh7x3/IHFo+XKIOUQns53iA+7e7Ohp8uWSthDlOk4SlRvTXdUNiEz7Zmw9LYwy7BHbwpNo2pFApAye1ORPrMrhMUkUfgBgc8oqPPyRXmmrOAFp6GBbRhg==,iv:D8wQL9iF0rqOte5X24kDTVjYUJXbZSLz0Ykbp0HqmYo=,tag:RUCgO1uKPIdumSo563cg1Q==,type:str]
|
mosquitto_hashed_passwd: ENC[AES256_GCM,data:k1Lnr8ZTDpzXMoRmRH61X41boX/D8Rm1KPh7x3/IHFo+XKIOUQns53iA+7e7Ohp8uWSthDlOk4SlRvTXdUNiEz7Zmw9LYwy7BHbwpNo2pFApAye1ORPrMrhMUkUfgBgc8oqPPyRXmmrOAFp6GBbRhg==,iv:D8wQL9iF0rqOte5X24kDTVjYUJXbZSLz0Ykbp0HqmYo=,tag:RUCgO1uKPIdumSo563cg1Q==,type:str]
|
||||||
mosquitto_passwd.yaml: ENC[AES256_GCM,data:9xwHiUaQ6zG/4rkRemXtbRJ/KEV4yajqyYlcXRR1eAQ2XijYOzitPjt53h3FPqp5rxl6dJerXNH5CiZZK3t1l339NxNseJFGVmIHitWJxNmGJMlG3M8r8Q==,iv:C6WWZuVkYaasB2pol3uf4Mc3d/lDEgt2pKX+dHl/Cr4=,tag:jYTC6RKF2TzDSwSUh6D8zQ==,type:str]
|
mosquitto_passwd.yaml: ENC[AES256_GCM,data:9xwHiUaQ6zG/4rkRemXtbRJ/KEV4yajqyYlcXRR1eAQ2XijYOzitPjt53h3FPqp5rxl6dJerXNH5CiZZK3t1l339NxNseJFGVmIHitWJxNmGJMlG3M8r8Q==,iv:C6WWZuVkYaasB2pol3uf4Mc3d/lDEgt2pKX+dHl/Cr4=,tag:jYTC6RKF2TzDSwSUh6D8zQ==,type:str]
|
||||||
#ENC[AES256_GCM,data:zmSByl0De3a39qLbS99oce7ORe2BBoPa+3I05/YYxL7iBeWCP3ZK,iv:6nUTBUFpNK7Mttckqu6Wk/QJ5cP4+iL+EH4ldaIuu9s=,tag:pc5UtjbNPsVOEMCdLKgGMA==,type:comment]
|
#ENC[AES256_GCM,data:zmSByl0De3a39qLbS99oce7ORe2BBoPa+3I05/YYxL7iBeWCP3ZK,iv:6nUTBUFpNK7Mttckqu6Wk/QJ5cP4+iL+EH4ldaIuu9s=,tag:pc5UtjbNPsVOEMCdLKgGMA==,type:comment]
|
||||||
|
#ENC[AES256_GCM,data:ZWlAWAthigdTlfHrQl1x8eSj+gv4Gj1poZfPViu1mVz/ZmUJFZyCSkdIg0CPdNNF38TE0iabBk+o7aHkFmIFz18hjVYAk4M2E034qg==,iv:jU+2E+XAILgFNyMkGZ1CMJ83q7V/yyEJwHXWw05RlHo=,tag:n8w0/ktmum5P31vMWJVxgA==,type:comment]
|
||||||
postfix_passwd: ENC[AES256_GCM,data:3ndIsTGPyAQELM8lptBK241a3p77fNijXma4souFKnyrkLBpZ4OP6KWuldFlWySpSG7Yme0by5gOzg==,iv:nYuJKeY4H3OfQleLo7gvheT5JHgXW3hGQvjHeEEN260=,tag:q952E/0QLC49O5Rwua0RWQ==,type:str]
|
postfix_passwd: ENC[AES256_GCM,data:3ndIsTGPyAQELM8lptBK241a3p77fNijXma4souFKnyrkLBpZ4OP6KWuldFlWySpSG7Yme0by5gOzg==,iv:nYuJKeY4H3OfQleLo7gvheT5JHgXW3hGQvjHeEEN260=,tag:q952E/0QLC49O5Rwua0RWQ==,type:str]
|
||||||
#ENC[AES256_GCM,data:UcpnHZj5xr8P64PzhWVKbFy8pvFM9GCz2mDoW/6iRVqgLTL0FSn6KXep/kfLEnYiqv5ZpsVZjjXsbI5VRJfBo7w4kzX661oDU8323DfQHDkbo2g=,iv:nEApgutl5kjfZkwi9WTOwatraM3+TQqFgk5gEMw0rwA=,tag:Q4gndL+6q7jHN02QCpJDjw==,type:comment]
|
#ENC[AES256_GCM,data:UcpnHZj5xr8P64PzhWVKbFy8pvFM9GCz2mDoW/6iRVqgLTL0FSn6KXep/kfLEnYiqv5ZpsVZjjXsbI5VRJfBo7w4kzX661oDU8323DfQHDkbo2g=,iv:nEApgutl5kjfZkwi9WTOwatraM3+TQqFgk5gEMw0rwA=,tag:Q4gndL+6q7jHN02QCpJDjw==,type:comment]
|
||||||
#ENC[AES256_GCM,data:3oMbbBSrbjrqsdiON1ENB8JeKW0=,iv:+/eL/51OA+VHbkWWSNzQId5BlxnMm+5NBA0uKw010Tk=,tag:vBJpCYmvFivBYIKatDWgHw==,type:comment]
|
#ENC[AES256_GCM,data:3oMbbBSrbjrqsdiON1ENB8JeKW0=,iv:+/eL/51OA+VHbkWWSNzQId5BlxnMm+5NBA0uKw010Tk=,tag:vBJpCYmvFivBYIKatDWgHw==,type:comment]
|
||||||
@@ -43,9 +49,12 @@ id_snowbelle: ENC[AES256_GCM,data:MAw5R2fqVIctN7fB/d3hfCU7W3sxvuy2O3w3n0vD8FxK1D
|
|||||||
#ENC[AES256_GCM,data:ozhgyE+IyqR10KT8vI9x,iv:+ZOTucRlCZRQ9ZbxZgySPMOJ/qU4gXbhSyLAMgt4QMs=,tag:mQ3X+dqCet1Yk1gZ5pZ5gw==,type:comment]
|
#ENC[AES256_GCM,data:ozhgyE+IyqR10KT8vI9x,iv:+ZOTucRlCZRQ9ZbxZgySPMOJ/qU4gXbhSyLAMgt4QMs=,tag:mQ3X+dqCet1Yk1gZ5pZ5gw==,type:comment]
|
||||||
id_snowbelle.pub: ENC[AES256_GCM,data:rQ32bqwknbVssJDN4TW72YrusMPQJRFTfpoH2M2ELsAf3DkXtchGwOSjEbeR9ezUgHkTD96rFm5JvjDFQukAOpBHfMP5aRVy6RjTtb8j7aAD+EGUEpBSAVspZKQAWAqyDQ==,iv:8bEgvJgWpu7QwsrWhkjUw3GtRI92Pn7TT0rXCQ/i2Js=,tag:EnUehKMncN5v4dZZ/es3Qw==,type:str]
|
id_snowbelle.pub: ENC[AES256_GCM,data:rQ32bqwknbVssJDN4TW72YrusMPQJRFTfpoH2M2ELsAf3DkXtchGwOSjEbeR9ezUgHkTD96rFm5JvjDFQukAOpBHfMP5aRVy6RjTtb8j7aAD+EGUEpBSAVspZKQAWAqyDQ==,iv:8bEgvJgWpu7QwsrWhkjUw3GtRI92Pn7TT0rXCQ/i2Js=,tag:EnUehKMncN5v4dZZ/es3Qw==,type:str]
|
||||||
#ENC[AES256_GCM,data:lS++LQwlDVP0aYcdaaudBkKxNB3P3UBE,iv:UqGcXcX/Jvf60o409Cxj7VJCDh63uUxy45PuZbHK2l8=,tag:OXdMwuJwdN8DQaLXACpcRA==,type:comment]
|
#ENC[AES256_GCM,data:lS++LQwlDVP0aYcdaaudBkKxNB3P3UBE,iv:UqGcXcX/Jvf60o409Cxj7VJCDh63uUxy45PuZbHK2l8=,tag:OXdMwuJwdN8DQaLXACpcRA==,type:comment]
|
||||||
ssl_blakedheld_crt: ENC[AES256_GCM,data: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,iv:VQIqXN3r7DOVREX4fP5/OR8xECXLjYKfhd6XP3ghMaY=,tag:eVdyxrw/w5zBGxV6Tai2Pg==,type:str]
|
ssl_blakedheld_crt: ENC[AES256_GCM,data:OPrDCh56XdRLslAcx/vw9l7gvc42no+QzB9tVSLHtcHbWWqb+hefvAE6xnfMLlt5+BRuAJRvspA6kx/WfagjFuN7q3HAHPt/FcfZPCYZNT5wXZH59wtV8JkVtLKnCxqSUXrah9a/WrHkU7njzoWql53eoAXEt58mvxyxZihqZd/uwinZt/T4QsevmikIsB3LB7AQtUHfsHd13ZFAaGiA+Mnncdl6Nt5s3U4yTuUxhfmYwr2cuyL+Li5eNzdO2ZooXBySdp4Ym03rpBERuh0U8a7NNj5ZaoHW1f0AyFRRKQ7RIHHyhQNC6hL2eGqsv+hTkJCJKxOCYKW1cF9rDt6bueKAm7zk3RTw0Sk7eXaOoqulCf8vBcMf4ckfH5mFVUpSHuwc4lfIZExjggn2i7Bu7xGIOLqC1RL4S5cuhLGUxzgvCiKMcMmaZZcT+fZa5wiHzv2vaCzXuYRb1rNi0xoiAZcL65yIV0NGtP0mOFygdY2hI4R7itbcE0MGIbwdOuWkCRs19WVFchNgcV7GnZBUVKAbhFXq+GilWLufODJr4Zxc1NpxRjG4flWQl3A3jGc4+tW5Infa1n6XPmhHz6JjyPE2mVbLq4JORPHeMcN4Wbckrmio0ruJu5rV9J95HYceXJIF2dw7AgmaWEX67JCHJPbAg5n4zRrfraeMwKB7XHTMglTLbyQsw7zkqzGDpT6ztOn/uCtErEmU0LSlIcOzz8WdGnnWbReMLiUfrQwuKvJhwOpcr9t+FVAtDyjyZhL/PTDy4/qIjQNPwBiVMKzv1CV/eA1WHcYKb6oRvP2TAlh82mA5uIE1jqY9QXg1cfMl2ncnsHnv3d1iFHy3OxvmWwvve+1zzJ2jubh+1ZwKAjP/9UEq9eldyFqC86qYKYGXec5j4Q4QGrMN4AiObVI/yDnRdeWal8jM8p5cz56rgBesDX7/ljR5wjifdQ5s4Iao2exPrHAWtiJHWE1i4R1g4rB+h8piu4feZXiPh3chdxrUrxCaQK0N0nOkN6+F7y8rbd6egk9Q5xvjNlJGzJGiSQ9xhDYmnPZtUTWXL3KioIPwy2/yh+lpkG/JrUacgc+HaHO+DsXs2NhlObrcswo4zmZ1eEckwFSpl1iP5ABHTxNVY0V6pdj1+7YyB+wav8tlVfguyxLf8JV7dqVnADCV+R5D5rBikmoJdjgdZwNxO0QBaZFVLeaCSgoCVEfvSPFtL9cMnEhLhdtw+k3U53+JJYemRfdh48DAM01Na2b9q6Ey2R6YrqtONVIauMNAaKXOeaJCxJhYVBqB8yNiAOOhyJ/Wvzq/CUM1QsXHQvwbndAxmyeFc8XSo7HZZME9m11fNvcEdWfdm63BpwkrHKPzQc7sR6tKeMy7l48f1baPTNoevEd0vFeURHoOggrnyBeO4q8YdLCderFmsSOzyDP+KjDxwTE6u+4P2xMXfnjwTpxLZInV+sNPsgaMj/bBeOJr7m6IN8N3/jxgPiBTGMObiVCIzhXL/VP352xc7Vbh5ZjMvuXQIPWCodPjWV6kcK8EvanN/l0vbDh1MxMAFiqj6tRHUfB0Px0JiC263kR0vzEDI1K6qEfPmPjA8TiDo1tK,iv:qdtzMcF1iELnhrCs3SboRcAsnw/0WgcUpWWHzKHNEYc=,tag:TkUMk8Wp2OTQd8CRtS07Wg==,type:str]
|
||||||
#ENC[AES256_GCM,data:3G8XqUKua1QgUxv2YJkW0fDnQPX7+v8GDC9BHg==,iv:BkESkMmMalgesy9why9eaKkOOvwSsN2EhNCRRRmZNtA=,tag:x95zt2B2M19BkzeMpAlXIg==,type:comment]
|
#ENC[AES256_GCM,data:3G8XqUKua1QgUxv2YJkW0fDnQPX7+v8GDC9BHg==,iv:BkESkMmMalgesy9why9eaKkOOvwSsN2EhNCRRRmZNtA=,tag:x95zt2B2M19BkzeMpAlXIg==,type:comment]
|
||||||
ssl_blakedheld_key: ENC[AES256_GCM,data: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,iv:T1sDL6oXItF2spTr4cbAjJ8WFdSHVN8cInElC5ZC2NM=,tag:OVJiimHRgHi4lJTELjx0iA==,type:str]
|
ssl_blakedheld_key: ENC[AES256_GCM,data:JCjbKYU6p7CTMtnWotZWBvW7vmLQ9MAP3bejcOteLLFLDZfmNguqA5h/8s0wLbjGnbGiNnupkvyWPCkC4xhO+fVq9Jzl7+YPEZn3uKjG7vyLlbVhLsmv3BleR01jddEJv+2fn2QztP3CfbocPHm2QaQhCqgfxxvcSpy0SlN3IOKckQaQB1oDJB+nHndPLN5VGwABE+b4x1AoYltfoFvNiGam8xXu31ENOz0WPVzi0Xmw/noVoS627BK/P+ISC1KP/iGuyRiWVmF2P8dN2oAtUarC2JV63/HevmN225pszBIyEeDta2Wv2QCNBYzUsDr5NA==,iv:fPuepEZUNjGWekTCfROyMoPdsioissEqvR2gZu+2NAQ=,tag:fVPI22eUYXOSI2A/MSbsEQ==,type:str]
|
||||||
|
ssl_recpro_crt: ENC[AES256_GCM,data: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,iv:5KucKtHOeiviRb8AIhF54CuFx/RxxYifrQP2vvIr0zk=,tag:r5pvRK0BAO9nkgFPPUSMMw==,type:str]
|
||||||
|
#ENC[AES256_GCM,data:3G8XqUKua1QgUxv2YJkW0fDnQPX7+v8GDC9BHg==,iv:BkESkMmMalgesy9why9eaKkOOvwSsN2EhNCRRRmZNtA=,tag:x95zt2B2M19BkzeMpAlXIg==,type:comment]
|
||||||
|
ssl_recpro_key: ENC[AES256_GCM,data:ev/g2sKFia5xcgZQ3LsfT0H9AaShYwxglzZadBhvknzFVwWxXGmGfHgKD6GM01fCIFOpB2pPGiiOTpgBh2xoRnPmivsApWoxxXgdVfzEEVbuB5pHAJSHWX5EUEqeiTz83zfbJAC5FZFwlIEQTL3YiPhRzKRWwEpMyYigsZmUAv3970XlDTAxDRgaPc4eHFI2ZrEXGmevnBoHOQPwXi+JCHqSCyhbPnsuU1InIcp4PMlX4/K+WknDT0HaLonIVXds237E8lOCJFAo4Ow3/zHho2B/tBZeqcHHf4P49SaSEO1CSCzTrW+1N1n+EsPo3PPld7AZ3klnsiKltorO18GM+2L9KGg6LbTiWm6FCOk2bMIFg9q1b183SSzeDx9CzhoXefsweMdn9BFBF1BVUObHGgYE0dpme20S43C+NVTeVt9+gjOEYysx/II8m1ui0UzpW+kYRdMLFjepYHlIZRA/jUEfdVssqKsX492n9bX5TRPc/9LN/o6oDg4CZjZXPILjD+Cg1NOW5ZSJrKvbFGRVNVeVlC5+idUqnaKP0Jh6nG/8niEBIyV51YGy6/ukruHyjMiH//iG9oE2xfLwjQGTUKhERxYgKOnisHkH7b7feTQBq926BgtWP63zchkCYz9sQTh8LzmfitXEBYUpRvDdxlnZ7m6I1ssemY7bFCnx2rZEpHRg9LxDG+UNgiODwm8YvXQbL7z+DPSVzG5QdRbhlS+deYMjquLBvWpMfUrJ8HxurLyvcZiTRqRSBmhlc+08Y3/j0RaSfmDdtId0HGKvokSoB7daMpgfKeZs9ddpvmEVYto4bER0Y2xfumgUq/VuhSR/H6KhuR++8JSnDZxPS5WtoH3eVOXrDIRKadiwYzx1r9dhek55iVLZ7uF/YGhxS4DD7gFsJJk8/usLnu7PM2UsoPhfhg69CrigFZRa6I1qdPSon3ODYxlJt1KVLgyNkJqjG06t96i3NcJaIm5tZNsGRDKrU8Jh6EiSzCquGOy4oblpE7lCdK5mlHXL5a0WRiaWTUqo27qTGT7o5jskXHQw8X+/iTP6LO8GpDcL/YCpF/HpV3JiuHLifJoV3u6Cj5qFyCfxF6k7h1gXUZxdMtovpicbzHeJS+4pAnrdR6NmavjlBKDZFRa6cUY0011ZuA4HYm4SdEPTCyEzOLNsmx4iwNao/jH1sPb6hQxfQrI/2xbKJYLeGJBDagCjEOB+bo1sUaTepDVSHAGUVpb6ZdW98AUs+zOiKAhE19H1NRuRRQcyq+6fMFh1+qyIoIELiJNlKcTjv53r30gyvnbz+FPLWqqvskZhRnwrF5JFFqwZ8Rkt/sS8TCQVT3ZGfOHF3J6yApb9GKQVu3D45efUePaPrGHVtWdJmQRVpQNKDAYoxOWT6yMhHH96juDh17QrqSvD6M+NqydP2K4q6zQE4rfSkTz9xPR/O7SvLUIZ6jDKj7TfNqOIpqVLaq8wiSPB3MW75RZKiGqcyH4aiEDgpYJRatF3+qZPx3zyUD8Oh5teEWya/HdqqW24a8FdmuQvdwE+ksCpeMJrVslQNDWpwpmRgJe3Nal7/qhdxh92WBSSteHmRSoFLKDwZAUa/f6Np1SXR7sc9fNeIggDvv3Ctx8LrUWpYTae1iGcaa8bwMPiwYXs0tLF+wmQHSypcMdl9CH76jhBRM+8cBzshiCISzJ4xrVUi91or5eOtXHaUM9BOqVZb1uykU/mkWWGQqdzo5Ng9POWUBxLvR4JywSVo4BaDawRykevOjM8JZFGYLfyOk45+MRRuESJWYnjf6P3V3f8l5Ai3SL0g7q/BImZ09iC2jTib8qlRrLMMJ+OQqx45TeCwicBnmV2hqz77KYvikgYLpYQUGkFKcqpP17nXKajbkvEP+2pIQQp6GRptp0Q3TvbOSZSvBJCmr6/6AQ2EXxTKMS2caUsw2bH2btkk45epPKJY1Qg1QOcjRwCUzy0ametW85M+5a3TSKjYAT5lNDb84q2mdMwy5giSI3iglUemcNYFurVlgGcY2CJJw6xi6UiqaqGIEhU9Sn9ns0cHejtu5Uoy+jxyuNaHyuH/f3pB/jdkCzkyTrxT4j5Lpdu6+Le4MdRbn+FGVtopn0LuoqHG8FhourPmpkQxdwA2Yq9glf9MuqiHz1aDri5rDQs/fdCYffvTxEEkZMvYdNIL+m/9talRX7wS1CffCqUrglcfKZxsbvPY9pK9YSxhOmtyZ/vyRBAMlA8Daz0o0mV7czV35tTPPoD36pgo04JenFRaKopwgyQ,iv:682Ok4M7ptRiWBytvbbiDyBCKBdZ51AIn7VWA62GdBk=,tag:UWsWZnDZ10dMF2vAB8V8tA==,type:str]
|
||||||
sops:
|
sops:
|
||||||
age:
|
age:
|
||||||
- recipient: age14gfh682a7m7jfp3qrulql03x5rs7yedwmxwksxrrmgjsunstyuksqx93pz
|
- recipient: age14gfh682a7m7jfp3qrulql03x5rs7yedwmxwksxrrmgjsunstyuksqx93pz
|
||||||
@@ -57,7 +66,7 @@ sops:
|
|||||||
U0tmdFBuZnJES3piOTZNV0VKQmQ0eVUKCWRQ/flLzmpC64WyLoipklZBmrkpYiUg
|
U0tmdFBuZnJES3piOTZNV0VKQmQ0eVUKCWRQ/flLzmpC64WyLoipklZBmrkpYiUg
|
||||||
PRu+itNolpPTHm96pe+P93g2iP0wgekG0cX21wkiU2xaLF3dY2FEIA==
|
PRu+itNolpPTHm96pe+P93g2iP0wgekG0cX21wkiU2xaLF3dY2FEIA==
|
||||||
-----END AGE ENCRYPTED FILE-----
|
-----END AGE ENCRYPTED FILE-----
|
||||||
lastmodified: "2025-11-02T02:04:55Z"
|
lastmodified: "2026-01-28T21:02:05Z"
|
||||||
mac: ENC[AES256_GCM,data:yx9qCtivffXhD4XS6M4wFtgpBW/MY76Y5hCqy/BxOdEslIE/BiufC/sf2WT5Fd+gCUUOIpK+T/XPsYCN1QbFEuOBW1f1XVnQjvRVGDXblotVXL4jkQlAFJo2dpzXEN7DyELthRkyCa6kM1rf8NUZItAyAdroRDpUscKAiIlydYI=,iv:BrD5RlRyQ3eF4JhJB27cA+G9NbaMlzWqD5eBKGsttGQ=,tag:BM6lSveGemNUso9oseqORA==,type:str]
|
mac: ENC[AES256_GCM,data:b9aX43ViObNX29DkVNHtwkQRm26PRe2rZYhDnL1ZYLLWyaO3OGP9+rM4vHT0lyuowQ6+Ur3IMPVpUSziXYLh3mtxr0hyYy5Y1miBuIxXYLBi3oLRTW1TgZdklzFDVL3c1GT4lXEh4q9KG3dP64r9/8dvjO2iRIosZ93/l0pIi3A=,iv:/gdNfVy8UiQsIRAHh2jiha5fL+wmfgp0srxt17Ry4Xs=,tag:YdVbvpBnQSaIarGIfiTzKQ==,type:str]
|
||||||
unencrypted_suffix: _unencrypted
|
unencrypted_suffix: _unencrypted
|
||||||
version: 3.11.0
|
version: 3.11.0
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 2.5 KiB After Width: | Height: | Size: 2.5 KiB |
|
Before Width: | Height: | Size: 723 B After Width: | Height: | Size: 723 B |
|
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.3 KiB |
|
Before Width: | Height: | Size: 2.4 KiB After Width: | Height: | Size: 2.4 KiB |
|
Before Width: | Height: | Size: 693 B After Width: | Height: | Size: 693 B |
|
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.3 KiB |
@@ -0,0 +1 @@
|
|||||||
|
background
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
size_NS
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
size_EW
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
forbidden
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
background
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
default
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
size_EW
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
size_NS
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
link
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
background
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
hand
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
help
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
default
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
link
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
hand
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
hand
|
||||||
1
users/blake/assets/icons/cursors/posy_dark/cursors/X_cursor
Symbolic link
@@ -0,0 +1 @@
|
|||||||
|
forbidden
|
||||||
1
users/blake/assets/icons/cursors/posy_dark/cursors/aero_busy
Symbolic link
@@ -0,0 +1 @@
|
|||||||
|
wait
|
||||||
1
users/blake/assets/icons/cursors/posy_dark/cursors/aero_working
Symbolic link
@@ -0,0 +1 @@
|
|||||||
|
background
|
||||||
1
users/blake/assets/icons/cursors/posy_dark/cursors/alias
Symbolic link
@@ -0,0 +1 @@
|
|||||||
|
link
|
||||||
1
users/blake/assets/icons/cursors/posy_dark/cursors/all-scroll
Symbolic link
@@ -0,0 +1 @@
|
|||||||
|
move
|
||||||
BIN
users/blake/assets/icons/cursors/posy_dark/cursors/alt
Normal file
1
users/blake/assets/icons/cursors/posy_dark/cursors/arrow
Symbolic link
@@ -0,0 +1 @@
|
|||||||
|
default
|
||||||
BIN
users/blake/assets/icons/cursors/posy_dark/cursors/background
Normal file
@@ -0,0 +1 @@
|
|||||||
|
size_NeSw
|
||||||
BIN
users/blake/assets/icons/cursors/posy_dark/cursors/beam
Normal file
@@ -0,0 +1 @@
|
|||||||
|
size_NeSw
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
size_NwSe
|
||||||
1
users/blake/assets/icons/cursors/posy_dark/cursors/bottom_side
Symbolic link
@@ -0,0 +1 @@
|
|||||||
|
size_NS
|
||||||
1
users/blake/assets/icons/cursors/posy_dark/cursors/bottom_tee
Symbolic link
@@ -0,0 +1 @@
|
|||||||
|
size_NS
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
size_NeSw
|
||||||
1
users/blake/assets/icons/cursors/posy_dark/cursors/cell
Symbolic link
@@ -0,0 +1 @@
|
|||||||
|
precise
|
||||||
1
users/blake/assets/icons/cursors/posy_dark/cursors/center_ptr
Symbolic link
@@ -0,0 +1 @@
|
|||||||
|
alt
|
||||||
1
users/blake/assets/icons/cursors/posy_dark/cursors/circle
Symbolic link
@@ -0,0 +1 @@
|
|||||||
|
forbidden
|
||||||
1
users/blake/assets/icons/cursors/posy_dark/cursors/closedhand
Symbolic link
@@ -0,0 +1 @@
|
|||||||
|
link
|
||||||
1
users/blake/assets/icons/cursors/posy_dark/cursors/col-resize
Symbolic link
@@ -0,0 +1 @@
|
|||||||
|
size_EW
|
||||||
1
users/blake/assets/icons/cursors/posy_dark/cursors/color-picker
Symbolic link
@@ -0,0 +1 @@
|
|||||||
|
precise
|
||||||
1
users/blake/assets/icons/cursors/posy_dark/cursors/context-menu
Symbolic link
@@ -0,0 +1 @@
|
|||||||
|
default
|
||||||
1
users/blake/assets/icons/cursors/posy_dark/cursors/copy
Symbolic link
@@ -0,0 +1 @@
|
|||||||
|
default
|
||||||
1
users/blake/assets/icons/cursors/posy_dark/cursors/cross
Symbolic link
@@ -0,0 +1 @@
|
|||||||
|
precise
|
||||||