Skip to content
Merged
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
5 changes: 3 additions & 2 deletions cmds/system/load.sh
Original file line number Diff line number Diff line change
Expand Up @@ -186,10 +186,11 @@ cmd_load() {

faillock --user "$USER" --reset 2>/dev/null || true

local restart_marker="/tmp/retro_shell_restart_done"
local restart_marker="$HOME/.config/retro/.shell_restart_done"
if [[ ! -f $restart_marker ]]; then
mkdir -p "$HOME/.config/retro"
touch "$restart_marker"
rx_log "info" "Scheduling RetroShell restart in 3s (first boot stabilization)..."
rx_log "info" "Scheduling RetroShell restart in 3s (first login stabilization)..."
(
sleep 3
retro shell restart
Expand Down
16 changes: 5 additions & 11 deletions cmds/system/setup/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ _ensure_aur_helper() {
[[ $helper == "paru" ]] && repo="https://aur.archlinux.org/paru.git"
local tmpdir
tmpdir=$(mktemp -d)
git clone --depth 1 "$repo" "$tmpdir/$helper" >/dev/null 2>&1 \
&& (cd "$tmpdir/$helper" && makepkg -si --noconfirm >/dev/null 2>&1)
git clone --depth 1 "$repo" "$tmpdir/$helper" >/dev/null 2>&1 &&
(cd "$tmpdir/$helper" && makepkg -si --noconfirm >/dev/null 2>&1)
rm -rf "$tmpdir" 2>/dev/null
fi

Expand Down Expand Up @@ -95,15 +95,9 @@ run_postinstall() {
retro xdg setup -o "editor=${EDITOR_CHOICE:-nvim},browser=${xdg_browser},filemanager=${FILEMANAGER_CHOICE:-nemo},image=loupe,video=mpv"

retro wallpaper setup --needed -y -o "theme=retro"
echo -n " Download the retro wallpaper collection? [Y/n]: "
local _wall_answer=""
read -r _wall_answer
[[ -z $_wall_answer ]] && _wall_answer="Y"
if [[ $_wall_answer =~ ^[Yy]$ ]]; then
retro wallpaper pull retro
else
rx_log "info" "Skipping wallpaper collection download."
fi

retro wallpaper pull retro

retro theme setup --needed -y
retro theme mode dark

Expand Down
7 changes: 6 additions & 1 deletion cmds/tools/settings/core/shell_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,11 @@ def save_shell_json(name: str, data: dict) -> None:
"containBar": False,
"keepBarShadow": False,
"keepBarBorder": False,
"scale": 1.0,
"barPaddingTop": 4,
"barPaddingRight": 4,
"barPaddingBottom": 4,
"barPaddingLeft": 4,
"showWeatherTemp": False,
"showDayOfWeek": False,
"batteryStyle": "arch",
Expand Down Expand Up @@ -682,7 +687,7 @@ def scan_presets() -> list[dict]:
# Bundled (official) presets
bundled = _BUNDLED_PRESETS_DIR
if bundled.is_dir():
for d in sorted(bundled.iterdir()):
for d in sorted(bundled.iterdir(), key=lambda p: (p.name != "RetroLinux", p.name)):
if d.is_dir() and _has_config_files(d):
seen.add(d.name)
presets.append({
Expand Down
27 changes: 27 additions & 0 deletions modules/retroshell/files/assets/presets/Caelestiax/bar.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
"position": "left",
"launcherIcon": "",
"launcherIconTint": true,
"launcherIconFullTint": true,
"launcherIconSize": 24,
"pillStyle": "squished",
"screenList": [],
"enableFirefoxPlayer": false,
"barColor": [
[
"surface",
0
]
],
"frameEnabled": true,
"frameThickness": 8,
"pinnedOnStartup": true,
"hoverToReveal": true,
"hoverRegionHeight": 8,
"showPinButton": true,
"availableOnFullscreen": true,
"use12hFormat": false,
"containBar": true,
"keepBarShadow": false,
"keepBarBorder": false
}
48 changes: 48 additions & 0 deletions modules/retroshell/files/assets/presets/Caelestiax/compositor.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
{
"activeBorderColor": [
"primary"
],
"borderAngle": 45,
"inactiveBorderColor": [
"surface"
],
"inactiveBorderAngle": 45,
"borderSize": 2,
"rounding": 16,
"syncRoundness": true,
"syncBorderWidth": false,
"syncBorderColor": false,
"syncShadowOpacity": false,
"syncShadowColor": false,
"gapsIn": 2,
"gapsOut": 4,
"layout": "scrolling",
"shadowEnabled": true,
"shadowRange": 8,
"shadowRenderPower": 3,
"shadowSharp": false,
"shadowIgnoreWindow": true,
"shadowColor": "shadow",
"shadowColorInactive": "shadow",
"shadowOpacity": 0.5,
"shadowOffset": "0 0",
"shadowScale": 1,
"blurEnabled": true,
"blurSize": 4,
"blurPasses": 2,
"blurIgnoreOpacity": true,
"blurExplicitIgnoreAlpha": false,
"blurIgnoreAlphaValue": 0.2,
"blurNewOptimizations": true,
"blurXray": false,
"blurNoise": 0,
"blurContrast": 1,
"blurBrightness": 1,
"blurVibrancy": 0,
"blurVibrancyDarkness": 0,
"blurSpecial": true,
"blurPopups": false,
"blurPopupsIgnorealpha": 0.2,
"blurInputMethods": false,
"blurInputMethodsIgnorealpha": 0.2
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"enabled": false,
"iconSize": 40,
"spacingVertical": 16,
"textColor": "overBackground"
}
22 changes: 22 additions & 0 deletions modules/retroshell/files/assets/presets/Caelestiax/dock.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"enabled": true,
"theme": "default",
"position": "bottom",
"height": 48,
"iconSize": 24,
"spacing": 4,
"margin": 4,
"hoverRegionHeight": 16,
"pinnedOnStartup": false,
"hoverToReveal": true,
"availableOnFullscreen": true,
"showRunningIndicators": true,
"showPinButton": true,
"showOverviewButton": true,
"ignoredAppRegexes": [
"quickshell.*",
"xdg-desktop-portal.*"
],
"screenList": [],
"keepHidden": false
}
4 changes: 4 additions & 0 deletions modules/retroshell/files/assets/presets/Caelestiax/info.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"author": "itsVLXD",
"authorUrl": "https://github.com/itsvlxd"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"position": "bottom"
}
6 changes: 6 additions & 0 deletions modules/retroshell/files/assets/presets/Caelestiax/notch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"theme": "default",
"position": "top",
"hoverRegionHeight": 16,
"keepHidden": false
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"rows": 2,
"columns": 5,
"scale": 0.15,
"workspaceSpacing": 8
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"blurTransition": true,
"windowPreview": true,
"wavyLine": true,
"dashboardPersistTabs": true,
"dashboardMaxPersistentTabs": 2
}
Loading
Loading