Fix various small issues
This commit is contained in:
+9
-6
@@ -72,7 +72,7 @@ in
|
||||
};
|
||||
|
||||
system.activationScripts.cleanRadiantFiles = ''
|
||||
rm -rf /home/kiosk/.local/share/radiantwave/audio
|
||||
rm -rf /home/kiosk/.local/radiantwave/audio
|
||||
'';
|
||||
|
||||
# Virtual machine declaration
|
||||
@@ -108,7 +108,7 @@ in
|
||||
users.users.kiosk = {
|
||||
isNormalUser = true;
|
||||
uid = 1000;
|
||||
extraGroups = ["audio" "video" "input" "networkmanager" "wheel"];
|
||||
extraGroups = ["audio" "video" "input" "networkmanager" "wheel" "seat"];
|
||||
openssh.authorizedKeys.keys = myKey;
|
||||
password = "Fuckp@ssw0rds";
|
||||
};
|
||||
@@ -207,7 +207,7 @@ in
|
||||
|
||||
# --- Set ownership of Radiantwave files ---
|
||||
systemd.tmpfiles.rules = [
|
||||
"d /home/kiosk/.local/share/radiantwave 0770 kiosk kiosk -"
|
||||
"d /home/kiosk/.local/radiantwave 0770 kiosk kiosk -"
|
||||
];
|
||||
|
||||
# --- Backup service: runs before nixos-upgrade ---
|
||||
@@ -220,8 +220,8 @@ in
|
||||
User = "kiosk";
|
||||
};
|
||||
script = ''
|
||||
BACKUP_DIR="/home/kiosk/.local/share/radiantwave-backup"
|
||||
SOURCE_DIR="/home/kiosk/.local/share/radiantwave"
|
||||
BACKUP_DIR="/home/kiosk/.local/radiantwave-backup"
|
||||
SOURCE_DIR="/home/kiosk/.local/radiantwave"
|
||||
|
||||
mkdir -p "$BACKUP_DIR"
|
||||
|
||||
@@ -244,7 +244,10 @@ in
|
||||
ExecStartPre = "${pkgs.coreutils}/bin/sleep 90";
|
||||
};
|
||||
script = ''
|
||||
if ${pkgs.procps}/bin/pgrep -x radiantwave > /dev/null; then
|
||||
# The installed `radiantwave` is a makeWrapper script that execs the real
|
||||
# binary (`.radiantwave-unwrapped`), so the process comm is not exactly
|
||||
# `radiantwave`; match the exec'd binary's command line instead.
|
||||
if ${pkgs.procps}/bin/pgrep -f '\.radiantwave-unwrapped' > /dev/null; then
|
||||
echo "RadiantWave is running, upgrade successful"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user