system/home/scripts/default.nix

@@ -7,6 +7,5 @@
     (pkgs.writeShellScriptBin "clean-config" (builtins.readFile ./shell/clean-config.sh))
     (pkgs.writeShellScriptBin "rsync-local-config" (builtins.readFile ./shell/rsync-local-config.sh))
     (pkgs.writeShellScriptBin "xdg-query-program" (builtins.readFile ./shell/xdg-query-program.sh))
-    (pkgs.writeShellScriptBin "mount-onedrive" (builtins.readFile ./shell/mount-onedrive.sh))
   ];
 }

system/home/scripts/shell/ensure-pass.sh

@@ -6,21 +6,33 @@ secret-tool lookup email "$EMAIL" >/dev/null || (
 )
 
 EMAIL="e.litherlandsmith@icloud.com"
-secret-tool lookup clear "$EMAIL"
-pass show identity/apple.com/mbsync | head -n1 | secret-tool store --label="iCloud mbsync" email "$EMAIL"
+secret-tool lookup email "$EMAIL" >/dev/null || (
+    pass show identity/apple.com/mbsync |
+        head -n1 |
+        secret-tool store --label="iCloud mbsync" email "$EMAIL"
+)
 
 EMAIL="evie.litherland-smith@ukaea.uk"
-secret-tool clear email "$EMAIL"
-pass show work/microsoftonline.com | head -n1 | secret-tool store --label="Outlook mbsync" email "$EMAIL"
+secret-tool lookup email "$EMAIL" >/dev/null || (
+    pass show work/microsoftonline.com |
+        head -n1 |
+        secret-tool store --label="Outlook mbsync" email "$EMAIL"
+)
 
 # Calendar
 URL="dav.xenia.me.uk"
 USER="pixelifytica"
-secret-tool clear url "$URL" user "$USER"
-pass show "server/xenia.me.uk/$URL" | head -n1 | secret-tool store --label="Personal calendar vdirsyncer" url "$URL" user "$USER"
+secret-tool lookup url "$URL" user "$USER" >/dev/null || (
+    pass show "server/xenia.me.uk/$URL" |
+        head -n1 |
+        secret-tool store --label="Personal calendar vdirsyncer" url "$URL" user "$USER"
+)
 
 # GitHub API token
 HOST="api.github.com"
 USER="pixelifytica^forge"
-secret-tool clear host "$HOST" user "$USER"
-pass show "api/$HOST" | head -n1 | secret-tool store --label="Forge GitHub Token" host "$HOST" user "$USER"
+secret-tool lookup host "$HOST" user "$USER" >/dev/null || (
+    pass show "api/$HOST" |
+        head -n1 |
+        secret-tool store --label="Forge GitHub Token" host "$HOST" user "$USER"
+)

system/home/scripts/shell/mount-onedrive.sh

@@ -1,3 +0,0 @@
-ONEDRIVE="$HOME/OneDrive"
-[ -d "$ONEDRIVE" ] || mkdir -p "$ONEDRIVE"
-[ -z "$(ls -A "$ONEDRIVE")" ] && rclone --vfs-cache-mode writes mount --daemon OneDrive: "$ONEDRIVE"