Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions crates/agility-cli/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,9 @@ async fn main() -> Result<()> {

fn should_bluetooth_power_on_startup() -> bool {
let home = std::env::var("HOME").unwrap_or_default();
let prefs_path = std::path::PathBuf::from(home).join(".cache/quickshell/settings_prefs.json");
let primary = std::path::PathBuf::from(&home).join(".config/agility-shell/settings_prefs.json");
let cache = std::path::PathBuf::from(&home).join(".cache/quickshell/settings_prefs.json");
let prefs_path = if primary.is_file() { primary } else { cache };
if let Ok(data) = std::fs::read_to_string(&prefs_path) {
if let Ok(v) = serde_json::from_str::<serde_json::Value>(&data) {
return v
Expand Down Expand Up @@ -1839,7 +1841,9 @@ fn expand_user_path(p: &str) -> std::path::PathBuf {

fn get_custom_wallpaper_dir() -> Option<std::path::PathBuf> {
let home = std::env::var("HOME").ok()?;
let prefs_path = Path::new(&home).join(".cache/quickshell/settings_prefs.json");
let primary = Path::new(&home).join(".config/agility-shell/settings_prefs.json");
let cache = Path::new(&home).join(".cache/quickshell/settings_prefs.json");
let prefs_path = if primary.is_file() { primary } else { cache };
let content = fs::read_to_string(&prefs_path).ok()?;
let val: serde_json::Value = serde_json::from_str(&content).ok()?;
if val.get("wpSourceMode").and_then(|v| v.as_str()) == Some("custom") {
Expand Down
5 changes: 3 additions & 2 deletions crates/agilityd/src/modules/connectivity.rs
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,9 @@ impl ConnectivityService {

// Enforce Bluetooth off by default on startup unless explicitly enabled in user options
let home = std::env::var("HOME").unwrap_or_default();
let prefs_path =
std::path::PathBuf::from(&home).join(".cache/quickshell/settings_prefs.json");
let primary = std::path::PathBuf::from(&home).join(".config/agility-shell/settings_prefs.json");
let cache = std::path::PathBuf::from(&home).join(".cache/quickshell/settings_prefs.json");
let prefs_path = if primary.is_file() { primary } else { cache };
let bt_startup = if let Ok(data) = std::fs::read_to_string(&prefs_path) {
serde_json::from_str::<serde_json::Value>(&data)
.ok()
Expand Down
4 changes: 3 additions & 1 deletion crates/agilityd/src/modules/theme.rs
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,9 @@ pub fn expand_tilde(path_str: &str) -> PathBuf {

fn get_custom_wallpaper_dir() -> Option<PathBuf> {
let home = std::env::var("HOME").ok()?;
let prefs_path = PathBuf::from(&home).join(".cache/quickshell/settings_prefs.json");
let primary = PathBuf::from(&home).join(".config/agility-shell/settings_prefs.json");
let cache = PathBuf::from(&home).join(".cache/quickshell/settings_prefs.json");
let prefs_path = if primary.is_file() { primary } else { cache };
let content = fs::read_to_string(&prefs_path).ok()?;
let val: serde_json::Value = serde_json::from_str(&content).ok()?;
if val.get("wpSourceMode").and_then(|v| v.as_str()) == Some("custom") {
Expand Down
12 changes: 12 additions & 0 deletions quickshell/agility/Core/Services/HyprlandService.qml
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,18 @@ Item {
WallpaperManager.reapplyCurrentWallpaper();
}
}
onWpClicksEnabledChanged: {
if (SettingsService.settingsLoaded)
SettingsService.saveSettings();
}
onWpSourceModeChanged: {
if (SettingsService.settingsLoaded)
SettingsService.saveSettings();
}
onWpCustomFolderPathChanged: {
if (SettingsService.settingsLoaded)
SettingsService.saveSettings();
}
onKeyboardLayoutChanged: {
if (SettingsService.settingsLoaded) {
SettingsService.saveSettings();
Expand Down
33 changes: 27 additions & 6 deletions quickshell/agility/Core/Services/SettingsService.qml
Original file line number Diff line number Diff line change
Expand Up @@ -241,8 +241,23 @@ Item {
saveSettings();

}
onBarOpenOnHoverChanged: { if (settingsLoaded) saveSettings(); }
onBarGlassModeChanged: { if (settingsLoaded) saveSettings(); }
onBarSolidToneChanged: { if (settingsLoaded) saveSettings(); }
onBarGlassOpacityChanged: { if (settingsLoaded) saveSettings(); }
onPillBarThicknessChanged: { if (settingsLoaded) saveSettings(); }
onBluetoothOnStartupChanged: { if (settingsLoaded) saveSettings(); }
onSoundEffectsEnabledChanged: { if (settingsLoaded) saveSettings(); }
onBarIconModeChanged: { if (settingsLoaded) saveSettings(); }
onBarIconShapeChanged: { if (settingsLoaded) saveSettings(); }
onBarIconCycleShapesChanged: { if (settingsLoaded) saveSettings(); }
onBarIconCycleIntervalChanged: { if (settingsLoaded) saveSettings(); }
onBarIconCustomSvgChanged: { if (settingsLoaded) saveSettings(); }
onActionShortcutsChanged: { if (settingsLoaded) saveSettings(); }
onCustomShortcutsChanged: { if (settingsLoaded) saveSettings(); }
onSettingsWindowModeChanged: { if (settingsLoaded) saveSettings(); }
onSettingsBoxedWidthChanged: { if (settingsLoaded) saveSettings(); }
onSettingsBoxedHeightChanged: { if (settingsLoaded) saveSettings(); }
onAppletActiveWindowChanged: { if (settingsLoaded) saveSettings(); }
onAppletActiveWindowActionChanged: { if (settingsLoaded) saveSettings(); }
onAppletDynamicMediaChanged: { if (settingsLoaded) saveSettings(); }
Expand Down Expand Up @@ -356,18 +371,16 @@ Item {
"edgeLightingDirection": settingsService.edgeLightingDirection
};
syncShortcuts();
settingsSaver.command = ["sh", "-c", "mkdir -p ~/.cache/quickshell /var/tmp/sddm-theme && cat << 'EOF' > ~/.cache/quickshell/settings_prefs.json
" + JSON.stringify(data) + "
EOF
cp ~/.cache/quickshell/settings_prefs.json /var/tmp/sddm-theme/settings_prefs.json 2>/dev/null && chmod 666 /var/tmp/sddm-theme/settings_prefs.json 2>/dev/null || true"];
settingsSaver.command = ["python3", Quickshell.shellDir + "/Core/Services/scripts/save_settings.py", JSON.stringify(data)];
settingsSaver.running = false;
settingsSaver.running = true;
}
}

Process {
id: settingsLoader

command: ["cat", Quickshell.env("HOME") + "/.cache/quickshell/settings_prefs.json"]
command: ["python3", Quickshell.shellDir + "/Core/Services/scripts/read_settings.py"]
stdout: StdioCollector {
id: settingsLoaderOutput
}
Expand Down Expand Up @@ -639,14 +652,16 @@ cp ~/.cache/quickshell/settings_prefs.json /var/tmp/sddm-theme/settings_prefs.js
}
settingsService.settingsLoaded = true;
if (!settingsService.bluetoothOnStartup) {
bluetoothStartupProc.running = false;
bluetoothStartupProc.running = true;
}
HyprlandService.triggerStartupTimer();
} else {
settingsService.settingsLoaded = true;
SystemInfoService.applyProfile("balanced");
settingsService.saveSettings();
settingsService.settingsLoaded = true;
if (!settingsService.bluetoothOnStartup) {
bluetoothStartupProc.running = false;
bluetoothStartupProc.running = true;
}
HyprlandService.triggerStartupTimer();
Expand All @@ -667,6 +682,12 @@ cp ~/.cache/quickshell/settings_prefs.json /var/tmp/sddm-theme/settings_prefs.js

Process {
id: settingsSaver

onExited: function(exitCode) {
if (exitCode !== 0) {
console.error("Agility Shell: settingsSaver exited with code " + exitCode);
}
}
}

Process {
Expand Down
80 changes: 80 additions & 0 deletions quickshell/agility/Core/Services/scripts/read_settings.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
#!/usr/bin/env python3
"""
Settings reader with automatic migration and fallback for Agility Shell.
Checks ~/.config/agility-shell/settings_prefs.json first.
If missing, automatically migrates from ~/.cache/quickshell/settings_prefs.json.
Falls back to .bak files if primary is corrupted.
Prints valid JSON to stdout.
"""

import os
import sys
import json
import shutil

def try_load(path: str):
if not os.path.isfile(path) or os.path.getsize(path) == 0:
return None
try:
with open(path, "r", encoding="utf-8") as f:
data = json.load(f)
return data
except Exception:
return None

def main():
home = os.path.expanduser("~")
primary_config = os.path.join(home, ".config", "agility-shell", "settings_prefs.json")
primary_bak = primary_config + ".bak"
cache_config = os.path.join(home, ".cache", "quickshell", "settings_prefs.json")
cache_bak = cache_config + ".bak"

data = None
source = None

# 1. Try primary durable config
data = try_load(primary_config)
if data is not None:
source = "primary"

# 2. If primary missing or corrupted, try primary .bak
if data is None:
data = try_load(primary_bak)
if data is not None:
source = "primary_bak"

# 3. If still missing, check cache for initial automatic migration
if data is None:
data = try_load(cache_config)
if data is not None:
source = "cache_migration"
try:
os.makedirs(os.path.dirname(primary_config), exist_ok=True)
with open(primary_config, "w", encoding="utf-8") as f:
json.dump(data, f, indent=2, ensure_ascii=False)
except Exception:
pass

# 4. If still missing, check cache .bak
if data is None:
data = try_load(cache_bak)
if data is not None:
source = "cache_bak"

if data is not None:
# Also ensure cache is in sync with primary
if source in ("primary", "primary_bak") and not os.path.isfile(cache_config):
try:
os.makedirs(os.path.dirname(cache_config), exist_ok=True)
shutil.copy2(primary_config, cache_config)
except Exception:
pass

print(json.dumps(data))
sys.exit(0)
else:
# No valid settings file found
sys.exit(1)

if __name__ == "__main__":
main()
97 changes: 97 additions & 0 deletions quickshell/agility/Core/Services/scripts/save_settings.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
#!/usr/bin/env python3
"""
Atomic settings persister for Agility Shell.
Saves settings to ~/.config/agility-shell/settings_prefs.json (primary durable store),
mirrors to ~/.cache/quickshell/settings_prefs.json (runtime cache),
and syncs to /var/tmp/sddm-theme/settings_prefs.json (SDDM greeter theme) with .bak safeguards.
"""

import sys
import os
import json
import tempfile
import shutil

def atomic_write(filepath: str, data_str: str, make_backup: bool = True):
target_dir = os.path.dirname(filepath)
os.makedirs(target_dir, exist_ok=True)

# If existing file is valid, create/update .bak
if make_backup and os.path.isfile(filepath):
try:
if os.path.getsize(filepath) > 0:
bak_path = filepath + ".bak"
shutil.copy2(filepath, bak_path)
except Exception:
pass

# Write to a temporary file in the same directory so os.replace is atomic (same filesystem)
fd, tmp_path = tempfile.mkstemp(prefix="settings_", suffix=".tmp", dir=target_dir)
try:
with os.fdopen(fd, "w", encoding="utf-8") as f:
f.write(data_str)
f.flush()
os.fsync(f.fileno())
try:
os.chmod(tmp_path, 0o644)
except Exception:
pass
os.replace(tmp_path, filepath)
except Exception as e:
if os.path.exists(tmp_path):
try:
os.remove(tmp_path)
except Exception:
pass
raise e

def main():
if len(sys.argv) < 2:
print("Usage: save_settings.py '<json_string>'", file=sys.stderr)
sys.exit(1)

payload = sys.argv[1].strip()
if not payload:
print("Empty payload provided", file=sys.stderr)
sys.exit(1)

# Validate that payload is valid JSON before writing anything
try:
parsed = json.loads(payload)
formatted_json = json.dumps(parsed, indent=2, ensure_ascii=False)
except Exception as err:
print(f"Error parsing JSON payload: {err}", file=sys.stderr)
sys.exit(1)

home = os.path.expanduser("~")
primary_config = os.path.join(home, ".config", "agility-shell", "settings_prefs.json")
cache_config = os.path.join(home, ".cache", "quickshell", "settings_prefs.json")
sddm_config = "/var/tmp/sddm-theme/settings_prefs.json"

# 1. Primary durable write
try:
atomic_write(primary_config, formatted_json, make_backup=True)
except Exception as e:
print(f"Warning: Failed to write to {primary_config}: {e}", file=sys.stderr)

# 2. Cache mirror write
try:
atomic_write(cache_config, formatted_json, make_backup=True)
except Exception as e:
print(f"Warning: Failed to write to {cache_config}: {e}", file=sys.stderr)

# 3. SDDM theme mirror write (optional/best-effort)
try:
os.makedirs(os.path.dirname(sddm_config), exist_ok=True)
atomic_write(sddm_config, formatted_json, make_backup=False)
try:
os.chmod(sddm_config, 0o666)
except Exception:
pass
except Exception:
pass

sys.exit(0)

if __name__ == "__main__":
main()
4 changes: 2 additions & 2 deletions quickshell/agility/Core/Theme.qml
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ QtObject {
let json = JSON.stringify(obj);
let home = Quickshell.env("HOME");
saver.running = false;
saver.command = ["bash", "-c", "mkdir -p '" + home + "/.cache/quickshell' && echo '" + json + "' > '" + home + "/.cache/quickshell/colorscheme.json'"];
saver.command = ["bash", "-c", "mkdir -p '" + home + "/.config/agility-shell' '" + home + "/.cache/quickshell' && echo '" + json + "' > '" + home + "/.cache/quickshell/colorscheme.json' && cp '" + home + "/.cache/quickshell/colorscheme.json' '" + home + "/.config/agility-shell/colorscheme.json' 2>/dev/null || true"];
saver.running = true;
}

Expand Down Expand Up @@ -198,7 +198,7 @@ QtObject {
}

loader: Process {
command: ["cat", Quickshell.env("HOME") + "/.cache/quickshell/colorscheme.json"]
command: ["bash", "-c", "if [ -f \"$HOME/.config/agility-shell/colorscheme.json\" ]; then cat \"$HOME/.config/agility-shell/colorscheme.json\"; elif [ -f \"$HOME/.cache/quickshell/colorscheme.json\" ]; then cat \"$HOME/.cache/quickshell/colorscheme.json\"; fi"]
onExited: function(exitCode) {
if (exitCode === 0) {
try {
Expand Down
Loading
Loading