From 2c2805abc3dc41ecfb6c48d3707d23423568c5a2 Mon Sep 17 00:00:00 2001 From: Freya Murphy Date: Fri, 9 Jan 2026 15:15:49 -0500 Subject: remove more stuffff --- README.md | 752 +-------------------- assets/wrap_term_launch.sh | 5 - config/BackgroundConfig.qml | 31 - config/Config.qml | 27 - config/LauncherConfig.qml | 3 - config/UtilitiesConfig.qml | 1 - modules/areapicker/AreaPicker.qml | 124 ---- modules/background/Background.qml | 97 --- modules/background/Wallpaper.qml | 40 +- modules/controlcenter/PaneRegistry.qml | 18 - modules/controlcenter/Panes.qml | 17 +- .../appearance/sections/AnimationsSection.qml | 42 -- .../appearance/sections/BorderSection.qml | 63 -- .../appearance/sections/ColorVariantSection.qml | 92 --- .../appearance/sections/ScalesSection.qml | 84 --- .../appearance/sections/ThemeModeSection.qml | 24 - .../appearance/sections/TransparencySection.qml | 74 -- modules/controlcenter/launcher/Settings.qml | 167 ----- .../controlcenter/taskbar/ConnectedButtonGroup.qml | 109 --- modules/launcher/services/Apps.qml | 2 +- modules/utilities/cards/Toggles.qml | 6 - nix/default.nix | 3 - services/Colours.qml | 2 +- services/GameMode.qml | 76 --- services/Wallpapers.qml | 45 -- shell.qml | 2 - 26 files changed, 14 insertions(+), 1892 deletions(-) delete mode 100755 assets/wrap_term_launch.sh delete mode 100644 modules/areapicker/AreaPicker.qml delete mode 100644 modules/controlcenter/appearance/sections/AnimationsSection.qml delete mode 100644 modules/controlcenter/appearance/sections/BorderSection.qml delete mode 100644 modules/controlcenter/appearance/sections/ColorVariantSection.qml delete mode 100644 modules/controlcenter/appearance/sections/ScalesSection.qml delete mode 100644 modules/controlcenter/appearance/sections/ThemeModeSection.qml delete mode 100644 modules/controlcenter/appearance/sections/TransparencySection.qml delete mode 100644 modules/controlcenter/launcher/Settings.qml delete mode 100644 modules/controlcenter/taskbar/ConnectedButtonGroup.qml delete mode 100644 services/GameMode.qml delete mode 100644 services/Wallpapers.qml diff --git a/README.md b/README.md index bd26101..17ca98d 100644 --- a/README.md +++ b/README.md @@ -1,751 +1,5 @@ -

caelestia-shell

