From e094f112bf143fb1e1884b4da1e12325b7745e65 Mon Sep 17 00:00:00 2001
From: SebastianStork <sebastian.stork@pm.me>
Date: Wed, 26 Feb 2025 22:32:27 +0100
Subject: [PATCH] Replace short flags with long ones for readability

---
 hosts/stratus/containers/nspawn/forgejo/backup.nix   | 4 ++--
 hosts/stratus/containers/nspawn/nextcloud/backup.nix | 8 ++++----
 hosts/stratus/containers/nspawn/paperless/backup.nix | 4 ++--
 modules/home/de/hypridle.nix                         | 4 ++--
 modules/home/de/hyprland/keybinds.nix                | 4 ++--
 modules/system/restic-backup.nix                     | 2 +-
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/hosts/stratus/containers/nspawn/forgejo/backup.nix b/hosts/stratus/containers/nspawn/forgejo/backup.nix
index cb3f521..750094d 100644
--- a/hosts/stratus/containers/nspawn/forgejo/backup.nix
+++ b/hosts/stratus/containers/nspawn/forgejo/backup.nix
@@ -55,8 +55,8 @@ in
       name = "${serviceName}-restore";
       text = ''
         systemctl stop forgejo.service
-        sudo -u ${userName} restic-${serviceName} restore --target / latest
-        sudo -u ${userName} pg_restore --clean --if-exists --dbname forgejo ${dataDir}/backup/db.dump
+        sudo --user=${userName} restic-${serviceName} restore --target / latest
+        sudo --user=${userName} pg_restore --clean --if-exists --dbname forgejo ${dataDir}/backup/db.dump
         systemctl start forgejo.service
       '';
     })
diff --git a/hosts/stratus/containers/nspawn/nextcloud/backup.nix b/hosts/stratus/containers/nspawn/nextcloud/backup.nix
index 7c9d3d9..d2209ff 100644
--- a/hosts/stratus/containers/nspawn/nextcloud/backup.nix
+++ b/hosts/stratus/containers/nspawn/nextcloud/backup.nix
@@ -38,10 +38,10 @@ in
     (pkgs.writeShellApplication {
       name = "${serviceName}-restore";
       text = ''
-        sudo -u ${userName} ${lib.getExe' config.services.nextcloud.occ "nextcloud-occ"} maintenance:mode --on
-        sudo -u ${userName} restic-${serviceName} restore --target / latest
-        sudo -u ${userName} pg_restore --clean --if-exists --dbname nextcloud ${dataDir}/backup/db.dump
-        sudo -u ${userName} ${lib.getExe' config.services.nextcloud.occ "nextcloud-occ"} maintenance:mode --off
+        sudo --user=${userName} ${lib.getExe' config.services.nextcloud.occ "nextcloud-occ"} maintenance:mode --on
+        sudo --user=${userName} restic-${serviceName} restore --target / latest
+        sudo --user=${userName} pg_restore --clean --if-exists --dbname nextcloud ${dataDir}/backup/db.dump
+        sudo --user=${userName} ${lib.getExe' config.services.nextcloud.occ "nextcloud-occ"} maintenance:mode --off
       '';
     })
   ];
diff --git a/hosts/stratus/containers/nspawn/paperless/backup.nix b/hosts/stratus/containers/nspawn/paperless/backup.nix
index abeb98a..f190350 100644
--- a/hosts/stratus/containers/nspawn/paperless/backup.nix
+++ b/hosts/stratus/containers/nspawn/paperless/backup.nix
@@ -40,8 +40,8 @@ in
     (pkgs.writeShellApplication {
       name = "${serviceName}-restore";
       text = ''
-        sudo -u ${userName} restic-${serviceName} restore --target / latest
-        sudo -u ${userName} ${dataDir}/paperless-manage document_importer ${dataDir}/backup
+        sudo --user=${userName} restic-${serviceName} restore --target / latest
+        sudo --user=${userName} ${dataDir}/paperless-manage document_importer ${dataDir}/backup
       '';
     })
   ];
diff --git a/modules/home/de/hypridle.nix b/modules/home/de/hypridle.nix
index e0949f6..3ebb6cd 100644
--- a/modules/home/de/hypridle.nix
+++ b/modules/home/de/hypridle.nix
@@ -27,8 +27,8 @@
         listener = [
           {
             timeout = 300;
-            on-timeout = "brightnessctl -s && brightnessctl -e set 10%";
-            on-resume = "brightnessctl -r";
+            on-timeout = "brightnessctl --save --exponent set 10%";
+            on-resume = "brightnessctl --restore";
           }
           {
             timeout = 600;
diff --git a/modules/home/de/hyprland/keybinds.nix b/modules/home/de/hyprland/keybinds.nix
index c989c99..b276cc1 100644
--- a/modules/home/de/hyprland/keybinds.nix
+++ b/modules/home/de/hyprland/keybinds.nix
@@ -86,8 +86,8 @@
       bindl = SUPER ALT, M, exec, $mute-mic
 
       # Adjust brightness
-      bindel = , XF86MonBrightnessUp, exec, brightnessctl -e set +2%
-      bindel = , XF86MonBrightnessDown, exec, brightnessctl -e set 2%-
+      bindel = , XF86MonBrightnessUp, exec, brightnessctl --exponent set +2%
+      bindel = , XF86MonBrightnessDown, exec, brightnessctl --exponent set 2%-
 
       # Screenshot
       bind = , Print, exec, grimblast --notify --freeze copysave output
diff --git a/modules/system/restic-backup.nix b/modules/system/restic-backup.nix
index f673da0..f9391f7 100644
--- a/modules/system/restic-backup.nix
+++ b/modules/system/restic-backup.nix
@@ -96,7 +96,7 @@ in
           serviceConfig.Type = "oneshot";
           scriptArgs = "%i";
           script = ''
-            ${lib.getExe pkgs.curl} -fsS -m 10 --retry 5  https://hc-ping.com/$(cat ${
+            ${lib.getExe pkgs.curl} --fail --silent --show-error --max-time 10 --retry 5  https://hc-ping.com/$(cat ${
               config.sops.secrets."healthchecks-ping-key".path or "/run/secrets/healthchecks-ping-key"
             })/$(echo $1 | tr _ /)
           '';