Merge branch 'master' of git.uninsane.org:shelvacu/nix-stuff
This commit is contained in:
@@ -56,7 +56,6 @@ lib.mkMerge [
|
||||
aircrack-ng
|
||||
android-tools
|
||||
bitwarden-cli
|
||||
borgbackup
|
||||
cargo
|
||||
dmidecode
|
||||
fido2-manage
|
||||
@@ -78,7 +77,6 @@ lib.mkMerge [
|
||||
nmap
|
||||
nvme-cli
|
||||
proxmark3
|
||||
radicle-node
|
||||
rclone
|
||||
ripgrep-all
|
||||
ruby
|
||||
@@ -90,6 +88,7 @@ lib.mkMerge [
|
||||
];
|
||||
})
|
||||
{
|
||||
vacu.packages.borgbackup.enable = (config.vacu.systemKind == "desktop" || config.vacu.systemKind == "server") && (pkgs.system != "aarch64-linux");
|
||||
vacu.packages.ffmpeg-vacu-full.enable = config.vacu.systemKind == "desktop";
|
||||
vacu.packages.ffmpeg-vacu-headless.enable =
|
||||
config.vacu.systemKind != "minimal"
|
||||
|
@@ -236,6 +236,7 @@ in
|
||||
jwt_path=${lib.escapeShellArg cfg.jwtSecret.path}
|
||||
${lib.optionalString cfg.jwtSecret.autoGenerate ''
|
||||
if ! [[ -f "$jwt_path" ]]; then
|
||||
umask 077
|
||||
od -vN "128" -An -tx1 /dev/urandom | tr -d " \n" > "$jwt_path"
|
||||
fi
|
||||
''}
|
||||
|
Reference in New Issue
Block a user