+# Caelestia shell -
+This is a HARD fork of the caelestia shell with MANY modifications. -![GitHub last commit](https://img.shields.io/github/last-commit/caelestia-dots/shell?style=for-the-badge&labelColor=101418&color=9ccbfb) -![GitHub Repo stars](https://img.shields.io/github/stars/caelestia-dots/shell?style=for-the-badge&labelColor=101418&color=b9c8da) -![GitHub repo size](https://img.shields.io/github/repo-size/caelestia-dots/shell?style=for-the-badge&labelColor=101418&color=d3bfe6) -[![Ko-Fi donate](https://img.shields.io/badge/donate-kofi?style=for-the-badge&logo=ko-fi&logoColor=ffffff&label=ko-fi&labelColor=101418&color=f16061&link=https%3A%2F%2Fko-fi.com%2Fsoramane)](https://ko-fi.com/soramane) -[![Discord invite](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fdiscordapp.com%2Fapi%2Finvites%2FBGDCFCmMBk%3Fwith_counts%3Dtrue&query=approximate_member_count&style=for-the-badge&logo=discord&logoColor=ffffff&label=discord&labelColor=101418&color=96f1f1&link=https%3A%2F%2Fdiscord.gg%2FBGDCFCmMBk)](https://discord.gg/BGDCFCmMBk) - -
- -https://github.com/user-attachments/assets/0840f496-575c-4ca6-83a8-87bb01a85c5f - -## Components - -- Widgets: [`Quickshell`](https://quickshell.outfoxxed.me) -- Window manager: [`Hyprland`](https://hyprland.org) -- Dots: [`caelestia`](https://github.com/caelestia-dots) - -## Installation - -> [!NOTE] -> This repo is for the desktop shell of the caelestia dots. If you want installation instructions -> for the entire dots, head to [the main repo](https://github.com/caelestia-dots/caelestia) instead. - -### Arch linux - -> [!NOTE] -> If you want to make your own changes/tweaks to the shell do NOT edit the files installed by the AUR -> package. Instead, follow the instructions in the [manual installation section](#manual-installation). - -The shell is available from the AUR as `caelestia-shell`. You can install it with an AUR helper -like [`yay`](https://github.com/Jguer/yay) or manually downloading the PKGBUILD and running `makepkg -si`. - -A package following the latest commit also exists as `caelestia-shell-git`. This is bleeding edge -and likely to be unstable/have bugs. Regular users are recommended to use the stable package -(`caelestia-shell`). - -### Nix - -You can run the shell directly via `nix run`: - -```sh -nix run github:caelestia-dots/shell -``` - -Or add it to your system configuration: - -```nix -{ - inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - - caelestia-shell = { - url = "github:caelestia-dots/shell"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - }; -} -``` - -The package is available as `caelestia-shell.packages..default`, which can be added to your -`environment.systemPackages`, `users.users..packages`, `home.packages` if using home-manager, -or a devshell. The shell can then be run via `caelestia-shell`. - -> [!TIP] -> The default package does not have the CLI enabled by default, which is required for full funcionality. -> To enable the CLI, use the `with-cli` package. - -For home-manager, you can also use the Caelestia's home manager module (explained in [configuring](https://github.com/caelestia-dots/shell?tab=readme-ov-file#home-manager-module)) that installs and configures the shell and the CLI. - -### Manual installation - -Dependencies: - -- [`caelestia-cli`](https://github.com/caelestia-dots/cli) -- [`quickshell-git`](https://quickshell.outfoxxed.me) - this has to be the git version, not the latest tagged version -- [`ddcutil`](https://github.com/rockowitz/ddcutil) -- [`brightnessctl`](https://github.com/Hummer12007/brightnessctl) -- [`app2unit`](https://github.com/Vladimir-csp/app2unit) -- [`libcava`](https://github.com/LukashonakV/cava) -- [`networkmanager`](https://networkmanager.dev) -- [`lm-sensors`](https://github.com/lm-sensors/lm-sensors) -- [`fish`](https://github.com/fish-shell/fish-shell) -- [`aubio`](https://github.com/aubio/aubio) -- [`libpipewire`](https://pipewire.org) -- `glibc` -- `qt6-declarative` -- `gcc-libs` -- [`material-symbols`](https://fonts.google.com/icons) -- [`caskaydia-cove-nerd`](https://www.nerdfonts.com/font-downloads) -- [`swappy`](https://github.com/jtheoof/swappy) -- [`libqalculate`](https://github.com/Qalculate/libqalculate) -- [`bash`](https://www.gnu.org/software/bash) -- `qt6-base` -- `qt6-declarative` - -Build dependencies: - -- [`cmake`](https://cmake.org) -- [`ninja`](https://github.com/ninja-build/ninja) - -To install the shell manually, install all dependencies and clone this repo to `$XDG_CONFIG_HOME/quickshell/caelestia`. -Then simply build and install using `cmake`. - -```sh -cd $XDG_CONFIG_HOME/quickshell -git clone https://github.com/caelestia-dots/shell.git caelestia - -cd caelestia -cmake -B build -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/ -cmake --build build -sudo cmake --install build -``` - -> [!TIP] -> You can customise the installation location via the `cmake` flags `INSTALL_LIBDIR`, `INSTALL_QMLDIR` and -> `INSTALL_QSCONFDIR` for the libraries (the beat detector), QML plugin and Quickshell config directories -> respectively. If changing the library directory, remember to set the `CAELESTIA_LIB_DIR` environment -> variable to the custom directory when launching the shell. -> -> e.g. installing to `~/.config/quickshell/caelestia` for easy local changes: -> -> ```sh -> mkdir -p ~/.config/quickshell/caelestia -> cmake -B build -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/ -DINSTALL_QSCONFDIR=~/.config/quickshell/caelestia -> cmake --build build -> sudo cmake --install build -> sudo chown -R $USER ~/.config/quickshell/caelestia -> ``` - -## Usage - -The shell can be started via the `caelestia shell -d` command or `qs -c caelestia`. -If the entire caelestia dots are installed, the shell will be autostarted on login -via an `exec-once` in the hyprland config. - -### Shortcuts/IPC - -All keybinds are accessible via Hyprland [global shortcuts](https://wiki.hyprland.org/Configuring/Binds/#dbus-global-shortcuts). -If using the entire caelestia dots, the keybinds are already configured for you. -Otherwise, [this file](https://github.com/caelestia-dots/caelestia/blob/main/hypr/hyprland/keybinds.conf#L1-L39) -contains an example on how to use global shortcuts. - -All IPC commands can be accessed via `caelestia shell ...`. For example - -```sh -caelestia shell mpris getActive trackTitle -``` - -The list of IPC commands can be shown via `caelestia shell -s`: - -``` -$ caelestia shell -s -target drawers - function toggle(drawer: string): void - function list(): string -target notifs - function clear(): void -target lock - function lock(): void - function unlock(): void - function isLocked(): bool -target mpris - function playPause(): void - function getActive(prop: string): string - function next(): void - function stop(): void - function play(): void - function list(): string - function pause(): void - function previous(): void -target picker - function openFreeze(): void - function open(): void -target wallpaper - function set(path: string): void - function get(): string - function list(): string -``` - -### PFP/Wallpapers - -The profile picture for the dashboard is read from the file `~/.face`, so to set -it you can copy your image to there or set it via the dashboard. - -The wallpapers for the wallpaper switcher are read from `~/Pictures/Wallpapers` -by default. To change it, change the wallpapers path in `~/.config/caelestia/shell.json`. - -To set the wallpaper, you can use the command `caelestia wallpaper`. Use `caelestia wallpaper -h` for more info about -the command. - -## Updating - -If installed via the AUR package, simply update your system (e.g. using `yay`). - -If installed manually, you can update by running `git pull` in `$XDG_CONFIG_HOME/quickshell/caelestia`. - -```sh -cd $XDG_CONFIG_HOME/quickshell/caelestia -git pull -``` - -## Configuring - -All configuration options should be put in `~/.config/caelestia/shell.json`. This file is _not_ created by -default, you must create it manually. - -### Example configuration - -> [!NOTE] -> The example configuration only includes recommended configuration options. For more advanced customisation -> such as modifying the size of individual items or changing constants in the code, there are some other -> options which can be found in the source files in the `config` directory. - -
Example - -```json -{ - "appearance": { - "anim": { - "durations": { - "scale": 1 - } - }, - "font": { - "family": { - "clock": "Rubik", - "material": "Material Symbols Rounded", - "mono": "CaskaydiaCove NF", - "sans": "Rubik" - }, - "size": { - "scale": 1 - } - }, - "padding": { - "scale": 1 - }, - "rounding": { - "scale": 1 - }, - "spacing": { - "scale": 1 - }, - "transparency": { - "enabled": false, - "base": 0.85, - "layers": 0.4 - } - }, - "general": { - "apps": { - "terminal": ["foot"], - "audio": ["pavucontrol"], - "playback": ["mpv"], - "explorer": ["thunar"] - }, - "battery": { - "warnLevels": [ - { - "level": 20, - "title": "Low battery", - "message": "You might want to plug in a charger", - "icon": "battery_android_frame_2" - }, - { - "level": 10, - "title": "Did you see the previous message?", - "message": "You should probably plug in a charger now", - "icon": "battery_android_frame_1" - }, - { - "level": 5, - "title": "Critical battery level", - "message": "PLUG THE CHARGER RIGHT NOW!!", - "icon": "battery_android_alert", - "critical": true - } - ], - "criticalLevel": 3 - }, - "idle": { - "lockBeforeSleep": true, - "inhibitWhenAudio": true, - "timeouts": [ - { - "timeout": 180, - "idleAction": "lock" - }, - { - "timeout": 300, - "idleAction": "dpms off", - "returnAction": "dpms on" - }, - { - "timeout": 600, - "idleAction": ["systemctl", "suspend-then-hibernate"] - } - ] - } - }, - "background": { - "desktopClock": { - "enabled": false, - "scale": 1.0, - "position": "bottom-right", - "shadow": { - "enabled": true, - "opacity": 0.7, - "blur": 0.4 - }, - "background": { - "enabled": false, - "opacity": 0.7, - "blur": true - }, - "invertColors": false - }, - "enabled": true, - "visualiser": { - "blur": false, - "enabled": false, - "autoHide": true, - "rounding": 1, - "spacing": 1 - } - }, - "bar": { - "clock": { - "showIcon": true - }, - "dragThreshold": 20, - "entries": [ - { - "id": "logo", - "enabled": true - }, - { - "id": "workspaces", - "enabled": true - }, - { - "id": "spacer", - "enabled": true - }, - { - "id": "activeWindow", - "enabled": true - }, - { - "id": "spacer", - "enabled": true - }, - { - "id": "tray", - "enabled": true - }, - { - "id": "clock", - "enabled": true - }, - { - "id": "statusIcons", - "enabled": true - }, - { - "id": "power", - "enabled": true - } - ], - "persistent": true, - "popouts": { - "activeWindow": true, - "statusIcons": true, - "tray": true - }, - "scrollActions": { - "brightness": true, - "workspaces": true, - "volume": true - }, - "showOnHover": true, - "status": { - "showAudio": false, - "showBattery": true, - "showBluetooth": true, - "showKbLayout": false, - "showMicrophone": false, - "showNetwork": true, - "showLockStatus": true - }, - "tray": { - "background": false, - "compact": false, - "iconSubs": [], - "recolour": false - }, - "workspaces": { - "activeIndicator": true, - "activeLabel": "󰮯", - "activeTrail": false, - "label": " ", - "occupiedBg": false, - "occupiedLabel": "󰮯", - "perMonitorWorkspaces": true, - "showWindows": true, - "shown": 5, - "specialWorkspaceIcons": [ - { - "name": "steam", - "icon": "sports_esports" - } - ] - }, - "excludedScreens": [""], - "activeWindow": { - "inverted": false - } - }, - "border": { - "rounding": 25, - "thickness": 10 - }, - "dashboard": { - "enabled": true, - "dragThreshold": 50, - "mediaUpdateInterval": 500, - "showOnHover": true - }, - "launcher": { - "actionPrefix": ">", - "actions": [ - { - "name": "Calculator", - "icon": "calculate", - "description": "Do simple math equations (powered by Qalc)", - "command": ["autocomplete", "calc"], - "enabled": true, - "dangerous": false - }, - { - "name": "Scheme", - "icon": "palette", - "description": "Change the current colour scheme", - "command": ["autocomplete", "scheme"], - "enabled": true, - "dangerous": false - }, - { - "name": "Wallpaper", - "icon": "image", - "description": "Change the current wallpaper", - "command": ["autocomplete", "wallpaper"], - "enabled": true, - "dangerous": false - }, - { - "name": "Variant", - "icon": "colors", - "description": "Change the current scheme variant", - "command": ["autocomplete", "variant"], - "enabled": true, - "dangerous": false - }, - { - "name": "Transparency", - "icon": "opacity", - "description": "Change shell transparency", - "command": ["autocomplete", "transparency"], - "enabled": false, - "dangerous": false - }, - { - "name": "Random", - "icon": "casino", - "description": "Switch to a random wallpaper", - "command": ["caelestia", "wallpaper", "-r"], - "enabled": true, - "dangerous": false - }, - { - "name": "Light", - "icon": "light_mode", - "description": "Change the scheme to light mode", - "command": ["setMode", "light"], - "enabled": true, - "dangerous": false - }, - { - "name": "Dark", - "icon": "dark_mode", - "description": "Change the scheme to dark mode", - "command": ["setMode", "dark"], - "enabled": true, - "dangerous": false - }, - { - "name": "Shutdown", - "icon": "power_settings_new", - "description": "Shutdown the system", - "command": ["systemctl", "poweroff"], - "enabled": true, - "dangerous": true - }, - { - "name": "Reboot", - "icon": "cached", - "description": "Reboot the system", - "command": ["systemctl", "reboot"], - "enabled": true, - "dangerous": true - }, - { - "name": "Logout", - "icon": "exit_to_app", - "description": "Log out of the current session", - "command": ["loginctl", "terminate-user", ""], - "enabled": true, - "dangerous": true - }, - { - "name": "Lock", - "icon": "lock", - "description": "Lock the current session", - "command": ["loginctl", "lock-session"], - "enabled": true, - "dangerous": false - }, - { - "name": "Sleep", - "icon": "bedtime", - "description": "Suspend then hibernate", - "command": ["systemctl", "suspend-then-hibernate"], - "enabled": true, - "dangerous": false - }, - { - "name": "Settings", - "icon": "settings", - "description": "Configure the shell", - "command": ["caelestia", "shell", "controlCenter", "open"], - "enabled": true, - "dangerous": false - } - ], - "dragThreshold": 50, - "vimKeybinds": false, - "enableDangerousActions": false, - "maxShown": 7, - "maxWallpapers": 9, - "specialPrefix": "@", - "useFuzzy": { - "apps": false, - "actions": false, - "schemes": false, - "variants": false, - "wallpapers": false - }, - "showOnHover": false, - "hiddenApps": [] - }, - "lock": { - "recolourLogo": false - }, - "notifs": { - "actionOnClick": false, - "clearThreshold": 0.3, - "defaultExpireTimeout": 5000, - "expandThreshold": 20, - "openExpanded": false, - "expire": false - }, - "osd": { - "enabled": true, - "enableBrightness": true, - "enableMicrophone": false, - "hideDelay": 2000 - }, - "paths": { - "mediaGif": "root:/assets/bongocat.gif", - "sessionGif": "root:/assets/kurukuru.gif", - "wallpaperDir": "~/Pictures/Wallpapers" - }, - "services": { - "audioIncrement": 0.1, - "brightnessIncrement": 0.1, - "maxVolume": 1.0, - "defaultPlayer": "Spotify", - "gpuType": "", - "playerAliases": [{ "from": "com.github.th_ch.youtube_music", "to": "YT Music" }], - "weatherLocation": "", - "useFahrenheit": false, - "useTwelveHourClock": false, - "smartScheme": true, - "visualiserBars": 45 - }, - "session": { - "dragThreshold": 30, - "enabled": true, - "vimKeybinds": false, - "commands": { - "logout": ["loginctl", "terminate-user", ""], - "shutdown": ["systemctl", "poweroff"], - "hibernate": ["systemctl", "hibernate"], - "reboot": ["systemctl", "reboot"] - } - }, - "sidebar": { - "dragThreshold": 80, - "enabled": true - }, - "utilities": { - "enabled": true, - "maxToasts": 4, - "toasts": { - "audioInputChanged": true, - "audioOutputChanged": true, - "capsLockChanged": true, - "chargingChanged": true, - "configLoaded": true, - "dndChanged": true, - "gameModeChanged": true, - "kbLayoutChanged": true, - "kbLimit": true, - "numLockChanged": true, - "vpnChanged": true, - "nowPlaying": false - }, - "vpn": { - "enabled": true, - "provider": [ - { - "name": "wireguard", - "interface": "your-connection-name", - "displayName": "Wireguard (Your VPN)", - "enabled": false - } - ] - } - } -} -``` - -
- -### Home Manager Module - -For NixOS users, a home manager module is also available. - -
home.nix - -```nix -programs.caelestia = { - enable = true; - systemd = { - enable = false; # if you prefer starting from your compositor - target = "graphical-session.target"; - environment = []; - }; - settings = { - bar.status = { - showBattery = false; - }; - paths.wallpaperDir = "~/Images"; - }; - cli = { - enable = true; # Also add caelestia-cli to path - settings = { - theme.enableGtk = false; - }; - }; -}; -``` - -The module automatically adds Caelestia shell to the path with **full functionality**. The CLI is not required, however you have the option to enable and configure it. - -
- -## FAQ - -### Need help or support? - -You can join the community Discord server for assistance and discussion: -https://discord.gg/BGDCFCmMBk - -### My screen is flickering, help pls! - -Try disabling VRR in the hyprland config. You can do this by adding the following to `~/.config/caelestia/hypr-user.conf`: - -```conf -misc { - vrr = 0 -} -``` - -### I want to make my own changes to the hyprland config! - -You can add your custom hyprland configs to `~/.config/caelestia/hypr-user.conf`. - -### I want to make my own changes to other stuff! - -See the [manual installation](https://github.com/caelestia-dots/shell?tab=readme-ov-file#manual-installation) section -for the corresponding repo. - -### I want to disable XXX feature! - -Please read the [configuring](https://github.com/caelestia-dots/shell?tab=readme-ov-file#configuring) section in the readme. -If there is no corresponding option, make feature request. - -### How do I make my colour scheme change with my wallpaper? - -Set a wallpaper via the launcher or `caelestia wallpaper` and set the scheme to the dynamic scheme via the launcher -or `caelestia scheme set`. e.g. - -```sh -caelestia wallpaper -f -caelestia scheme set -n dynamic -``` - -### My wallpapers aren't showing up in the launcher! - -The launcher pulls wallpapers from `~/Pictures/Wallpapers` by default. You can change this in the config. Additionally, -the launcher only shows an odd number of wallpapers at one time. If you only have 2 wallpapers, consider getting more -(or just putting one). - -## Credits - -Thanks to the Hyprland discord community (especially the homies in #rice-discussion) for all the help and suggestions -for improving these dots! - -A special thanks to [@outfoxxed](https://github.com/outfoxxed) for making Quickshell and the effort put into fixing issues -and implementing various feature requests. - -Another special thanks to [@end_4](https://github.com/end-4) for his [config](https://github.com/end-4/dots-hyprland) -which helped me a lot with learning how to use Quickshell. - -Finally another thank you to all the configs I took inspiration from (only one for now): - -- [Axenide/Ax-Shell](https://github.com/Axenide/Ax-Shell) - -## Stonks 📈 - - - - - - Star History Chart - - +See the origional [here](https://github.com/caelestia-dots/shell). diff --git a/assets/wrap_term_launch.sh b/assets/wrap_term_launch.sh deleted file mode 100755 index caf60c7..0000000 --- a/assets/wrap_term_launch.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env sh - -cat ~/.local/state/caelestia/sequences.txt 2>/dev/null - -exec "$@" diff --git a/config/BackgroundConfig.qml b/config/BackgroundConfig.qml index b8a8ad9..9bcca87 100644 --- a/config/BackgroundConfig.qml +++ b/config/BackgroundConfig.qml @@ -2,35 +2,4 @@ import Quickshell.Io JsonObject { property bool enabled: true - property DesktopClock desktopClock: DesktopClock {} - property Visualiser visualiser: Visualiser {} - - component DesktopClock: JsonObject { - property bool enabled: false - property real scale: 1.0 - property string position: "bottom-right" - property bool invertColors: false - property DesktopClockBackground background: DesktopClockBackground {} - property DesktopClockShadow shadow: DesktopClockShadow {} - } - - component DesktopClockBackground: JsonObject { - property bool enabled: false - property real opacity: 0.7 - property bool blur: true - } - - component DesktopClockShadow: JsonObject { - property bool enabled: true - property real opacity: 0.7 - property real blur: 0.4 - } - - component Visualiser: JsonObject { - property bool enabled: false - property bool autoHide: true - property bool blur: false - property real rounding: 1 - property real spacing: 1 - } } diff --git a/config/Config.qml b/config/Config.qml index b5e89f9..8988f90 100644 --- a/config/Config.qml +++ b/config/Config.qml @@ -148,29 +148,6 @@ Singleton { function serializeBackground(): var { return { enabled: background.enabled, - desktopClock: { - enabled: background.desktopClock.enabled, - scale: background.desktopClock.scale, - position: background.desktopClock.position, - invertColors: background.desktopClock.invertColors, - background: { - enabled: background.desktopClock.background.enabled, - opacity: background.desktopClock.background.opacity, - blur: background.desktopClock.background.blur - }, - shadow: { - enabled: background.desktopClock.shadow.enabled, - opacity: background.desktopClock.shadow.opacity, - blur: background.desktopClock.shadow.blur - } - }, - visualiser: { - enabled: background.visualiser.enabled, - autoHide: background.visualiser.autoHide, - blur: background.visualiser.blur, - rounding: background.visualiser.rounding, - spacing: background.visualiser.spacing - } }; } @@ -286,9 +263,6 @@ Singleton { hiddenApps: launcher.hiddenApps, useFuzzy: { apps: launcher.useFuzzy.apps, - schemes: launcher.useFuzzy.schemes, - variants: launcher.useFuzzy.variants, - wallpapers: launcher.useFuzzy.wallpapers }, sizes: { itemWidth: launcher.sizes.itemWidth, @@ -378,7 +352,6 @@ Singleton { toasts: { configLoaded: utilities.toasts.configLoaded, chargingChanged: utilities.toasts.chargingChanged, - gameModeChanged: utilities.toasts.gameModeChanged, dndChanged: utilities.toasts.dndChanged, audioOutputChanged: utilities.toasts.audioOutputChanged, audioInputChanged: utilities.toasts.audioInputChanged, diff --git a/config/LauncherConfig.qml b/config/LauncherConfig.qml index 896882f..6ab44d1 100644 --- a/config/LauncherConfig.qml +++ b/config/LauncherConfig.qml @@ -13,9 +13,6 @@ JsonObject { component UseFuzzy: JsonObject { property bool apps: false - property bool schemes: false - property bool variants: false - property bool wallpapers: false } component Sizes: JsonObject { diff --git a/config/UtilitiesConfig.qml b/config/UtilitiesConfig.qml index cf46446..0840886 100644 --- a/config/UtilitiesConfig.qml +++ b/config/UtilitiesConfig.qml @@ -16,7 +16,6 @@ JsonObject { component Toasts: JsonObject { property bool configLoaded: true property bool chargingChanged: true - property bool gameModeChanged: true property bool dndChanged: true property bool audioOutputChanged: true property bool audioInputChanged: true diff --git a/modules/areapicker/AreaPicker.qml b/modules/areapicker/AreaPicker.qml deleted file mode 100644 index 0d8b2fe..0000000 --- a/modules/areapicker/AreaPicker.qml +++ /dev/null @@ -1,124 +0,0 @@ -pragma ComponentBehavior: Bound - -import qs.components.containers -import qs.components.misc -import Quickshell -import Quickshell.Wayland -import Quickshell.Io - -Scope { - LazyLoader { - id: root - - property bool freeze - property bool closing - property bool clipboardOnly - - Variants { - model: Quickshell.screens - - StyledWindow { - id: win - - required property ShellScreen modelData - - screen: modelData - name: "area-picker" - WlrLayershell.exclusionMode: ExclusionMode.Ignore - WlrLayershell.layer: WlrLayer.Overlay - WlrLayershell.keyboardFocus: root.closing ? WlrKeyboardFocus.None : WlrKeyboardFocus.Exclusive - mask: root.closing ? empty : null - - anchors.top: true - anchors.bottom: true - anchors.left: true - anchors.right: true - - Region { - id: empty - } - - Picker { - loader: root - screen: win.modelData - } - } - } - } - - IpcHandler { - target: "picker" - - function open(): void { - root.freeze = false; - root.closing = false; - root.clipboardOnly = false; - root.activeAsync = true; - } - - function openFreeze(): void { - root.freeze = true; - root.closing = false; - root.clipboardOnly = false; - root.activeAsync = true; - } - - function openClip(): void { - root.freeze = false; - root.closing = false; - root.clipboardOnly = true; - root.activeAsync = true; - } - - function openFreezeClip(): void { - root.freeze = true; - root.closing = false; - root.clipboardOnly = true; - root.activeAsync = true; - } - } - - CustomShortcut { - name: "screenshot" - description: "Open screenshot tool" - onPressed: { - root.freeze = false; - root.closing = false; - root.clipboardOnly = false; - root.activeAsync = true; - } - } - - CustomShortcut { - name: "screenshotFreeze" - description: "Open screenshot tool (freeze mode)" - onPressed: { - root.freeze = true; - root.closing = false; - root.clipboardOnly = false; - root.activeAsync = true; - } - } - - CustomShortcut { - name: "screenshotClip" - description: "Open screenshot tool (clipboard)" - onPressed: { - root.freeze = false; - root.closing = false; - root.clipboardOnly = true; - root.activeAsync = true; - } - } - - CustomShortcut { - name: "screenshotFreezeClip" - description: "Open screenshot tool (freeze mode, clipboard)" - onPressed: { - root.freeze = true; - root.closing = false; - root.clipboardOnly = true; - root.activeAsync = true; - } - } -} diff --git a/modules/background/Background.qml b/modules/background/Background.qml index 69e070b..e7b73ab 100644 --- a/modules/background/Background.qml +++ b/modules/background/Background.qml @@ -45,103 +45,6 @@ Loader { wallpaper: wallpaper } } - - - Loader { - id: clockLoader - active: Config.background.desktopClock.enabled - - anchors.margins: Appearance.padding.large * 2 - anchors.leftMargin: Appearance.padding.large * 2 + Config.bar.sizes.innerWidth + Math.max(Appearance.padding.smaller, Config.border.thickness) - - state: Config.background.desktopClock.position - states: [ - State { - name: "top-left" - AnchorChanges { - target: clockLoader - anchors.top: parent.top - anchors.left: parent.left - } - }, - State { - name: "top-center" - AnchorChanges { - target: clockLoader - anchors.top: parent.top - anchors.horizontalCenter: parent.horizontalCenter - } - }, - State { - name: "top-right" - AnchorChanges { - target: clockLoader - anchors.top: parent.top - anchors.right: parent.right } - }, - State { - name: "middle-left" - AnchorChanges { - target: clockLoader - anchors.verticalCenter: parent.verticalCenter - anchors.left: parent.left - } - }, - State { - name: "middle-center" - AnchorChanges { - target: clockLoader - anchors.verticalCenter: parent.verticalCenter - anchors.horizontalCenter: parent.horizontalCenter - } - }, - State { - name: "middle-right" - AnchorChanges { - target: clockLoader - anchors.verticalCenter: parent.verticalCenter - anchors.right: parent.right - } - }, - State { - name: "bottom-left" - AnchorChanges { - target: clockLoader - anchors.bottom: parent.bottom - anchors.left: parent.left - } - }, - State { - name: "bottom-center" - AnchorChanges { - target: clockLoader - anchors.bottom: parent.bottom - anchors.horizontalCenter: parent.horizontalCenter - } - }, - State { - name: "bottom-right" - AnchorChanges { - target: clockLoader - anchors.bottom: parent.bottom - anchors.right: parent.right - } - } - ] - - transitions: Transition { - AnchorAnimation { - duration: Appearance.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial - } - } - - sourceComponent: DesktopClock { - wallpaper: behindClock - absX: clockLoader.x - absY: clockLoader.y - } - } } } } diff --git a/modules/background/Wallpaper.qml b/modules/background/Wallpaper.qml index b5d7d4a..9b91530 100644 --- a/modules/background/Wallpaper.qml +++ b/modules/background/Wallpaper.qml @@ -11,7 +11,7 @@ import QtQuick Item { id: root - property string source: Wallpapers.current + property string source: Paths.wallpaper property Image current: one anchors.fill: parent @@ -58,42 +58,6 @@ Item { font.pointSize: Appearance.font.size.extraLarge * 2 font.bold: true } - - StyledRect { - implicitWidth: selectWallText.implicitWidth + Appearance.padding.large * 2 - implicitHeight: selectWallText.implicitHeight + Appearance.padding.small * 2 - - radius: Appearance.rounding.full - color: Colours.palette.m3primary - - FileDialog { - id: dialog - - title: qsTr("Select a wallpaper") - filterLabel: qsTr("Image files") - filters: Images.validImageExtensions - onAccepted: path => Wallpapers.setWallpaper(path) - } - - StateLayer { - radius: parent.radius - color: Colours.palette.m3onPrimary - - function onClicked(): void { - dialog.open(); - } - } - - StyledText { - id: selectWallText - - anchors.centerIn: parent - - text: qsTr("Set it now!") - color: Colours.palette.m3onPrimary - font.pointSize: Appearance.font.size.large - } - } } } } @@ -120,7 +84,7 @@ Item { anchors.fill: parent opacity: 0 - scale: Wallpapers.showPreview ? 1 : 0.8 + scale: 0.8 onStatusChanged: { if (status === Image.Ready) diff --git a/modules/controlcenter/PaneRegistry.qml b/modules/controlcenter/PaneRegistry.qml index d8bf45e..377027c 100644 --- a/modules/controlcenter/PaneRegistry.qml +++ b/modules/controlcenter/PaneRegistry.qml @@ -24,24 +24,6 @@ QtObject { readonly property string icon: "volume_up" readonly property string component: "audio/AudioPane.qml" }, - QtObject { - readonly property string id: "appearance" - readonly property string label: "appearance" - readonly property string icon: "palette" - readonly property string component: "appearance/AppearancePane.qml" - }, - QtObject { - readonly property string id: "taskbar" - readonly property string label: "taskbar" - readonly property string icon: "task_alt" - readonly property string component: "taskbar/TaskbarPane.qml" - }, - QtObject { - readonly property string id: "launcher" - readonly property string label: "launcher" - readonly property string icon: "apps" - readonly property string component: "launcher/LauncherPane.qml" - } ] readonly property int count: panes.length diff --git a/modules/controlcenter/Panes.qml b/modules/controlcenter/Panes.qml index c239b91..03f74be 100644 --- a/modules/controlcenter/Panes.qml +++ b/modules/controlcenter/Panes.qml @@ -3,9 +3,6 @@ pragma ComponentBehavior: Bound import "bluetooth" import "network" import "audio" -import "appearance" -import "taskbar" -import "launcher" import qs.components import qs.services import qs.config @@ -103,7 +100,7 @@ ClippingRectangle { implicitHeight: root.height property bool hasBeenLoaded: false - + function updateActive(): void { const diff = Math.abs(root.session.activeIndex - pane.paneIndex); const isActivePane = diff === 0; @@ -130,37 +127,37 @@ ClippingRectangle { anchors.fill: parent clip: false active: false - + Component.onCompleted: { Qt.callLater(pane.updateActive); } - + onActiveChanged: { if (active && !pane.hasBeenLoaded) { pane.hasBeenLoaded = true; } - + if (active && !item) { loader.setSource(pane.componentPath, { "session": root.session }); } } - + onItemChanged: { if (item) { pane.hasBeenLoaded = true; } } } - + Connections { target: root.session function onActiveIndexChanged(): void { pane.updateActive(); } } - + Connections { target: layout function onInitialOpeningCompleteChanged(): void { diff --git a/modules/controlcenter/appearance/sections/AnimationsSection.qml b/modules/controlcenter/appearance/sections/AnimationsSection.qml deleted file mode 100644 index 03fc2b1..0000000 --- a/modules/controlcenter/appearance/sections/AnimationsSection.qml +++ /dev/null @@ -1,42 +0,0 @@ -pragma ComponentBehavior: Bound - -import ".." -import "../../components" -import qs.components -import qs.components.controls -import qs.components.containers -import qs.services -import qs.config -import QtQuick -import QtQuick.Layouts - -CollapsibleSection { - id: root - - required property var rootPane - - title: qsTr("Animations") - showBackground: true - - SectionContainer { - contentSpacing: Appearance.spacing.normal - - SliderInput { - Layout.fillWidth: true - - label: qsTr("Animation duration scale") - value: rootPane.animDurationsScale - from: 0.1 - to: 5.0 - decimals: 1 - suffix: "×" - validator: DoubleValidator { bottom: 0.1; top: 5.0 } - - onValueModified: (newValue) => { - rootPane.animDurationsScale = newValue; - rootPane.saveConfig(); - } - } - } -} - diff --git a/modules/controlcenter/appearance/sections/BorderSection.qml b/modules/controlcenter/appearance/sections/BorderSection.qml deleted file mode 100644 index dae26c3..0000000 --- a/modules/controlcenter/appearance/sections/BorderSection.qml +++ /dev/null @@ -1,63 +0,0 @@ -pragma ComponentBehavior: Bound - -import ".." -import "../../components" -import qs.components -import qs.components.controls -import qs.components.containers -import qs.services -import qs.config -import QtQuick -import QtQuick.Layouts - -CollapsibleSection { - id: root - - required property var rootPane - - title: qsTr("Border") - showBackground: true - - SectionContainer { - contentSpacing: Appearance.spacing.normal - - SliderInput { - Layout.fillWidth: true - - label: qsTr("Border rounding") - value: rootPane.borderRounding - from: 0.1 - to: 100 - decimals: 1 - suffix: "px" - validator: DoubleValidator { bottom: 0.1; top: 100 } - - onValueModified: (newValue) => { - rootPane.borderRounding = newValue; - rootPane.saveConfig(); - } - } - } - - SectionContainer { - contentSpacing: Appearance.spacing.normal - - SliderInput { - Layout.fillWidth: true - - label: qsTr("Border thickness") - value: rootPane.borderThickness - from: 0.1 - to: 100 - decimals: 1 - suffix: "px" - validator: DoubleValidator { bottom: 0.1; top: 100 } - - onValueModified: (newValue) => { - rootPane.borderThickness = newValue; - rootPane.saveConfig(); - } - } - } -} - diff --git a/modules/controlcenter/appearance/sections/ColorVariantSection.qml b/modules/controlcenter/appearance/sections/ColorVariantSection.qml deleted file mode 100644 index 98c3d7c..0000000 --- a/modules/controlcenter/appearance/sections/ColorVariantSection.qml +++ /dev/null @@ -1,92 +0,0 @@ -pragma ComponentBehavior: Bound - -import ".." -import "../../../launcher/services" -import qs.components -import qs.components.controls -import qs.components.containers -import qs.services -import qs.config -import Quickshell -import QtQuick -import QtQuick.Layouts - -CollapsibleSection { - title: qsTr("Color variant") - description: qsTr("Material theme variant") - showBackground: true - - ColumnLayout { - Layout.fillWidth: true - spacing: Appearance.spacing.small / 2 - - Repeater { - model: M3Variants.list - - delegate: StyledRect { - required property var modelData - - Layout.fillWidth: true - - color: Qt.alpha(Colours.tPalette.m3surfaceContainer, modelData.variant === Schemes.currentVariant ? Colours.tPalette.m3surfaceContainer.a : 0) - radius: Appearance.rounding.normal - border.width: modelData.variant === Schemes.currentVariant ? 1 : 0 - border.color: Colours.palette.m3primary - - StateLayer { - function onClicked(): void { - const variant = modelData.variant; - - Schemes.currentVariant = variant; - Quickshell.execDetached(["caelestia", "scheme", "set", "-v", variant]); - - Qt.callLater(() => { - reloadTimer.restart(); - }); - } - } - - Timer { - id: reloadTimer - interval: 300 - onTriggered: { - Schemes.reload(); - } - } - - RowLayout { - id: variantRow - - anchors.left: parent.left - anchors.right: parent.right - anchors.verticalCenter: parent.verticalCenter - anchors.margins: Appearance.padding.normal - - spacing: Appearance.spacing.normal - - MaterialIcon { - text: modelData.icon - font.pointSize: Appearance.font.size.large - fill: modelData.variant === Schemes.currentVariant ? 1 : 0 - } - - StyledText { - Layout.fillWidth: true - text: modelData.name - font.weight: modelData.variant === Schemes.currentVariant ? 500 : 400 - } - - MaterialIcon { - visible: modelData.variant === Schemes.currentVariant - text: "check" - color: Colours.palette.m3primary - font.pointSize: Appearance.font.size.large - } - } - - implicitHeight: variantRow.implicitHeight + Appearance.padding.normal * 2 - } - } - } -} - diff --git a/modules/controlcenter/appearance/sections/ScalesSection.qml b/modules/controlcenter/appearance/sections/ScalesSection.qml deleted file mode 100644 index f74923b..0000000 --- a/modules/controlcenter/appearance/sections/ScalesSection.qml +++ /dev/null @@ -1,84 +0,0 @@ -pragma ComponentBehavior: Bound - -import ".." -import "../../components" -import qs.components -import qs.components.controls -import qs.components.containers -import qs.services -import qs.config -import QtQuick -import QtQuick.Layouts - -CollapsibleSection { - id: root - - required property var rootPane - - title: qsTr("Scales") - showBackground: true - - SectionContainer { - contentSpacing: Appearance.spacing.normal - - SliderInput { - Layout.fillWidth: true - - label: qsTr("Padding scale") - value: rootPane.paddingScale - from: 0.5 - to: 2.0 - decimals: 1 - suffix: "×" - validator: DoubleValidator { bottom: 0.5; top: 2.0 } - - onValueModified: (newValue) => { - rootPane.paddingScale = newValue; - rootPane.saveConfig(); - } - } - } - - SectionContainer { - contentSpacing: Appearance.spacing.normal - - SliderInput { - Layout.fillWidth: true - - label: qsTr("Rounding scale") - value: rootPane.roundingScale - from: 0.1 - to: 5.0 - decimals: 1 - suffix: "×" - validator: DoubleValidator { bottom: 0.1; top: 5.0 } - - onValueModified: (newValue) => { - rootPane.roundingScale = newValue; - rootPane.saveConfig(); - } - } - } - - SectionContainer { - contentSpacing: Appearance.spacing.normal - - SliderInput { - Layout.fillWidth: true - - label: qsTr("Spacing scale") - value: rootPane.spacingScale - from: 0.1 - to: 2.0 - decimals: 1 - suffix: "×" - validator: DoubleValidator { bottom: 0.1; top: 2.0 } - - onValueModified: (newValue) => { - rootPane.spacingScale = newValue; - rootPane.saveConfig(); - } - } - } -} - diff --git a/modules/controlcenter/appearance/sections/ThemeModeSection.qml b/modules/controlcenter/appearance/sections/ThemeModeSection.qml deleted file mode 100644 index c136437..0000000 --- a/modules/controlcenter/appearance/sections/ThemeModeSection.qml +++ /dev/null @@ -1,24 +0,0 @@ -pragma ComponentBehavior: Bound - -import ".." -import qs.components -import qs.components.controls -import qs.components.containers -import qs.services -import qs.config -import QtQuick - -CollapsibleSection { - title: qsTr("Theme mode") - description: qsTr("Light or dark theme") - showBackground: true - - SwitchRow { - label: qsTr("Dark mode") - checked: !Colours.currentLight - onToggled: checked => { - Colours.setMode(checked ? "dark" : "light"); - } - } -} - diff --git a/modules/controlcenter/appearance/sections/TransparencySection.qml b/modules/controlcenter/appearance/sections/TransparencySection.qml deleted file mode 100644 index c9dbfb8..0000000 --- a/modules/controlcenter/appearance/sections/TransparencySection.qml +++ /dev/null @@ -1,74 +0,0 @@ -pragma ComponentBehavior: Bound - -import ".." -import "../../components" -import qs.components -import qs.components.controls -import qs.components.containers -import qs.services -import qs.config -import QtQuick -import QtQuick.Layouts - -CollapsibleSection { - id: root - - required property var rootPane - - title: qsTr("Transparency") - showBackground: true - - SwitchRow { - label: qsTr("Transparency enabled") - checked: rootPane.transparencyEnabled - onToggled: checked => { - rootPane.transparencyEnabled = checked; - rootPane.saveConfig(); - } - } - - SectionContainer { - contentSpacing: Appearance.spacing.normal - - SliderInput { - Layout.fillWidth: true - - label: qsTr("Transparency base") - value: rootPane.transparencyBase * 100 - from: 0 - to: 100 - suffix: "%" - validator: IntValidator { bottom: 0; top: 100 } - formatValueFunction: (val) => Math.round(val).toString() - parseValueFunction: (text) => parseInt(text) - - onValueModified: (newValue) => { - rootPane.transparencyBase = newValue / 100; - rootPane.saveConfig(); - } - } - } - - SectionContainer { - contentSpacing: Appearance.spacing.normal - - SliderInput { - Layout.fillWidth: true - - label: qsTr("Transparency layers") - value: rootPane.transparencyLayers * 100 - from: 0 - to: 100 - suffix: "%" - validator: IntValidator { bottom: 0; top: 100 } - formatValueFunction: (val) => Math.round(val).toString() - parseValueFunction: (text) => parseInt(text) - - onValueModified: (newValue) => { - rootPane.transparencyLayers = newValue / 100; - rootPane.saveConfig(); - } - } - } -} - diff --git a/modules/controlcenter/launcher/Settings.qml b/modules/controlcenter/launcher/Settings.qml deleted file mode 100644 index 7ab1d46..0000000 --- a/modules/controlcenter/launcher/Settings.qml +++ /dev/null @@ -1,167 +0,0 @@ -pragma ComponentBehavior: Bound - -import ".." -import "../components" -import qs.components -import qs.components.controls -import qs.components.effects -import qs.services -import qs.config -import QtQuick -import QtQuick.Layouts - -ColumnLayout { - id: root - - required property Session session - - spacing: Appearance.spacing.normal - - SettingsHeader { - icon: "apps" - title: qsTr("Launcher Settings") - } - - SectionHeader { - Layout.topMargin: Appearance.spacing.large - title: qsTr("General") - description: qsTr("General launcher settings") - } - - SectionContainer { - ToggleRow { - label: qsTr("Enabled") - checked: Config.launcher.enabled - toggle.onToggled: { - Config.launcher.enabled = checked; - Config.save(); - } - } - - ToggleRow { - label: qsTr("Show on hover") - checked: Config.launcher.showOnHover - toggle.onToggled: { - Config.launcher.showOnHover = checked; - Config.save(); - } - } - - ToggleRow { - label: qsTr("Vim keybinds") - checked: Config.launcher.vimKeybinds - toggle.onToggled: { - Config.launcher.vimKeybinds = checked; - Config.save(); - } - } - } - - SectionHeader { - Layout.topMargin: Appearance.spacing.large - title: qsTr("Display") - description: qsTr("Display and appearance settings") - } - - SectionContainer { - contentSpacing: Appearance.spacing.small / 2 - - PropertyRow { - label: qsTr("Max shown items") - value: qsTr("%1").arg(Config.launcher.maxShown) - } - - PropertyRow { - showTopMargin: true - label: qsTr("Drag threshold") - value: qsTr("%1 px").arg(Config.launcher.dragThreshold) - } - } - - SectionHeader { - Layout.topMargin: Appearance.spacing.large - title: qsTr("Prefixes") - description: qsTr("Command prefix settings") - } - - SectionContainer { - contentSpacing: Appearance.spacing.small / 2 - - PropertyRow { - label: qsTr("Special prefix") - value: Config.launcher.specialPrefix || qsTr("None") - } - - PropertyRow { - showTopMargin: true - label: qsTr("Action prefix") - value: Config.launcher.actionPrefix || qsTr("None") - } - } - - SectionHeader { - Layout.topMargin: Appearance.spacing.large - title: qsTr("Fuzzy search") - description: qsTr("Fuzzy search settings") - } - - SectionContainer { - ToggleRow { - label: qsTr("Apps") - checked: Config.launcher.useFuzzy.apps - toggle.onToggled: { - Config.launcher.useFuzzy.apps = checked; - Config.save(); - } - } - } - - SectionHeader { - Layout.topMargin: Appearance.spacing.large - title: qsTr("Sizes") - description: qsTr("Size settings for launcher items") - } - - SectionContainer { - contentSpacing: Appearance.spacing.small / 2 - - PropertyRow { - label: qsTr("Item width") - value: qsTr("%1 px").arg(Config.launcher.sizes.itemWidth) - } - - PropertyRow { - showTopMargin: true - label: qsTr("Item height") - value: qsTr("%1 px").arg(Config.launcher.sizes.itemHeight) - } - - PropertyRow { - showTopMargin: true - label: qsTr("Wallpaper width") - value: qsTr("%1 px").arg(Config.launcher.sizes.wallpaperWidth) - } - - PropertyRow { - showTopMargin: true - label: qsTr("Wallpaper height") - value: qsTr("%1 px").arg(Config.launcher.sizes.wallpaperHeight) - } - } - - SectionHeader { - Layout.topMargin: Appearance.spacing.large - title: qsTr("Hidden apps") - description: qsTr("Applications hidden from launcher") - } - - SectionContainer { - contentSpacing: Appearance.spacing.small / 2 - - PropertyRow { - label: qsTr("Total hidden") - value: qsTr("%1").arg(Config.launcher.hiddenApps ? Config.launcher.hiddenApps.length : 0) - } - } -} - diff --git a/modules/controlcenter/taskbar/ConnectedButtonGroup.qml b/modules/controlcenter/taskbar/ConnectedButtonGroup.qml deleted file mode 100644 index bf3a97f..0000000 --- a/modules/controlcenter/taskbar/ConnectedButtonGroup.qml +++ /dev/null @@ -1,109 +0,0 @@ -import ".." -import qs.components -import qs.components.controls -import qs.components.effects -import qs.services -import qs.config -import QtQuick -import QtQuick.Layouts - -StyledRect { - id: root - - property var options: [] // Array of {label: string, propertyName: string, onToggled: function} - property var rootItem: null // The root item that contains the properties we want to bind to - property string title: "" // Optional title text - - Layout.fillWidth: true - implicitHeight: layout.implicitHeight + Appearance.padding.large * 2 - radius: Appearance.rounding.normal - color: Colours.layer(Colours.palette.m3surfaceContainer, 2) - clip: true - - Behavior on implicitHeight { - Anim {} - } - - ColumnLayout { - id: layout - - anchors.fill: parent - anchors.margins: Appearance.padding.large - spacing: Appearance.spacing.normal - - StyledText { - visible: root.title !== "" - text: root.title - font.pointSize: Appearance.font.size.normal - } - - RowLayout { - id: buttonRow - Layout.alignment: Qt.AlignHCenter - spacing: Appearance.spacing.small - - Repeater { - id: repeater - model: root.options - - delegate: TextButton { - id: button - required property int index - required property var modelData - - Layout.fillWidth: true - text: modelData.label - - property bool _checked: false - - checked: _checked - toggle: false - type: TextButton.Tonal - - // Create binding in Component.onCompleted - Component.onCompleted: { - if (root.rootItem && modelData.propertyName) { - const propName = modelData.propertyName; - const rootItem = root.rootItem; - _checked = Qt.binding(function() { - return rootItem[propName] ?? false; - }); - } - } - - // Match utilities Toggles radius styling - // Each button has full rounding (not connected) since they have spacing - radius: stateLayer.pressed ? Appearance.rounding.small / 2 : internalChecked ? Appearance.rounding.small : Appearance.rounding.normal - - // Match utilities Toggles inactive color - inactiveColour: Colours.layer(Colours.palette.m3surfaceContainerHighest, 2) - - // Adjust width similar to utilities toggles - Layout.preferredWidth: implicitWidth + (stateLayer.pressed ? Appearance.padding.large : internalChecked ? Appearance.padding.smaller : 0) - - onClicked: { - if (modelData.onToggled && root.rootItem && modelData.propertyName) { - const currentValue = root.rootItem[modelData.propertyName] ?? false; - modelData.onToggled(!currentValue); - } - } - - Behavior on Layout.preferredWidth { - Anim { - duration: Appearance.anim.durations.expressiveFastSpatial - easing.bezierCurve: Appearance.anim.curves.expressiveFastSpatial - } - } - - Behavior on radius { - Anim { - duration: Appearance.anim.durations.expressiveFastSpatial - easing.bezierCurve: Appearance.anim.curves.expressiveFastSpatial - } - } - } - } - } - } -} - diff --git a/modules/launcher/services/Apps.qml b/modules/launcher/services/Apps.qml index c409a7b..79f3754 100644 --- a/modules/launcher/services/Apps.qml +++ b/modules/launcher/services/Apps.qml @@ -13,7 +13,7 @@ Searcher { if (entry.runInTerminal) Quickshell.execDetached({ - command: ["app2unit", "--", ...Config.general.apps.terminal, `${Quickshell.shellDir}/assets/wrap_term_launch.sh`, ...entry.command], + command: ["app2unit", "--", ...Config.general.apps.terminal, ...entry.command], workingDirectory: entry.workingDirectory }); else diff --git a/modules/utilities/cards/Toggles.qml b/modules/utilities/cards/Toggles.qml index 3cb61e6..558f2d5 100644 --- a/modules/utilities/cards/Toggles.qml +++ b/modules/utilities/cards/Toggles.qml @@ -72,12 +72,6 @@ StyledRect { } } - Toggle { - icon: "gamepad" - checked: GameMode.enabled - onClicked: GameMode.enabled = !GameMode.enabled - } - Toggle { icon: "notifications_off" checked: Notifs.dnd diff --git a/nix/default.nix b/nix/default.nix index 67747b2..bd246a6 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -140,9 +140,6 @@ in mkdir -p $out/lib ln -s ${extras}/lib/* $out/lib/ - - # Ensure wrap_term_launch.sh is executable - chmod 755 $out/share/caelestia-shell/assets/wrap_term_launch.sh ''; passthru = { diff --git a/services/Colours.qml b/services/Colours.qml index d6f4812..cc07959 100644 --- a/services/Colours.qml +++ b/services/Colours.qml @@ -88,7 +88,7 @@ Singleton { ImageAnalyser { id: analyser - source: Wallpapers.current + source: Paths.wallpaper } component Transparency: QtObject { diff --git a/services/GameMode.qml b/services/GameMode.qml deleted file mode 100644 index 83770b7..0000000 --- a/services/GameMode.qml +++ /dev/null @@ -1,76 +0,0 @@ -pragma Singleton - -import qs.services -import qs.config -import Caelestia -import Quickshell -import Quickshell.Io -import QtQuick - -Singleton { - id: root - - property alias enabled: props.enabled - - function setDynamicConfs(): void { - Hypr.extras.applyOptions({ - "animations:enabled": 0, - "decoration:shadow:enabled": 0, - "decoration:blur:enabled": 0, - "general:gaps_in": 0, - "general:gaps_out": 0, - "general:border_size": 1, - "decoration:rounding": 0, - "general:allow_tearing": 1 - }); - } - - onEnabledChanged: { - if (enabled) { - setDynamicConfs(); - if (Config.utilities.toasts.gameModeChanged) - Toaster.toast(qsTr("Game mode enabled"), qsTr("Disabled Hyprland animations, blur, gaps and shadows"), "gamepad"); - } else { - Hypr.extras.message("reload"); - if (Config.utilities.toasts.gameModeChanged) - Toaster.toast(qsTr("Game mode disabled"), qsTr("Hyprland settings restored"), "gamepad"); - } - } - - PersistentProperties { - id: props - - property bool enabled: Hypr.options["animations:enabled"] === 0 - - reloadableId: "gameMode" - } - - Connections { - target: Hypr - - function onConfigReloaded(): void { - if (props.enabled) - root.setDynamicConfs(); - } - } - - IpcHandler { - target: "gameMode" - - function isEnabled(): bool { - return props.enabled; - } - - function toggle(): void { - props.enabled = !props.enabled; - } - - function enable(): void { - props.enabled = true; - } - - function disable(): void { - props.enabled = false; - } - } -} diff --git a/services/Wallpapers.qml b/services/Wallpapers.qml deleted file mode 100644 index 443b416..0000000 --- a/services/Wallpapers.qml +++ /dev/null @@ -1,45 +0,0 @@ -pragma Singleton - -import qs.config -import qs.utils -import Caelestia.Models -import Quickshell -import Quickshell.Io -import QtQuick - -Searcher { - id: root - - readonly property list smartArg: Config.services.smartScheme ? [] : ["--no-smart"] - - property bool showPreview: false - readonly property string current: Paths.wallpaper - - function setWallpaper(path: string): void { - actualCurrent = path; - Quickshell.execDetached(["caelestia", "wallpaper", "-f", path, ...smartArg]); - } - - list: wallpapers.entries - key: "relativePath" - useFuzzy: Config.launcher.useFuzzy.wallpapers - extraOpts: useFuzzy ? ({}) : ({ - forward: false - }) - - IpcHandler { - target: "wallpaper" - - function get(): string { - return root.actualCurrent; - } - - function set(path: string): void { - root.setWallpaper(path); - } - - function list(): string { - return root.list.map(w => w.path).join("\n"); - } - } -} diff --git a/shell.qml b/shell.qml index 3ce7776..aa23e0a 100644 --- a/shell.qml +++ b/shell.qml @@ -5,14 +5,12 @@ import "modules" import "modules/drawers" import "modules/background" -import "modules/areapicker" import "modules/lock" import Quickshell ShellRoot { Background {} Drawers {} - AreaPicker {} Lock { id: lock } -- cgit v1.2.3-freya