Compare commits
12 Commits
35645a3e9c
...
58e68a003a
| Author | SHA1 | Date | |
|---|---|---|---|
| 58e68a003a | |||
| 82d61d54eb | |||
| fa981032d4 | |||
| 5090fa9cd4 | |||
| 125d639f9f | |||
| 9ad80827ee | |||
| f0fa2540b5 | |||
| 0bfe74abb7 | |||
| 766e20ffc4 | |||
| 178fba9c84 | |||
| eef41bbca8 | |||
| a0c728f147 |
@@ -1,99 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
|
||||
# --- SUDO CHECK ---
|
||||
if [ "$EUID" -ne 0 ]; then
|
||||
echo "This script requires root privileges. Re-running with sudo..."
|
||||
exec sudo "$0" "$@"
|
||||
fi
|
||||
|
||||
# --- HANDLE OPTIONS ---
|
||||
BORG_PASSPHRASE=""
|
||||
SHOW_FOLDERS_ONLY=false
|
||||
SHOW_FILES=false # Default to showing files and directories
|
||||
|
||||
while getopts "k:fp" opt; do
|
||||
case "$opt" in
|
||||
k)
|
||||
BORG_PASSPHRASE=$(<"$OPTARG")
|
||||
if [ -z "$BORG_PASSPHRASE" ]; then
|
||||
echo "Error: The key file is empty."
|
||||
exit 1
|
||||
fi
|
||||
echo "Using passphrase from key file: $OPTARG"
|
||||
;;
|
||||
f)
|
||||
SHOW_FOLDERS_ONLY=true
|
||||
echo "Only directories will be shown in fzf by default."
|
||||
SHOW_FILES=false
|
||||
;;
|
||||
p)
|
||||
SHOW_FILES=true
|
||||
echo "Both files and directories will be shown in fzf."
|
||||
;;
|
||||
*)
|
||||
echo "Usage: $0 [-k passphrase_file] [-f] [-p] <repo>"
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
done
|
||||
shift $((OPTIND - 1))
|
||||
|
||||
# --- FALLBACK TO /run/secrets/borg_passwd IF NO KEY FILE ---
|
||||
if [ -z "$BORG_PASSPHRASE" ]; then
|
||||
if [ $# -eq 0 ]; then
|
||||
BORG_PASSPHRASE=$(<"/run/secrets/borg_passwd")
|
||||
echo "Using passphrase from /run/secrets/borg_passwd"
|
||||
else
|
||||
# Prompt user for passphrase if neither -k nor /run/secrets/borg_passwd is available
|
||||
read -s -p "Enter Borg repository passphrase: " BORG_PASSPHRASE
|
||||
echo
|
||||
fi
|
||||
fi
|
||||
|
||||
export BORG_PASSPHRASE
|
||||
|
||||
# --- DEFAULT REPO ---
|
||||
REPO="${1:-/holocron/archives/servers/snowbelle}"
|
||||
|
||||
# --- CHECK REQUIRED COMMANDS ---
|
||||
for cmd in borg fzf find tree cp mkdir; do
|
||||
command -v "$cmd" >/dev/null || { echo "Error: '$cmd' is required but not installed."; exit 1; }
|
||||
done
|
||||
|
||||
# --- LIST ARCHIVES (sorted, newest last) ---
|
||||
mapfile -t archives < <(borg list --format="{archive}{NL}" "$REPO" | sort -r)
|
||||
if [ ${#archives[@]} -eq 0 ]; then
|
||||
echo "No archives found in $REPO"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# --- FZF ARCHIVE SELECT ---
|
||||
selected=$(printf '%s\n' "${archives[@]}" | fzf --prompt="Select archive: " --height=40% --border)
|
||||
if [ -z "$selected" ]; then
|
||||
echo "No archive selected."
|
||||
exit 1
|
||||
fi
|
||||
echo "Selected archive: $selected"
|
||||
|
||||
# --- GENERATE A UNIQUE, SHORTER MOUNT POINT ---
|
||||
MOUNT_POINT="/tmp/$(uuidgen | sha256sum | head -c 2)-restore-${selected}"
|
||||
mkdir -p "$MOUNT_POINT"
|
||||
|
||||
# --- MOUNT ARCHIVE ---
|
||||
echo "Mounting '$selected' to $MOUNT_POINT..."
|
||||
borg mount "$REPO::$selected" "$MOUNT_POINT"
|
||||
|
||||
cleanup() {
|
||||
echo "Unmounting archive..."
|
||||
borg umount "$MOUNT_POINT" >/dev/null 2>&1 || true
|
||||
rmdir "$MOUNT_POINT" >/dev/null 2>&1 || true
|
||||
}
|
||||
trap cleanup EXIT INT TERM
|
||||
|
||||
if [ ! -d "$MOUNT_POINT" ]; then
|
||||
echo "Error: mount failed."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
lf $MOUNT_POINT
|
||||
@@ -1,26 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
set -e
|
||||
pushd ~/.nix
|
||||
# nvim flake.nix
|
||||
# alejandra . &>/dev/null
|
||||
# git diff -U0 *.nix
|
||||
|
||||
# add generation comment to flake.nix
|
||||
gen=$(nixos-rebuild list-generations | grep current)
|
||||
if sed -n '3p' flake.nix | grep -q '^# generation:'; then
|
||||
# replace the comment on line 3
|
||||
sed -i "3s/^# generation:.*/# generation: $gen/" flake.nix
|
||||
else
|
||||
# insert comment on line 3
|
||||
sed -i "3i# generation: $gen" flake.nix
|
||||
fi
|
||||
|
||||
git diff -U0 $(find . -name '*.nix')
|
||||
|
||||
echo "nixos rebuilding..."
|
||||
#sudo nixos-rebuild switch --flake ~/.nix#snowbelle &>.nixos-switch-log || (
|
||||
# cat .nixos-switch-log | grep --color error && false)
|
||||
sudo nixos-rebuild switch --flake ~/.nix#snowbelle 2>&1 | tee .nixos-switch-log | grep --color=always -E "error|$" && true
|
||||
|
||||
git commit -am "$gen"
|
||||
popd
|
||||
@@ -76,9 +76,8 @@ in {
|
||||
egrep = "egrep --color=auto";
|
||||
|
||||
# --- scripts ---
|
||||
rebuild = "sh ${home_dir}/.nix/bin/rebuild.sh";
|
||||
perms = "sudo sh ${home_dir}/.nix/bin/perms.sh";
|
||||
bb = "sudo sh ${home_dir}/.nix/bin/borg_lf.sh";
|
||||
rebuild = "sh ${home_dir}/.nix/bin/rebuild";
|
||||
perms = "sudo sh ${home_dir}/.nix/bin/fix-perms";
|
||||
|
||||
# --- git ---
|
||||
status = "git status";
|
||||
|
||||
@@ -13,6 +13,9 @@ in {
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
|
||||
home.packages = with pkgs; [libnotify];
|
||||
|
||||
services.${program} = {
|
||||
enable = true;
|
||||
settings = {
|
||||
@@ -107,7 +110,6 @@ in {
|
||||
foreground = lib.mkDefault "#888888";
|
||||
frame_color = lib.mkDefault "#000000";
|
||||
timeout = 7;
|
||||
default_icon = "${home_dir}/.nix/users/blake/assets/icons/normal_64px.png";
|
||||
};
|
||||
|
||||
urgency_normal = {
|
||||
@@ -116,7 +118,6 @@ in {
|
||||
frame_color = lib.mkDefault "#000000";
|
||||
timeout = 7;
|
||||
override_pause_level = 30;
|
||||
default_icon = "${home_dir}/.nix/users/blake/assets/icons/normal_64px.png";
|
||||
};
|
||||
|
||||
urgency_critical = {
|
||||
@@ -125,7 +126,7 @@ in {
|
||||
frame_color = lib.mkDefault "#ff0000";
|
||||
timeout = 0;
|
||||
override_pause_level = 60;
|
||||
default_icon = "${home_dir}/.nix/users/blake/assets/icons/critical_128px.png";
|
||||
default_icon = "${home_dir}/.nix/users/blake/assets/icons/alert/critical_128px.png";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@@ -27,11 +27,6 @@ in {
|
||||
#autoEnable = false;
|
||||
image = cfg.wallpaper;
|
||||
polarity = "dark";
|
||||
# cursor = {
|
||||
# package = pkgs.posy-cursors;
|
||||
# name = "Posy_Cursor_Black";
|
||||
# size = 64;
|
||||
# };
|
||||
fonts = {
|
||||
sizes = {
|
||||
applications = 12;
|
||||
@@ -60,7 +55,7 @@ in {
|
||||
applications = 1.0;
|
||||
terminal = 0.9;
|
||||
desktop = 1.0;
|
||||
popups = 0.99;
|
||||
popups = 0.9;
|
||||
};
|
||||
|
||||
targets = {
|
||||
|
||||
@@ -16,24 +16,24 @@ in {
|
||||
programs.${program} = {
|
||||
enable = true;
|
||||
settings = {
|
||||
anchor = "top";
|
||||
width = "100%";
|
||||
height = 25;
|
||||
horizontal = true;
|
||||
# anchor = "top";
|
||||
# width = "100%";
|
||||
# height = 25;
|
||||
# horizontal = true;
|
||||
font-size = lib.mkDefault 12;
|
||||
prompt-text = " select: ";
|
||||
outline-width = 0;
|
||||
border-width = 0;
|
||||
corner-radius = 9;
|
||||
# outline-width = 0;
|
||||
# border-width = 0;
|
||||
# corner-radius = 9;
|
||||
background-color = lib.mkDefault "#2f1730";
|
||||
selection-color = lib.mkDefault "#ffffff";
|
||||
text-color = lib.mkDefault "#888888";
|
||||
min-input-width = 120;
|
||||
result-spacing = 15;
|
||||
padding-top = 0;
|
||||
padding-bottom = 0;
|
||||
padding-left = 0;
|
||||
padding-right = 0;
|
||||
# min-input-width = 120;
|
||||
# result-spacing = 15;
|
||||
# padding-top = 0;
|
||||
# padding-bottom = 0;
|
||||
# padding-left = 0;
|
||||
# padding-right = 0;
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
19
users/blake/dots/desktop/tofi/dmenu.config
Normal file
19
users/blake/dots/desktop/tofi/dmenu.config
Normal file
@@ -0,0 +1,19 @@
|
||||
anchor = top
|
||||
width = 100%
|
||||
height = 25
|
||||
horizontal = true
|
||||
font-size = 12
|
||||
prompt-text = " select: "
|
||||
font = ~/.local/share/fonts/ttf/UbuntuMonoNerdFontMono-Regular.ttf
|
||||
outline-width = 0
|
||||
border-width = 0
|
||||
corner-radius = 9
|
||||
background-color = #2f1730
|
||||
selection-color = #ffffff
|
||||
text-color = #888888
|
||||
min-input-width = 120
|
||||
result-spacing = 15
|
||||
padding-top = 0
|
||||
padding-bottom = 0
|
||||
padding-left = 0
|
||||
padding-right = 0
|
||||
@@ -3,11 +3,40 @@
|
||||
lib,
|
||||
config,
|
||||
...
|
||||
}: {
|
||||
}: let
|
||||
cfg = config.dots.programs;
|
||||
in {
|
||||
imports = [
|
||||
./gnucash
|
||||
./thunderbird
|
||||
./libreoffice
|
||||
./gnucash
|
||||
./qalculate
|
||||
./bitwarden
|
||||
./zathura
|
||||
./discord
|
||||
./mpv
|
||||
./nsxiv
|
||||
./media_tools
|
||||
];
|
||||
|
||||
options.dots.programs = {
|
||||
enable = lib.mkEnableOption "enables all programs by default";
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
dots = {
|
||||
thunderbird.enable = lib.mkDefault true;
|
||||
libreoffice.enable = lib.mkDefault true;
|
||||
gnucash.enable = lib.mkDefault true;
|
||||
qalculate.enable = lib.mkDefault true;
|
||||
bitwarden.enable = lib.mkDefault true;
|
||||
discord.enable = lib.mkDefault true;
|
||||
|
||||
zathura.enable = lib.mkDefault true;
|
||||
mpv.enable = lib.mkDefault true;
|
||||
nsxiv.enable = lib.mkDefault true;
|
||||
|
||||
media_tools.enable = lib.mkDefault true;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
20
users/blake/dots/programs/discord/default.nix
Normal file
20
users/blake/dots/programs/discord/default.nix
Normal file
@@ -0,0 +1,20 @@
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
config,
|
||||
...
|
||||
}: let
|
||||
program = "discord";
|
||||
cfg = config.dots.${program};
|
||||
in {
|
||||
options.dots.${program} = {
|
||||
enable = lib.mkEnableOption "enables ${program}";
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
|
||||
# just install package
|
||||
home.packages = with pkgs; [discord];
|
||||
|
||||
};
|
||||
}
|
||||
20
users/blake/dots/programs/media_tools/audacity/default.nix
Normal file
20
users/blake/dots/programs/media_tools/audacity/default.nix
Normal file
@@ -0,0 +1,20 @@
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
config,
|
||||
...
|
||||
}: let
|
||||
program = "audacity";
|
||||
cfg = config.dots.${program};
|
||||
in {
|
||||
options.dots.${program} = {
|
||||
enable = lib.mkEnableOption "enables ${program}";
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
|
||||
# just install package
|
||||
home.packages = with pkgs; [audacity];
|
||||
|
||||
};
|
||||
}
|
||||
27
users/blake/dots/programs/media_tools/default.nix
Normal file
27
users/blake/dots/programs/media_tools/default.nix
Normal file
@@ -0,0 +1,27 @@
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
config,
|
||||
...
|
||||
}: let
|
||||
cfg = config.dots.media_tools;
|
||||
in {
|
||||
imports = [
|
||||
./gimp
|
||||
./krita
|
||||
./audacity
|
||||
./kdenlive
|
||||
];
|
||||
options.dots.media_tools = {
|
||||
enable = lib.mkEnableOption "enables all programs by default";
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
dots = {
|
||||
audacity.enable = lib.mkDefault true;
|
||||
gimp.enable = lib.mkDefault true;
|
||||
krita.enable = lib.mkDefault true;
|
||||
kdenlive.enable = lib.mkDefault true;
|
||||
};
|
||||
};
|
||||
}
|
||||
20
users/blake/dots/programs/media_tools/gimp/default.nix
Normal file
20
users/blake/dots/programs/media_tools/gimp/default.nix
Normal file
@@ -0,0 +1,20 @@
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
config,
|
||||
...
|
||||
}: let
|
||||
program = "gimp";
|
||||
cfg = config.dots.${program};
|
||||
in {
|
||||
options.dots.${program} = {
|
||||
enable = lib.mkEnableOption "enables ${program}";
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
|
||||
# just install package
|
||||
home.packages = with pkgs; [gimp3];
|
||||
|
||||
};
|
||||
}
|
||||
20
users/blake/dots/programs/media_tools/kdenlive/default.nix
Normal file
20
users/blake/dots/programs/media_tools/kdenlive/default.nix
Normal file
@@ -0,0 +1,20 @@
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
config,
|
||||
...
|
||||
}: let
|
||||
program = "kdenlive";
|
||||
cfg = config.dots.${program};
|
||||
in {
|
||||
options.dots.${program} = {
|
||||
enable = lib.mkEnableOption "enables ${program}";
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
|
||||
# enable with home-manager
|
||||
home.packages = with pkgs; [kdePackages.kdenlive];
|
||||
|
||||
};
|
||||
}
|
||||
20
users/blake/dots/programs/media_tools/krita/default.nix
Normal file
20
users/blake/dots/programs/media_tools/krita/default.nix
Normal file
@@ -0,0 +1,20 @@
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
config,
|
||||
...
|
||||
}: let
|
||||
program = "krita";
|
||||
cfg = config.dots.${program};
|
||||
in {
|
||||
options.dots.${program} = {
|
||||
enable = lib.mkEnableOption "enables ${program}";
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
|
||||
# just install package
|
||||
home.packages = with pkgs; [krita];
|
||||
|
||||
};
|
||||
}
|
||||
22
users/blake/dots/programs/mpv/default.nix
Normal file
22
users/blake/dots/programs/mpv/default.nix
Normal file
@@ -0,0 +1,22 @@
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
config,
|
||||
...
|
||||
}: let
|
||||
program = "mpv";
|
||||
cfg = config.dots.${program};
|
||||
in {
|
||||
options.dots.${program} = {
|
||||
enable = lib.mkEnableOption "enables ${program}";
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
|
||||
# enable with home-manager
|
||||
programs.${program} = {
|
||||
enable = true;
|
||||
};
|
||||
|
||||
};
|
||||
}
|
||||
20
users/blake/dots/programs/nsxiv/default.nix
Normal file
20
users/blake/dots/programs/nsxiv/default.nix
Normal file
@@ -0,0 +1,20 @@
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
config,
|
||||
...
|
||||
}: let
|
||||
program = "nsxiv";
|
||||
cfg = config.dots.${program};
|
||||
in {
|
||||
options.dots.${program} = {
|
||||
enable = lib.mkEnableOption "enables ${program}";
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
|
||||
# just install package
|
||||
home.packages = with pkgs; [nsxiv];
|
||||
|
||||
};
|
||||
}
|
||||
23
users/blake/dots/programs/thunderbird/default.nix
Normal file
23
users/blake/dots/programs/thunderbird/default.nix
Normal file
@@ -0,0 +1,23 @@
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
config,
|
||||
...
|
||||
}: let
|
||||
program = "thunderbird";
|
||||
cfg = config.dots.${program};
|
||||
in {
|
||||
options.dots.${program} = {
|
||||
enable = lib.mkEnableOption "enables ${program}";
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
|
||||
# enable with home-manager
|
||||
# programs.${program} = {
|
||||
# enable = true;
|
||||
# };
|
||||
|
||||
home.packages = with pkgs; [thunderbird];
|
||||
};
|
||||
}
|
||||
22
users/blake/dots/programs/zathura/default.nix
Normal file
22
users/blake/dots/programs/zathura/default.nix
Normal file
@@ -0,0 +1,22 @@
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
config,
|
||||
...
|
||||
}: let
|
||||
program = "zathura";
|
||||
cfg = config.dots.${program};
|
||||
in {
|
||||
options.dots.${program} = {
|
||||
enable = lib.mkEnableOption "enables ${program}";
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
|
||||
# enable with home-manager
|
||||
programs.${program} = {
|
||||
enable = true;
|
||||
};
|
||||
|
||||
};
|
||||
}
|
||||
@@ -17,6 +17,8 @@
|
||||
wallpaper = ../assets/wallpapers/yveltal.jpg;
|
||||
};
|
||||
|
||||
programs.enable = true;
|
||||
|
||||
kitty.enable = true;
|
||||
librewolf.enable = true;
|
||||
waybar.enable = true;
|
||||
|
||||
Reference in New Issue
Block a user