Latest

docs/TODO.md

@@ -1,6 +1,7 @@
 https://github.com/harababurel/gcsf
 https://github.com/seaweedfs/seaweedfs
 [text](https://github.com/gitbito/CLI)
+https://github.com/awslabs/mountpoint-s3
 * Move age decryption higher
 * Add ~/.local/share/sounds was symlink to {{ .host.home }}/.local/share/betelgeuse/share/sounds
 xattr -d com.apple.quarantine rclone

home/.chezmoidata.yaml

@@ -602,6 +602,7 @@ softwareGroups:
     - portmaster
     - rofi
     - sddm
+    - spacedrive
     - tabby
     - vlc
     - vscode

home/Library/LaunchDaemons/rclone.user.plist.tmpl

@@ -9,15 +9,15 @@
 	<key>ProgramArguments</key>
 	<array>
 		<string>/usr/local/bin/rclone-mount</string>
-		<string>user</string>
+		<string>rclone</string>
 		<string>{{ .user.username }}</string>
-		<string>s3</string>
+		<string>User</string>
 	</array>
 	<key>RunAtLoad</key>
 	<true/>
     <key>StandardErrorPath</key>
-	<string>/Users/{{ .user.username }}/.local/share/rclone/user-daemon.error.log</string>
+	<string>/var/log/rclone/user-daemon.error.log</string>
 	<key>StandardOutPath</key>
-	<string>/Users/{{ .user.username }}/.local/share/rclone/user-daemon.debug.log</string>
+	<string>/var/log/rclone/user-daemon.debug.log</string>
 </dict>
 </plist>

home/dot_config/npm/private_npmrc.tmpl

@@ -12,4 +12,4 @@ loglevel=error
 network-concurrency=32
 prefix={{ .chezmoi.homeDir }}/.local/share/npm
 strict-peer-dependencies=false
-//registry.npmjs.org/:_authToken={{ if and (stat (joinPath .host.home ".config" "age" "chezmoi.txt")) (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "NPM_TOKEN")) }}{{- includeTemplate "secrets/NPM_TOKEN" | decrypt | trim -}}{{ else if (env "NPM_TOKEN") }}{{- env "NPM_TOKEN" -}}{{ else }}${NPM_TOKEN}{{ end }}
+//registry.npmjs.org/:_authToken={{ if and (stat (joinPath .host.home ".config" "age" "chezmoi.txt")) (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "NPM_TOKEN")) }}{{- includeTemplate "secrets/NPM_TOKEN" | decrypt | trim -}}{{ else if (env "NPM_TOKEN") }}{{- env "NPM_TOKEN" -}}{{ else }}${NPM_TOKEN}{{ end }}

home/dot_local/bin/executable_rclone-mount

@@ -27,16 +27,21 @@ if [ "$TYPE" = 'user' ]; then
   else
     USER_FOLDER='home'
   fi
-  CACHE_FOLDER="/$USER_FOLDER/$USER/.cache/rclone"
+  CACHE_FOLDER="/var/cache/rclone/$MOUNT"
   CONFIG_FOLDER="/$USER_FOLDER/$USER/.config/rclone"
-  LOG_FOLDER="/$USER_FOLDER/$USER/.local/share/rclone"
+  LOG_FOLDER="/var/log/rclone"
-  LOG_FILE="$LOG_FOLDER/$MOUNT.log"
+  LOG_FILE="$LOG_FOLDER/$MOUNT_LOWERCASE.log"
-  MOUNT_PATH="/$USER_FOLDER/$USER/.local/mnt/$MOUNT"
+  if [ -d /Applications ] && [ -d /System ]; then
+    MNT_FOLDER='Volumes'
+  else
+    MNT_FOLDER='mnt'
+  fi
+  MOUNT_PATH="/$MNT_FOLDER/$MOUNT"
 else
   CACHE_FOLDER="/var/cache/rclone/$MOUNT"
   CONFIG_FOLDER="/etc"
   LOG_FOLDER="/var/log/rclone"
-  LOG_FILE="$LOG_FOLDER/$MOUNT.log"
+  LOG_FILE="$LOG_FOLDER/$MOUNT_LOWERCASE.log"
   if [ -d /Applications ] && [ -d /System ]; then
     MNT_FOLDER='Volumes'
   else
@@ -72,16 +77,16 @@ rclone --config "$CONFIG_FOLDER/rclone.conf" \
   mount \
   --allow-other \
   --buffer-size 4G \
-  --bwlimit 40M \
+  --bwlimit 200M \
   --cache-chunk-path "$CACHE_FOLDER/$MOUNT_REF-chunks" \
   --cache-db-path "$CACHE_FOLDER/$MOUNT_REF-db" \
   --cache-dir "$CACHE_FOLDER/$MOUNT_REF-vfs" \
-  --cache-info-age 5m \
+  --cache-info-age 1m \
   --cache-tmp-upload-path "$CACHE_FOLDER/$MOUNT_REF-upload" \
   --cache-workers 8 \
   --cache-writes \
   --checkers 16 \
-  --dir-cache-time 5m \
+  --dir-cache-time 30s \
   --drive-use-trash \
   --exclude-from "$RCLONE_IGNORE" \
   --log-file "$LOG_FILE" \
@@ -93,7 +98,7 @@ rclone --config "$CONFIG_FOLDER/rclone.conf" \
   --vfs-cache-max-age 1000h \
   --vfs-cache-max-size 5G \
   --vfs-cache-mode full \
-  --vfs-cache-poll-interval 14s \
+  --vfs-cache-poll-interval 15s \
   --vfs-fast-fingerprint \
   --vfs-read-ahead 128M \
   --vfs-read-chunk-size 16M \

software.yml

@@ -10874,9 +10874,11 @@ softwarePackages:
             sudo cp -f "$HOME/Library/LaunchDaemons/rclone.public.plist" '/Library/LaunchDaemons/rclone.public.plist'
             sudo launchctl load '/Library/LaunchDaemons/rclone.public.plist' && logg success 'launchctl load successful'
           fi
-          if [ -f "$HOME/Library/LaunchDaemons/rclone.user.plist" ] && ! launchctl list | grep 'rclone.user' > /dev/null; then
+          if [ -f "$HOME/Library/LaunchDaemons/rclone.user.plist" ] && [ ! -f "/Library/LaunchDaemons/rclone.user.plist" ]; then
-            logg info 'Adding ~/Public as S3 bucket mount, enabled at boot'
+            logg info "Adding /Volumes/User-$USER as S3 bucket mount, enabled at boot"
-            launchctl load "$HOME/Library/LaunchDaemons/rclone.user.plist" && logg success 'user launchctl load successful'
+            sudo mkdir -p /Library/LaunchDaemons
+            sudo cp -f "$HOME/Library/LaunchDaemons/rclone.user.plist" '/Library/LaunchDaemons/rclone.user.plist'
+            sudo launchctl load '/Library/LaunchDaemons/rclone.user.plist' && logg success 'launchctl load successful'
           fi
         elif [ -d /etc/systemd/system ]; then
           find "${XDG_CONFIG_HOME:-$HOME/.config}/rclone/system" -mindepth 1 -maxdepth 1 -type f | while read RCLONE_SERVICE; do
@@ -12059,6 +12061,14 @@ softwarePackages:
     _name: solcjs
     _short: "solc-js is a JavaScript binding for the Solidity compiler, allowing developers to compile Solidity smart contracts within JavaScript applications.                                                        "
     npm: solc
+  spacedrive:
+    _bin: spacedrive
+    _app: Spacedrive.app
+    _github: https://github.com/spacedriveapp/spacedrive
+    _name: Spacedrive
+    appimage: https://www.spacedrive.com/api/releases/desktop/stable/linux/x86_64
+    cask: spacedrive
+    msi: https://www.spacedrive.com/api/releases/desktop/stable/windows/x86_64
   sparkleshare:
     _app: SparkleShare.app
     _bin: sparkleshare