diff --git a/GEMINI.md b/GEMINI.md index 7cb28aa..f74edc7 100644 --- a/GEMINI.md +++ b/GEMINI.md @@ -7,7 +7,7 @@ Users interact with the system by importing the distro's modules into their own ## Directory Structure * `flake.nix` (Master entry point with core modules and test configurations) -* `installer/install-nomarchy.sh` (Interactive installer generating a clean downstream flake) +* `installer/install.sh` (Interactive installer generating a clean downstream flake) * `modules/system/default.nix` (Distro-wide OS defaults: SDDM, Plymouth, Audio, Network) * `modules/home/default.nix` (Distro-wide user environment: Hyprland, Waybar, Styling) * `bin/` (The collection of Omarchy productivity and config scripts) @@ -20,7 +20,7 @@ Users interact with the system by importing the distro's modules into their own * **Downstream:** The user's `/etc/nixos/flake.nix` imports the upstream modules. The user's personal customizations are kept in `/etc/nixos/system.nix` and `/etc/nixos/home.nix`. * **Merging:** NixOS automatically merges definitions. For example, if both the distro and the user add packages to `home.packages`, the final system includes the union of both lists. -### 2. The Interactive Installer (`installer/install-nomarchy.sh`) +### 2. The Interactive Installer (`installer/install.sh`) The installer is designed to bootstrap a fresh system with this modular structure: 1. **Repo Detection:** Identifies the location of the Nomarchy source. 2. **Scaffolding:** Creates a new downstream `flake.nix` that imports Nomarchy core modules. @@ -35,6 +35,6 @@ The installer is designed to bootstrap a fresh system with this modular structur * **Palettes:** Themes are defined in simple `colors.toml` files. The distro dynamically generates Base16 palettes from these, allowing for infinite theme expansion without modifying Nix code. ## Verification & Build -* **Test Installer:** `./bin/nomarchy-test-installer` (Builds a VM of the installer environment). +* **Test Installer:** `./bin/utils/nomarchy-test-installer` (Builds a VM of the installer environment). * **Check Integrity:** `nix flake check --impure` (Verifies all configurations evaluate). * **Build ISO:** `nix build .#nixosConfigurations.installerIso.config.system.build.isoImage` (Generates the flashable USB image). diff --git a/README.md b/README.md index 3c45fa6..eb4d9d9 100644 --- a/README.md +++ b/README.md @@ -13,14 +13,24 @@ --- +## 📂 Component-Based Architecture + +Nomarchy uses a **Feature-Centric Directory Structure**. Instead of grouping files by type (e.g., all scripts in one folder, all configs in another), everything related to a specific component is colocated. + +- **`core/`**: Foundational OS & User defaults (Bootloader, Audio, Bluetooth, basic shell). +- **`features/`**: Isolated modules containing Nix logic, raw dotfiles, and scripts for a specific app or service (e.g., `features/desktop/waybar/`). +- **`themes/`**: The global theming engine. It holds pure color data and logic. *Theme-specific app layouts* (like a custom Waybar layout for `summer-night`) are stored directly inside the app's feature folder (`features/desktop/waybar/themes/`), solving the matrix problem of theming. + +--- + ## 📥 Installation ### 1. Try it in a VM (Recommended) Verify the experience without touching your hardware: ```bash -./bin/nomarchy-test-installer +./bin/utils/nomarchy-test-installer ``` -This builds a full graphical VM of the installer environment. Once inside, click the **Install Nomarchy** icon or run `sudo /etc/install-nomarchy.sh`. +This builds a full graphical VM of the installer environment. Once inside, click the **Install Nomarchy** icon or run `nomarchy-install`. ### 2. Build the Installer ISO To install on physical hardware, generate your own bootable image: @@ -32,14 +42,13 @@ The ISO will be located at `./result/iso/nixos-*.iso`. Flash it to a USB drive a ### 3. Run the Installer Once booted into the Live environment, launch the installer: ```bash -sudo /etc/install-nomarchy.sh +nomarchy-install ``` The wizard will guide you through: - **Networking:** An interactive wizard to connect to Wi-Fi if needed. - **Hardware:** Optimized profiles for Dell XPS, Framework, Apple T2, and more. - **Storage:** Choice between Standard Ext4 or Encrypted BTRFS with optional **Impermanence**. - **Localization:** Searchable timezones and keyboard layout selection. -- **Profiles:** One-click setups for Development, Gaming, and Media Production. --- diff --git a/TODO.md b/TODO.md index e5bc6f4..ad44bd7 100644 --- a/TODO.md +++ b/TODO.md @@ -3,18 +3,18 @@ ## 1. Professional Installer [IN PROGRESS] - [x] Refactor with `gum` for stylized UI. - [x] Add clear section headers and environment checks. -- [x] Implement software profile selection. -- [ ] Add "Pre-flight Check" summary screen showing all selected options (disk, user, profiles) before proceeding. -- [ ] Implement post-install "Success" dashboard with next steps. +- [ ] Implement software profile selection. +- [x] Add "Pre-flight Check" summary screen showing all selected options (disk, user, profiles) before proceeding. +- [x] Implement post-install "Success" dashboard with next steps. - [ ] Improve disk selection to show more metadata (vendor, model, serial). -## 2. Nomarchy Plymouth Theme [IN PROGRESS] +## 2. Nomarchy Plymouth Theme [DONE] - [x] Create custom theme assets in `assets/plymouth/`. - [x] Center official logo on splash screen. - [x] Declarative integration in `modules/system/plymouth.nix`. - [x] Implement full LUKS password entry support (password prompt, bullet indicators). - [x] Add smooth fade-in/fade-out animations for the logo. -- [ ] Add system message display (e.g., "Rebooting...", "Checking Disk..."). +- [x] Add system message display (e.g., "Rebooting...", "Checking Disk..."). ## 3. System Branding (Fastfetch & Terminal) [DONE] - [x] Restore and optimize official ASCII logo (`logo.txt`). diff --git a/assets/branding/icon.png b/core/branding/icon.png similarity index 100% rename from assets/branding/icon.png rename to core/branding/icon.png diff --git a/assets/branding/icon.svg b/core/branding/icon.svg similarity index 100% rename from assets/branding/icon.svg rename to core/branding/icon.svg diff --git a/assets/branding/icon.txt b/core/branding/icon.txt similarity index 100% rename from assets/branding/icon.txt rename to core/branding/icon.txt diff --git a/assets/branding/logo.png b/core/branding/logo.png similarity index 100% rename from assets/branding/logo.png rename to core/branding/logo.png diff --git a/assets/branding/logo.svg b/core/branding/logo.svg similarity index 100% rename from assets/branding/logo.svg rename to core/branding/logo.svg diff --git a/assets/branding/logo.txt b/core/branding/logo.txt similarity index 100% rename from assets/branding/logo.txt rename to core/branding/logo.txt diff --git a/core/default.nix b/core/default.nix new file mode 100644 index 0000000..941e53c --- /dev/null +++ b/core/default.nix @@ -0,0 +1,20 @@ +{ config, lib, pkgs, ... }: + +{ + imports = [ + ./system/options.nix + ./system/state.nix + ./system/systemd.nix + ../themes/engine/plymouth.nix + ../themes/engine/sddm.nix + ./system/hardware.nix + ./system/audio.nix + ./system/bluetooth.nix + ./system/network.nix + ../features/apps/browser.nix + ./system/impermanence.nix + ../features/apps/makima.nix + ]; + + time.timeZone = lib.mkDefault config.nomarchy.system.timezone; +} diff --git a/modules/home/bash.nix b/core/home/bash.nix similarity index 100% rename from modules/home/bash.nix rename to core/home/bash.nix diff --git a/modules/home/behavior-configs.nix b/core/home/behavior.nix similarity index 100% rename from modules/home/behavior-configs.nix rename to core/home/behavior.nix diff --git a/config/Typora/themes/ia_typora.css b/core/home/config/Typora/themes/ia_typora.css similarity index 100% rename from config/Typora/themes/ia_typora.css rename to core/home/config/Typora/themes/ia_typora.css diff --git a/config/Typora/themes/ia_typora_night.css b/core/home/config/Typora/themes/ia_typora_night.css similarity index 100% rename from config/Typora/themes/ia_typora_night.css rename to core/home/config/Typora/themes/ia_typora_night.css diff --git a/config/brave-flags.conf b/core/home/config/brave-flags.conf similarity index 100% rename from config/brave-flags.conf rename to core/home/config/brave-flags.conf diff --git a/config/chromium-flags.conf b/core/home/config/chromium-flags.conf similarity index 100% rename from config/chromium-flags.conf rename to core/home/config/chromium-flags.conf diff --git a/config/environment.d/fcitx.conf b/core/home/config/environment.d/fcitx.conf similarity index 100% rename from config/environment.d/fcitx.conf rename to core/home/config/environment.d/fcitx.conf diff --git a/config/fastfetch/config.jsonc b/core/home/config/fastfetch/config.jsonc similarity index 100% rename from config/fastfetch/config.jsonc rename to core/home/config/fastfetch/config.jsonc diff --git a/config/fcitx5/conf/clipboard.conf b/core/home/config/fcitx5/conf/clipboard.conf similarity index 100% rename from config/fcitx5/conf/clipboard.conf rename to core/home/config/fcitx5/conf/clipboard.conf diff --git a/config/fcitx5/conf/xcb.conf b/core/home/config/fcitx5/conf/xcb.conf similarity index 100% rename from config/fcitx5/conf/xcb.conf rename to core/home/config/fcitx5/conf/xcb.conf diff --git a/config/fontconfig/fonts.conf b/core/home/config/fontconfig/fonts.conf similarity index 100% rename from config/fontconfig/fonts.conf rename to core/home/config/fontconfig/fonts.conf diff --git a/config/git/config b/core/home/config/git/config similarity index 100% rename from config/git/config rename to core/home/config/git/config diff --git a/config/imv/config b/core/home/config/imv/config similarity index 100% rename from config/imv/config rename to core/home/config/imv/config diff --git a/assets/nautilus-python/extensions/localsend.py b/core/home/config/nautilus-python/extensions/localsend.py similarity index 100% rename from assets/nautilus-python/extensions/localsend.py rename to core/home/config/nautilus-python/extensions/localsend.py diff --git a/assets/nomarchy-skill/SKILL.md b/core/home/config/nomarchy-skill/SKILL.md similarity index 100% rename from assets/nomarchy-skill/SKILL.md rename to core/home/config/nomarchy-skill/SKILL.md diff --git a/config/nomarchy.ttf b/core/home/config/nomarchy.ttf similarity index 100% rename from config/nomarchy.ttf rename to core/home/config/nomarchy.ttf diff --git a/config/nomarchy/default/alacritty/screensaver.toml b/core/home/config/nomarchy/default/alacritty/screensaver.toml similarity index 100% rename from config/nomarchy/default/alacritty/screensaver.toml rename to core/home/config/nomarchy/default/alacritty/screensaver.toml diff --git a/config/nomarchy/default/bash/aliases b/core/home/config/nomarchy/default/bash/aliases similarity index 100% rename from config/nomarchy/default/bash/aliases rename to core/home/config/nomarchy/default/bash/aliases diff --git a/config/nomarchy/default/bash/envs b/core/home/config/nomarchy/default/bash/envs similarity index 100% rename from config/nomarchy/default/bash/envs rename to core/home/config/nomarchy/default/bash/envs diff --git a/config/nomarchy/default/bash/fns/compression b/core/home/config/nomarchy/default/bash/fns/compression similarity index 100% rename from config/nomarchy/default/bash/fns/compression rename to core/home/config/nomarchy/default/bash/fns/compression diff --git a/config/nomarchy/default/bash/fns/drives b/core/home/config/nomarchy/default/bash/fns/drives similarity index 100% rename from config/nomarchy/default/bash/fns/drives rename to core/home/config/nomarchy/default/bash/fns/drives diff --git a/config/nomarchy/default/bash/fns/ssh-port-forwarding b/core/home/config/nomarchy/default/bash/fns/ssh-port-forwarding similarity index 100% rename from config/nomarchy/default/bash/fns/ssh-port-forwarding rename to core/home/config/nomarchy/default/bash/fns/ssh-port-forwarding diff --git a/config/nomarchy/default/bash/fns/tmux b/core/home/config/nomarchy/default/bash/fns/tmux similarity index 100% rename from config/nomarchy/default/bash/fns/tmux rename to core/home/config/nomarchy/default/bash/fns/tmux diff --git a/config/nomarchy/default/bash/fns/transcoding b/core/home/config/nomarchy/default/bash/fns/transcoding similarity index 100% rename from config/nomarchy/default/bash/fns/transcoding rename to core/home/config/nomarchy/default/bash/fns/transcoding diff --git a/config/nomarchy/default/bash/fns/worktrees b/core/home/config/nomarchy/default/bash/fns/worktrees similarity index 100% rename from config/nomarchy/default/bash/fns/worktrees rename to core/home/config/nomarchy/default/bash/fns/worktrees diff --git a/config/nomarchy/default/bash/functions b/core/home/config/nomarchy/default/bash/functions similarity index 100% rename from config/nomarchy/default/bash/functions rename to core/home/config/nomarchy/default/bash/functions diff --git a/config/nomarchy/default/bash/init b/core/home/config/nomarchy/default/bash/init similarity index 100% rename from config/nomarchy/default/bash/init rename to core/home/config/nomarchy/default/bash/init diff --git a/config/nomarchy/default/bash/inputrc b/core/home/config/nomarchy/default/bash/inputrc similarity index 100% rename from config/nomarchy/default/bash/inputrc rename to core/home/config/nomarchy/default/bash/inputrc diff --git a/config/nomarchy/default/bash/rc b/core/home/config/nomarchy/default/bash/rc similarity index 100% rename from config/nomarchy/default/bash/rc rename to core/home/config/nomarchy/default/bash/rc diff --git a/config/nomarchy/default/bash/shell b/core/home/config/nomarchy/default/bash/shell similarity index 100% rename from config/nomarchy/default/bash/shell rename to core/home/config/nomarchy/default/bash/shell diff --git a/config/nomarchy/default/bashrc b/core/home/config/nomarchy/default/bashrc similarity index 100% rename from config/nomarchy/default/bashrc rename to core/home/config/nomarchy/default/bashrc diff --git a/config/nomarchy/default/chromium/extensions/copy-url/background.js b/core/home/config/nomarchy/default/chromium/extensions/copy-url/background.js similarity index 100% rename from config/nomarchy/default/chromium/extensions/copy-url/background.js rename to core/home/config/nomarchy/default/chromium/extensions/copy-url/background.js diff --git a/config/nomarchy/default/chromium/extensions/copy-url/icon.png b/core/home/config/nomarchy/default/chromium/extensions/copy-url/icon.png similarity index 100% rename from config/nomarchy/default/chromium/extensions/copy-url/icon.png rename to core/home/config/nomarchy/default/chromium/extensions/copy-url/icon.png diff --git a/config/nomarchy/default/chromium/extensions/copy-url/manifest.json b/core/home/config/nomarchy/default/chromium/extensions/copy-url/manifest.json similarity index 100% rename from config/nomarchy/default/chromium/extensions/copy-url/manifest.json rename to core/home/config/nomarchy/default/chromium/extensions/copy-url/manifest.json diff --git a/config/nomarchy/default/elephant/nomarchy_background_selector.lua b/core/home/config/nomarchy/default/elephant/nomarchy_background_selector.lua similarity index 100% rename from config/nomarchy/default/elephant/nomarchy_background_selector.lua rename to core/home/config/nomarchy/default/elephant/nomarchy_background_selector.lua diff --git a/config/nomarchy/default/elephant/nomarchy_themes.lua b/core/home/config/nomarchy/default/elephant/nomarchy_themes.lua similarity index 100% rename from config/nomarchy/default/elephant/nomarchy_themes.lua rename to core/home/config/nomarchy/default/elephant/nomarchy_themes.lua diff --git a/config/nomarchy/default/ghostty/screensaver b/core/home/config/nomarchy/default/ghostty/screensaver similarity index 100% rename from config/nomarchy/default/ghostty/screensaver rename to core/home/config/nomarchy/default/ghostty/screensaver diff --git a/config/nomarchy/default/gpg/dirmngr.conf b/core/home/config/nomarchy/default/gpg/dirmngr.conf similarity index 100% rename from config/nomarchy/default/gpg/dirmngr.conf rename to core/home/config/nomarchy/default/gpg/dirmngr.conf diff --git a/config/nomarchy/default/hypr/apps.conf b/core/home/config/nomarchy/default/hypr/apps.conf similarity index 100% rename from config/nomarchy/default/hypr/apps.conf rename to core/home/config/nomarchy/default/hypr/apps.conf diff --git a/config/nomarchy/default/hypr/apps/1password.conf b/core/home/config/nomarchy/default/hypr/apps/1password.conf similarity index 100% rename from config/nomarchy/default/hypr/apps/1password.conf rename to core/home/config/nomarchy/default/hypr/apps/1password.conf diff --git a/config/nomarchy/default/hypr/apps/bitwarden.conf b/core/home/config/nomarchy/default/hypr/apps/bitwarden.conf similarity index 100% rename from config/nomarchy/default/hypr/apps/bitwarden.conf rename to core/home/config/nomarchy/default/hypr/apps/bitwarden.conf diff --git a/config/nomarchy/default/hypr/apps/browser.conf b/core/home/config/nomarchy/default/hypr/apps/browser.conf similarity index 100% rename from config/nomarchy/default/hypr/apps/browser.conf rename to core/home/config/nomarchy/default/hypr/apps/browser.conf diff --git a/config/nomarchy/default/hypr/apps/davinci-resolve.conf b/core/home/config/nomarchy/default/hypr/apps/davinci-resolve.conf similarity index 100% rename from config/nomarchy/default/hypr/apps/davinci-resolve.conf rename to core/home/config/nomarchy/default/hypr/apps/davinci-resolve.conf diff --git a/config/nomarchy/default/hypr/apps/geforce.conf b/core/home/config/nomarchy/default/hypr/apps/geforce.conf similarity index 100% rename from config/nomarchy/default/hypr/apps/geforce.conf rename to core/home/config/nomarchy/default/hypr/apps/geforce.conf diff --git a/config/nomarchy/default/hypr/apps/hyprshot.conf b/core/home/config/nomarchy/default/hypr/apps/hyprshot.conf similarity index 100% rename from config/nomarchy/default/hypr/apps/hyprshot.conf rename to core/home/config/nomarchy/default/hypr/apps/hyprshot.conf diff --git a/config/nomarchy/default/hypr/apps/localsend.conf b/core/home/config/nomarchy/default/hypr/apps/localsend.conf similarity index 100% rename from config/nomarchy/default/hypr/apps/localsend.conf rename to core/home/config/nomarchy/default/hypr/apps/localsend.conf diff --git a/config/nomarchy/default/hypr/apps/moonlight.conf b/core/home/config/nomarchy/default/hypr/apps/moonlight.conf similarity index 100% rename from config/nomarchy/default/hypr/apps/moonlight.conf rename to core/home/config/nomarchy/default/hypr/apps/moonlight.conf diff --git a/config/nomarchy/default/hypr/apps/pip.conf b/core/home/config/nomarchy/default/hypr/apps/pip.conf similarity index 100% rename from config/nomarchy/default/hypr/apps/pip.conf rename to core/home/config/nomarchy/default/hypr/apps/pip.conf diff --git a/config/nomarchy/default/hypr/apps/qemu.conf b/core/home/config/nomarchy/default/hypr/apps/qemu.conf similarity index 100% rename from config/nomarchy/default/hypr/apps/qemu.conf rename to core/home/config/nomarchy/default/hypr/apps/qemu.conf diff --git a/config/nomarchy/default/hypr/apps/retroarch.conf b/core/home/config/nomarchy/default/hypr/apps/retroarch.conf similarity index 100% rename from config/nomarchy/default/hypr/apps/retroarch.conf rename to core/home/config/nomarchy/default/hypr/apps/retroarch.conf diff --git a/config/nomarchy/default/hypr/apps/steam.conf b/core/home/config/nomarchy/default/hypr/apps/steam.conf similarity index 100% rename from config/nomarchy/default/hypr/apps/steam.conf rename to core/home/config/nomarchy/default/hypr/apps/steam.conf diff --git a/config/nomarchy/default/hypr/apps/system.conf b/core/home/config/nomarchy/default/hypr/apps/system.conf similarity index 100% rename from config/nomarchy/default/hypr/apps/system.conf rename to core/home/config/nomarchy/default/hypr/apps/system.conf diff --git a/config/nomarchy/default/hypr/apps/telegram.conf b/core/home/config/nomarchy/default/hypr/apps/telegram.conf similarity index 100% rename from config/nomarchy/default/hypr/apps/telegram.conf rename to core/home/config/nomarchy/default/hypr/apps/telegram.conf diff --git a/config/nomarchy/default/hypr/apps/terminals.conf b/core/home/config/nomarchy/default/hypr/apps/terminals.conf similarity index 100% rename from config/nomarchy/default/hypr/apps/terminals.conf rename to core/home/config/nomarchy/default/hypr/apps/terminals.conf diff --git a/config/nomarchy/default/hypr/apps/walker.conf b/core/home/config/nomarchy/default/hypr/apps/walker.conf similarity index 100% rename from config/nomarchy/default/hypr/apps/walker.conf rename to core/home/config/nomarchy/default/hypr/apps/walker.conf diff --git a/config/nomarchy/default/hypr/apps/webcam-overlay.conf b/core/home/config/nomarchy/default/hypr/apps/webcam-overlay.conf similarity index 100% rename from config/nomarchy/default/hypr/apps/webcam-overlay.conf rename to core/home/config/nomarchy/default/hypr/apps/webcam-overlay.conf diff --git a/config/nomarchy/default/hypr/autostart.conf b/core/home/config/nomarchy/default/hypr/autostart.conf similarity index 100% rename from config/nomarchy/default/hypr/autostart.conf rename to core/home/config/nomarchy/default/hypr/autostart.conf diff --git a/config/nomarchy/default/hypr/bindings.conf b/core/home/config/nomarchy/default/hypr/bindings.conf similarity index 100% rename from config/nomarchy/default/hypr/bindings.conf rename to core/home/config/nomarchy/default/hypr/bindings.conf diff --git a/config/nomarchy/default/hypr/bindings/clipboard.conf b/core/home/config/nomarchy/default/hypr/bindings/clipboard.conf similarity index 100% rename from config/nomarchy/default/hypr/bindings/clipboard.conf rename to core/home/config/nomarchy/default/hypr/bindings/clipboard.conf diff --git a/config/nomarchy/default/hypr/bindings/media.conf b/core/home/config/nomarchy/default/hypr/bindings/media.conf similarity index 100% rename from config/nomarchy/default/hypr/bindings/media.conf rename to core/home/config/nomarchy/default/hypr/bindings/media.conf diff --git a/config/nomarchy/default/hypr/bindings/tiling-v2.conf b/core/home/config/nomarchy/default/hypr/bindings/tiling-v2.conf similarity index 100% rename from config/nomarchy/default/hypr/bindings/tiling-v2.conf rename to core/home/config/nomarchy/default/hypr/bindings/tiling-v2.conf diff --git a/config/nomarchy/default/hypr/bindings/tiling.conf b/core/home/config/nomarchy/default/hypr/bindings/tiling.conf similarity index 100% rename from config/nomarchy/default/hypr/bindings/tiling.conf rename to core/home/config/nomarchy/default/hypr/bindings/tiling.conf diff --git a/config/nomarchy/default/hypr/bindings/utilities.conf b/core/home/config/nomarchy/default/hypr/bindings/utilities.conf similarity index 100% rename from config/nomarchy/default/hypr/bindings/utilities.conf rename to core/home/config/nomarchy/default/hypr/bindings/utilities.conf diff --git a/config/nomarchy/default/hypr/colors.conf b/core/home/config/nomarchy/default/hypr/colors.conf similarity index 100% rename from config/nomarchy/default/hypr/colors.conf rename to core/home/config/nomarchy/default/hypr/colors.conf diff --git a/config/nomarchy/default/hypr/envs.conf b/core/home/config/nomarchy/default/hypr/envs.conf similarity index 100% rename from config/nomarchy/default/hypr/envs.conf rename to core/home/config/nomarchy/default/hypr/envs.conf diff --git a/config/nomarchy/default/hypr/input.conf b/core/home/config/nomarchy/default/hypr/input.conf similarity index 100% rename from config/nomarchy/default/hypr/input.conf rename to core/home/config/nomarchy/default/hypr/input.conf diff --git a/config/nomarchy/default/hypr/looknfeel.conf b/core/home/config/nomarchy/default/hypr/looknfeel.conf similarity index 100% rename from config/nomarchy/default/hypr/looknfeel.conf rename to core/home/config/nomarchy/default/hypr/looknfeel.conf diff --git a/config/nomarchy/default/hypr/plain-bindings.conf b/core/home/config/nomarchy/default/hypr/plain-bindings.conf similarity index 100% rename from config/nomarchy/default/hypr/plain-bindings.conf rename to core/home/config/nomarchy/default/hypr/plain-bindings.conf diff --git a/config/nomarchy/default/hypr/windows.conf b/core/home/config/nomarchy/default/hypr/windows.conf similarity index 100% rename from config/nomarchy/default/hypr/windows.conf rename to core/home/config/nomarchy/default/hypr/windows.conf diff --git a/config/nomarchy/default/mako/core.ini b/core/home/config/nomarchy/default/mako/core.ini similarity index 100% rename from config/nomarchy/default/mako/core.ini rename to core/home/config/nomarchy/default/mako/core.ini diff --git a/config/nomarchy/default/voxtype/config.toml b/core/home/config/nomarchy/default/voxtype/config.toml similarity index 100% rename from config/nomarchy/default/voxtype/config.toml rename to core/home/config/nomarchy/default/voxtype/config.toml diff --git a/config/nomarchy/default/walker/restart.conf b/core/home/config/nomarchy/default/walker/restart.conf similarity index 100% rename from config/nomarchy/default/walker/restart.conf rename to core/home/config/nomarchy/default/walker/restart.conf diff --git a/config/nomarchy/default/walker/themes/nomarchy-default/layout.xml b/core/home/config/nomarchy/default/walker/themes/nomarchy-default/layout.xml similarity index 100% rename from config/nomarchy/default/walker/themes/nomarchy-default/layout.xml rename to core/home/config/nomarchy/default/walker/themes/nomarchy-default/layout.xml diff --git a/config/nomarchy/default/walker/themes/nomarchy-default/style.css b/core/home/config/nomarchy/default/walker/themes/nomarchy-default/style.css similarity index 100% rename from config/nomarchy/default/walker/themes/nomarchy-default/style.css rename to core/home/config/nomarchy/default/walker/themes/nomarchy-default/style.css diff --git a/config/nomarchy/default/walker/walker.desktop b/core/home/config/nomarchy/default/walker/walker.desktop similarity index 100% rename from config/nomarchy/default/walker/walker.desktop rename to core/home/config/nomarchy/default/walker/walker.desktop diff --git a/config/nomarchy/default/waybar/indicators/idle.sh b/core/home/config/nomarchy/default/waybar/indicators/idle.sh similarity index 100% rename from config/nomarchy/default/waybar/indicators/idle.sh rename to core/home/config/nomarchy/default/waybar/indicators/idle.sh diff --git a/config/nomarchy/default/waybar/indicators/notification-silencing.sh b/core/home/config/nomarchy/default/waybar/indicators/notification-silencing.sh similarity index 100% rename from config/nomarchy/default/waybar/indicators/notification-silencing.sh rename to core/home/config/nomarchy/default/waybar/indicators/notification-silencing.sh diff --git a/config/nomarchy/default/waybar/indicators/screen-recording.sh b/core/home/config/nomarchy/default/waybar/indicators/screen-recording.sh similarity index 100% rename from config/nomarchy/default/waybar/indicators/screen-recording.sh rename to core/home/config/nomarchy/default/waybar/indicators/screen-recording.sh diff --git a/config/nomarchy/default/wireplumber/wireplumber.conf.d/alsa-soft-mixer.conf b/core/home/config/nomarchy/default/wireplumber/wireplumber.conf.d/alsa-soft-mixer.conf similarity index 100% rename from config/nomarchy/default/wireplumber/wireplumber.conf.d/alsa-soft-mixer.conf rename to core/home/config/nomarchy/default/wireplumber/wireplumber.conf.d/alsa-soft-mixer.conf diff --git a/config/nomarchy/default/xcompose b/core/home/config/nomarchy/default/xcompose similarity index 100% rename from config/nomarchy/default/xcompose rename to core/home/config/nomarchy/default/xcompose diff --git a/config/nomarchy/extensions/menu.sh b/core/home/config/nomarchy/extensions/menu.sh similarity index 100% rename from config/nomarchy/extensions/menu.sh rename to core/home/config/nomarchy/extensions/menu.sh diff --git a/config/nomarchy/hooks/battery-low.sample b/core/home/config/nomarchy/hooks/battery-low.sample similarity index 100% rename from config/nomarchy/hooks/battery-low.sample rename to core/home/config/nomarchy/hooks/battery-low.sample diff --git a/config/nomarchy/hooks/font-set.sample b/core/home/config/nomarchy/hooks/font-set.sample similarity index 100% rename from config/nomarchy/hooks/font-set.sample rename to core/home/config/nomarchy/hooks/font-set.sample diff --git a/config/nomarchy/hooks/post-update.sample b/core/home/config/nomarchy/hooks/post-update.sample similarity index 100% rename from config/nomarchy/hooks/post-update.sample rename to core/home/config/nomarchy/hooks/post-update.sample diff --git a/config/nomarchy/hooks/theme-set.sample b/core/home/config/nomarchy/hooks/theme-set.sample similarity index 100% rename from config/nomarchy/hooks/theme-set.sample rename to core/home/config/nomarchy/hooks/theme-set.sample diff --git a/config/nomarchy/themed/alacritty.toml.tpl.sample b/core/home/config/nomarchy/themed/alacritty.toml.tpl.sample similarity index 100% rename from config/nomarchy/themed/alacritty.toml.tpl.sample rename to core/home/config/nomarchy/themed/alacritty.toml.tpl.sample diff --git a/config/starship.toml b/core/home/config/starship.toml similarity index 100% rename from config/starship.toml rename to core/home/config/starship.toml diff --git a/config/uwsm/default b/core/home/config/uwsm/default similarity index 100% rename from config/uwsm/default rename to core/home/config/uwsm/default diff --git a/config/uwsm/env b/core/home/config/uwsm/env similarity index 100% rename from config/uwsm/env rename to core/home/config/uwsm/env diff --git a/config/wiremix/wiremix.toml b/core/home/config/wiremix/wiremix.toml similarity index 100% rename from config/wiremix/wiremix.toml rename to core/home/config/wiremix/wiremix.toml diff --git a/config/xdg-terminals.list b/core/home/config/xdg-terminals.list similarity index 100% rename from config/xdg-terminals.list rename to core/home/config/xdg-terminals.list diff --git a/config/xournalpp/settings.xml b/core/home/config/xournalpp/settings.xml similarity index 100% rename from config/xournalpp/settings.xml rename to core/home/config/xournalpp/settings.xml diff --git a/modules/home/configs.nix b/core/home/configs.nix similarity index 100% rename from modules/home/configs.nix rename to core/home/configs.nix diff --git a/modules/home/fonts.nix b/core/home/fonts.nix similarity index 100% rename from modules/home/fonts.nix rename to core/home/fonts.nix diff --git a/modules/home/options.nix b/core/home/options.nix similarity index 100% rename from modules/home/options.nix rename to core/home/options.nix diff --git a/modules/home/overrides.nix b/core/home/overrides.nix similarity index 100% rename from modules/home/overrides.nix rename to core/home/overrides.nix diff --git a/modules/home/security.nix b/core/home/security.nix similarity index 100% rename from modules/home/security.nix rename to core/home/security.nix diff --git a/modules/home/state.nix b/core/home/state.nix similarity index 100% rename from modules/home/state.nix rename to core/home/state.nix diff --git a/modules/system/audio.nix b/core/system/audio.nix similarity index 100% rename from modules/system/audio.nix rename to core/system/audio.nix diff --git a/modules/system/bluetooth.nix b/core/system/bluetooth.nix similarity index 100% rename from modules/system/bluetooth.nix rename to core/system/bluetooth.nix diff --git a/modules/system/hardware.nix b/core/system/hardware.nix similarity index 100% rename from modules/system/hardware.nix rename to core/system/hardware.nix diff --git a/modules/system/impermanence.nix b/core/system/impermanence.nix similarity index 100% rename from modules/system/impermanence.nix rename to core/system/impermanence.nix diff --git a/modules/system/network.nix b/core/system/network.nix similarity index 100% rename from modules/system/network.nix rename to core/system/network.nix diff --git a/modules/system/options.nix b/core/system/options.nix similarity index 100% rename from modules/system/options.nix rename to core/system/options.nix diff --git a/bin/hardware/nomarchy-battery-capacity b/core/system/scripts/nomarchy-battery-capacity similarity index 100% rename from bin/hardware/nomarchy-battery-capacity rename to core/system/scripts/nomarchy-battery-capacity diff --git a/bin/hardware/nomarchy-battery-monitor b/core/system/scripts/nomarchy-battery-monitor similarity index 100% rename from bin/hardware/nomarchy-battery-monitor rename to core/system/scripts/nomarchy-battery-monitor diff --git a/bin/hardware/nomarchy-battery-present b/core/system/scripts/nomarchy-battery-present similarity index 100% rename from bin/hardware/nomarchy-battery-present rename to core/system/scripts/nomarchy-battery-present diff --git a/bin/hardware/nomarchy-battery-remaining b/core/system/scripts/nomarchy-battery-remaining similarity index 100% rename from bin/hardware/nomarchy-battery-remaining rename to core/system/scripts/nomarchy-battery-remaining diff --git a/bin/hardware/nomarchy-battery-remaining-time b/core/system/scripts/nomarchy-battery-remaining-time similarity index 100% rename from bin/hardware/nomarchy-battery-remaining-time rename to core/system/scripts/nomarchy-battery-remaining-time diff --git a/bin/hardware/nomarchy-battery-status b/core/system/scripts/nomarchy-battery-status similarity index 100% rename from bin/hardware/nomarchy-battery-status rename to core/system/scripts/nomarchy-battery-status diff --git a/bin/hardware/nomarchy-brightness-display b/core/system/scripts/nomarchy-brightness-display similarity index 100% rename from bin/hardware/nomarchy-brightness-display rename to core/system/scripts/nomarchy-brightness-display diff --git a/bin/hardware/nomarchy-brightness-display-apple b/core/system/scripts/nomarchy-brightness-display-apple similarity index 100% rename from bin/hardware/nomarchy-brightness-display-apple rename to core/system/scripts/nomarchy-brightness-display-apple diff --git a/bin/hardware/nomarchy-brightness-keyboard b/core/system/scripts/nomarchy-brightness-keyboard similarity index 100% rename from bin/hardware/nomarchy-brightness-keyboard rename to core/system/scripts/nomarchy-brightness-keyboard diff --git a/bin/hardware/nomarchy-haptic-touchpad b/core/system/scripts/nomarchy-haptic-touchpad similarity index 100% rename from bin/hardware/nomarchy-haptic-touchpad rename to core/system/scripts/nomarchy-haptic-touchpad diff --git a/bin/system/nomarchy-hibernation-available b/core/system/scripts/nomarchy-hibernation-available similarity index 100% rename from bin/system/nomarchy-hibernation-available rename to core/system/scripts/nomarchy-hibernation-available diff --git a/bin/system/nomarchy-hibernation-remove b/core/system/scripts/nomarchy-hibernation-remove similarity index 100% rename from bin/system/nomarchy-hibernation-remove rename to core/system/scripts/nomarchy-hibernation-remove diff --git a/bin/system/nomarchy-hibernation-setup b/core/system/scripts/nomarchy-hibernation-setup similarity index 100% rename from bin/system/nomarchy-hibernation-setup rename to core/system/scripts/nomarchy-hibernation-setup diff --git a/bin/hardware/nomarchy-hw-asus-rog b/core/system/scripts/nomarchy-hw-asus-rog similarity index 100% rename from bin/hardware/nomarchy-hw-asus-rog rename to core/system/scripts/nomarchy-hw-asus-rog diff --git a/bin/hardware/nomarchy-hw-framework16 b/core/system/scripts/nomarchy-hw-framework16 similarity index 100% rename from bin/hardware/nomarchy-hw-framework16 rename to core/system/scripts/nomarchy-hw-framework16 diff --git a/bin/hardware/nomarchy-hw-intel b/core/system/scripts/nomarchy-hw-intel similarity index 100% rename from bin/hardware/nomarchy-hw-intel rename to core/system/scripts/nomarchy-hw-intel diff --git a/bin/hardware/nomarchy-hw-intel-ptl b/core/system/scripts/nomarchy-hw-intel-ptl similarity index 100% rename from bin/hardware/nomarchy-hw-intel-ptl rename to core/system/scripts/nomarchy-hw-intel-ptl diff --git a/bin/hardware/nomarchy-hw-match b/core/system/scripts/nomarchy-hw-match similarity index 100% rename from bin/hardware/nomarchy-hw-match rename to core/system/scripts/nomarchy-hw-match diff --git a/bin/hardware/nomarchy-hw-surface b/core/system/scripts/nomarchy-hw-surface similarity index 100% rename from bin/hardware/nomarchy-hw-surface rename to core/system/scripts/nomarchy-hw-surface diff --git a/bin/hardware/nomarchy-hw-vulkan b/core/system/scripts/nomarchy-hw-vulkan similarity index 100% rename from bin/hardware/nomarchy-hw-vulkan rename to core/system/scripts/nomarchy-hw-vulkan diff --git a/bin/system/nomarchy-pkg-add b/core/system/scripts/nomarchy-pkg-add similarity index 100% rename from bin/system/nomarchy-pkg-add rename to core/system/scripts/nomarchy-pkg-add diff --git a/bin/system/nomarchy-pkg-remove b/core/system/scripts/nomarchy-pkg-remove similarity index 100% rename from bin/system/nomarchy-pkg-remove rename to core/system/scripts/nomarchy-pkg-remove diff --git a/bin/hardware/nomarchy-powerprofiles-list b/core/system/scripts/nomarchy-powerprofiles-list similarity index 100% rename from bin/hardware/nomarchy-powerprofiles-list rename to core/system/scripts/nomarchy-powerprofiles-list diff --git a/bin/system/nomarchy-preflight-migration b/core/system/scripts/nomarchy-preflight-migration similarity index 100% rename from bin/system/nomarchy-preflight-migration rename to core/system/scripts/nomarchy-preflight-migration diff --git a/bin/system/nomarchy-restart-bluetooth b/core/system/scripts/nomarchy-restart-bluetooth similarity index 100% rename from bin/system/nomarchy-restart-bluetooth rename to core/system/scripts/nomarchy-restart-bluetooth diff --git a/bin/hardware/nomarchy-restart-makima b/core/system/scripts/nomarchy-restart-makima similarity index 100% rename from bin/hardware/nomarchy-restart-makima rename to core/system/scripts/nomarchy-restart-makima diff --git a/bin/system/nomarchy-restart-pipewire b/core/system/scripts/nomarchy-restart-pipewire similarity index 100% rename from bin/system/nomarchy-restart-pipewire rename to core/system/scripts/nomarchy-restart-pipewire diff --git a/bin/hardware/nomarchy-restart-trackpad b/core/system/scripts/nomarchy-restart-trackpad similarity index 100% rename from bin/hardware/nomarchy-restart-trackpad rename to core/system/scripts/nomarchy-restart-trackpad diff --git a/bin/system/nomarchy-restart-wifi b/core/system/scripts/nomarchy-restart-wifi similarity index 100% rename from bin/system/nomarchy-restart-wifi rename to core/system/scripts/nomarchy-restart-wifi diff --git a/bin/system/nomarchy-restart-xcompose b/core/system/scripts/nomarchy-restart-xcompose similarity index 100% rename from bin/system/nomarchy-restart-xcompose rename to core/system/scripts/nomarchy-restart-xcompose diff --git a/bin/system/nomarchy-setup-dns b/core/system/scripts/nomarchy-setup-dns similarity index 100% rename from bin/system/nomarchy-setup-dns rename to core/system/scripts/nomarchy-setup-dns diff --git a/bin/system/nomarchy-setup-fido2 b/core/system/scripts/nomarchy-setup-fido2 similarity index 100% rename from bin/system/nomarchy-setup-fido2 rename to core/system/scripts/nomarchy-setup-fido2 diff --git a/bin/system/nomarchy-setup-fingerprint b/core/system/scripts/nomarchy-setup-fingerprint similarity index 100% rename from bin/system/nomarchy-setup-fingerprint rename to core/system/scripts/nomarchy-setup-fingerprint diff --git a/bin/system/nomarchy-sudo-keepalive b/core/system/scripts/nomarchy-sudo-keepalive similarity index 100% rename from bin/system/nomarchy-sudo-keepalive rename to core/system/scripts/nomarchy-sudo-keepalive diff --git a/bin/system/nomarchy-sudo-passwordless-toggle b/core/system/scripts/nomarchy-sudo-passwordless-toggle similarity index 100% rename from bin/system/nomarchy-sudo-passwordless-toggle rename to core/system/scripts/nomarchy-sudo-passwordless-toggle diff --git a/bin/system/nomarchy-sudo-reset b/core/system/scripts/nomarchy-sudo-reset similarity index 100% rename from bin/system/nomarchy-sudo-reset rename to core/system/scripts/nomarchy-sudo-reset diff --git a/bin/system/nomarchy-system-logout b/core/system/scripts/nomarchy-system-logout similarity index 100% rename from bin/system/nomarchy-system-logout rename to core/system/scripts/nomarchy-system-logout diff --git a/bin/system/nomarchy-system-reboot b/core/system/scripts/nomarchy-system-reboot similarity index 100% rename from bin/system/nomarchy-system-reboot rename to core/system/scripts/nomarchy-system-reboot diff --git a/bin/system/nomarchy-system-shutdown b/core/system/scripts/nomarchy-system-shutdown similarity index 100% rename from bin/system/nomarchy-system-shutdown rename to core/system/scripts/nomarchy-system-shutdown diff --git a/bin/hardware/nomarchy-toggle-hybrid-gpu b/core/system/scripts/nomarchy-toggle-hybrid-gpu similarity index 100% rename from bin/hardware/nomarchy-toggle-hybrid-gpu rename to core/system/scripts/nomarchy-toggle-hybrid-gpu diff --git a/bin/system/nomarchy-toggle-idle b/core/system/scripts/nomarchy-toggle-idle similarity index 100% rename from bin/system/nomarchy-toggle-idle rename to core/system/scripts/nomarchy-toggle-idle diff --git a/bin/system/nomarchy-toggle-suspend b/core/system/scripts/nomarchy-toggle-suspend similarity index 100% rename from bin/system/nomarchy-toggle-suspend rename to core/system/scripts/nomarchy-toggle-suspend diff --git a/bin/system/nomarchy-tz-select b/core/system/scripts/nomarchy-tz-select similarity index 100% rename from bin/system/nomarchy-tz-select rename to core/system/scripts/nomarchy-tz-select diff --git a/bin/system/nomarchy-update b/core/system/scripts/nomarchy-update similarity index 100% rename from bin/system/nomarchy-update rename to core/system/scripts/nomarchy-update diff --git a/bin/system/nomarchy-update-time b/core/system/scripts/nomarchy-update-time similarity index 100% rename from bin/system/nomarchy-update-time rename to core/system/scripts/nomarchy-update-time diff --git a/bin/hardware/nomarchy-wifi-powersave b/core/system/scripts/nomarchy-wifi-powersave similarity index 100% rename from bin/hardware/nomarchy-wifi-powersave rename to core/system/scripts/nomarchy-wifi-powersave diff --git a/modules/system/state.nix b/core/system/state.nix similarity index 100% rename from modules/system/state.nix rename to core/system/state.nix diff --git a/modules/system/systemd.nix b/core/system/systemd.nix similarity index 100% rename from modules/system/systemd.nix rename to core/system/systemd.nix diff --git a/modules/system/vm-guest.nix b/core/system/vm-guest.nix similarity index 100% rename from modules/system/vm-guest.nix rename to core/system/vm-guest.nix diff --git a/config/alacritty/alacritty.toml b/features/apps/alacritty/config/alacritty.toml similarity index 100% rename from config/alacritty/alacritty.toml rename to features/apps/alacritty/config/alacritty.toml diff --git a/modules/home/alacritty.nix b/features/apps/alacritty/default.nix similarity index 100% rename from modules/home/alacritty.nix rename to features/apps/alacritty/default.nix diff --git a/modules/system/browser.nix b/features/apps/browser.nix similarity index 100% rename from modules/system/browser.nix rename to features/apps/browser.nix diff --git a/config/btop/btop.conf b/features/apps/btop/config/btop.conf similarity index 100% rename from config/btop/btop.conf rename to features/apps/btop/config/btop.conf diff --git a/config/chromium/Default/Preferences b/features/apps/chromium/config/Default/Preferences similarity index 100% rename from config/chromium/Default/Preferences rename to features/apps/chromium/config/Default/Preferences diff --git a/config/elephant/calc.toml b/features/apps/elephant/config/calc.toml similarity index 100% rename from config/elephant/calc.toml rename to features/apps/elephant/config/calc.toml diff --git a/config/elephant/desktopapplications.toml b/features/apps/elephant/config/desktopapplications.toml similarity index 100% rename from config/elephant/desktopapplications.toml rename to features/apps/elephant/config/desktopapplications.toml diff --git a/config/elephant/symbols.toml b/features/apps/elephant/config/symbols.toml similarity index 100% rename from config/elephant/symbols.toml rename to features/apps/elephant/config/symbols.toml diff --git a/config/ghostty/config b/features/apps/ghostty/config/config similarity index 100% rename from config/ghostty/config rename to features/apps/ghostty/config/config diff --git a/config/kitty/kitty.conf b/features/apps/kitty/config/kitty.conf similarity index 100% rename from config/kitty/kitty.conf rename to features/apps/kitty/config/kitty.conf diff --git a/config/lazygit/config.yml b/features/apps/lazygit/config/config.yml similarity index 100% rename from config/lazygit/config.yml rename to features/apps/lazygit/config/config.yml diff --git a/modules/system/makima.nix b/features/apps/makima.nix similarity index 100% rename from modules/system/makima.nix rename to features/apps/makima.nix diff --git a/assets/makima/AT Translated Set 2 keyboard.toml b/features/apps/makima/AT Translated Set 2 keyboard.toml similarity index 100% rename from assets/makima/AT Translated Set 2 keyboard.toml rename to features/apps/makima/AT Translated Set 2 keyboard.toml diff --git a/config/opencode/opencode.json b/features/apps/opencode/config/opencode.json similarity index 100% rename from config/opencode/opencode.json rename to features/apps/opencode/config/opencode.json diff --git a/bin/apps/nomarchy-launch-about b/features/apps/scripts/nomarchy-launch-about similarity index 100% rename from bin/apps/nomarchy-launch-about rename to features/apps/scripts/nomarchy-launch-about diff --git a/bin/apps/nomarchy-launch-audio b/features/apps/scripts/nomarchy-launch-audio similarity index 100% rename from bin/apps/nomarchy-launch-audio rename to features/apps/scripts/nomarchy-launch-audio diff --git a/bin/apps/nomarchy-launch-bluetooth b/features/apps/scripts/nomarchy-launch-bluetooth similarity index 100% rename from bin/apps/nomarchy-launch-bluetooth rename to features/apps/scripts/nomarchy-launch-bluetooth diff --git a/bin/apps/nomarchy-launch-browser b/features/apps/scripts/nomarchy-launch-browser similarity index 100% rename from bin/apps/nomarchy-launch-browser rename to features/apps/scripts/nomarchy-launch-browser diff --git a/bin/apps/nomarchy-launch-editor b/features/apps/scripts/nomarchy-launch-editor similarity index 100% rename from bin/apps/nomarchy-launch-editor rename to features/apps/scripts/nomarchy-launch-editor diff --git a/bin/apps/nomarchy-launch-floating-terminal-with-presentation b/features/apps/scripts/nomarchy-launch-floating-terminal-with-presentation similarity index 100% rename from bin/apps/nomarchy-launch-floating-terminal-with-presentation rename to features/apps/scripts/nomarchy-launch-floating-terminal-with-presentation diff --git a/bin/apps/nomarchy-launch-or-focus b/features/apps/scripts/nomarchy-launch-or-focus similarity index 100% rename from bin/apps/nomarchy-launch-or-focus rename to features/apps/scripts/nomarchy-launch-or-focus diff --git a/bin/apps/nomarchy-launch-or-focus-tui b/features/apps/scripts/nomarchy-launch-or-focus-tui similarity index 100% rename from bin/apps/nomarchy-launch-or-focus-tui rename to features/apps/scripts/nomarchy-launch-or-focus-tui diff --git a/bin/apps/nomarchy-launch-or-focus-webapp b/features/apps/scripts/nomarchy-launch-or-focus-webapp similarity index 100% rename from bin/apps/nomarchy-launch-or-focus-webapp rename to features/apps/scripts/nomarchy-launch-or-focus-webapp diff --git a/bin/apps/nomarchy-launch-screensaver b/features/apps/scripts/nomarchy-launch-screensaver similarity index 100% rename from bin/apps/nomarchy-launch-screensaver rename to features/apps/scripts/nomarchy-launch-screensaver diff --git a/bin/apps/nomarchy-launch-tui b/features/apps/scripts/nomarchy-launch-tui similarity index 100% rename from bin/apps/nomarchy-launch-tui rename to features/apps/scripts/nomarchy-launch-tui diff --git a/bin/apps/nomarchy-launch-walker b/features/apps/scripts/nomarchy-launch-walker similarity index 100% rename from bin/apps/nomarchy-launch-walker rename to features/apps/scripts/nomarchy-launch-walker diff --git a/bin/apps/nomarchy-launch-webapp b/features/apps/scripts/nomarchy-launch-webapp similarity index 100% rename from bin/apps/nomarchy-launch-webapp rename to features/apps/scripts/nomarchy-launch-webapp diff --git a/bin/apps/nomarchy-launch-wifi b/features/apps/scripts/nomarchy-launch-wifi similarity index 100% rename from bin/apps/nomarchy-launch-wifi rename to features/apps/scripts/nomarchy-launch-wifi diff --git a/bin/apps/nomarchy-restart-app b/features/apps/scripts/nomarchy-restart-app similarity index 100% rename from bin/apps/nomarchy-restart-app rename to features/apps/scripts/nomarchy-restart-app diff --git a/bin/apps/nomarchy-restart-btop b/features/apps/scripts/nomarchy-restart-btop similarity index 100% rename from bin/apps/nomarchy-restart-btop rename to features/apps/scripts/nomarchy-restart-btop diff --git a/bin/apps/nomarchy-restart-opencode b/features/apps/scripts/nomarchy-restart-opencode similarity index 100% rename from bin/apps/nomarchy-restart-opencode rename to features/apps/scripts/nomarchy-restart-opencode diff --git a/bin/apps/nomarchy-restart-terminal b/features/apps/scripts/nomarchy-restart-terminal similarity index 100% rename from bin/apps/nomarchy-restart-terminal rename to features/apps/scripts/nomarchy-restart-terminal diff --git a/bin/apps/nomarchy-restart-tmux b/features/apps/scripts/nomarchy-restart-tmux similarity index 100% rename from bin/apps/nomarchy-restart-tmux rename to features/apps/scripts/nomarchy-restart-tmux diff --git a/bin/apps/nomarchy-tui-install b/features/apps/scripts/nomarchy-tui-install similarity index 100% rename from bin/apps/nomarchy-tui-install rename to features/apps/scripts/nomarchy-tui-install diff --git a/bin/apps/nomarchy-tui-remove b/features/apps/scripts/nomarchy-tui-remove similarity index 100% rename from bin/apps/nomarchy-tui-remove rename to features/apps/scripts/nomarchy-tui-remove diff --git a/bin/apps/nomarchy-tui-remove-all b/features/apps/scripts/nomarchy-tui-remove-all similarity index 100% rename from bin/apps/nomarchy-tui-remove-all rename to features/apps/scripts/nomarchy-tui-remove-all diff --git a/bin/apps/nomarchy-voxtype-config b/features/apps/scripts/nomarchy-voxtype-config similarity index 100% rename from bin/apps/nomarchy-voxtype-config rename to features/apps/scripts/nomarchy-voxtype-config diff --git a/bin/apps/nomarchy-voxtype-install b/features/apps/scripts/nomarchy-voxtype-install similarity index 100% rename from bin/apps/nomarchy-voxtype-install rename to features/apps/scripts/nomarchy-voxtype-install diff --git a/bin/apps/nomarchy-voxtype-model b/features/apps/scripts/nomarchy-voxtype-model similarity index 100% rename from bin/apps/nomarchy-voxtype-model rename to features/apps/scripts/nomarchy-voxtype-model diff --git a/bin/apps/nomarchy-voxtype-remove b/features/apps/scripts/nomarchy-voxtype-remove similarity index 100% rename from bin/apps/nomarchy-voxtype-remove rename to features/apps/scripts/nomarchy-voxtype-remove diff --git a/bin/apps/nomarchy-voxtype-status b/features/apps/scripts/nomarchy-voxtype-status similarity index 100% rename from bin/apps/nomarchy-voxtype-status rename to features/apps/scripts/nomarchy-voxtype-status diff --git a/bin/apps/nomarchy-webapp-handler-hey b/features/apps/scripts/nomarchy-webapp-handler-hey similarity index 100% rename from bin/apps/nomarchy-webapp-handler-hey rename to features/apps/scripts/nomarchy-webapp-handler-hey diff --git a/bin/apps/nomarchy-webapp-handler-zoom b/features/apps/scripts/nomarchy-webapp-handler-zoom similarity index 100% rename from bin/apps/nomarchy-webapp-handler-zoom rename to features/apps/scripts/nomarchy-webapp-handler-zoom diff --git a/bin/apps/nomarchy-webapp-install b/features/apps/scripts/nomarchy-webapp-install similarity index 100% rename from bin/apps/nomarchy-webapp-install rename to features/apps/scripts/nomarchy-webapp-install diff --git a/bin/apps/nomarchy-webapp-remove b/features/apps/scripts/nomarchy-webapp-remove similarity index 100% rename from bin/apps/nomarchy-webapp-remove rename to features/apps/scripts/nomarchy-webapp-remove diff --git a/bin/apps/nomarchy-webapp-remove-all b/features/apps/scripts/nomarchy-webapp-remove-all similarity index 100% rename from bin/apps/nomarchy-webapp-remove-all rename to features/apps/scripts/nomarchy-webapp-remove-all diff --git a/bin/apps/nomarchy-windows-vm b/features/apps/scripts/nomarchy-windows-vm similarity index 100% rename from bin/apps/nomarchy-windows-vm rename to features/apps/scripts/nomarchy-windows-vm diff --git a/modules/home/swayosd.nix b/features/apps/swayosd.nix similarity index 100% rename from modules/home/swayosd.nix rename to features/apps/swayosd.nix diff --git a/config/tmux/tmux.conf b/features/apps/tmux/config/tmux.conf similarity index 100% rename from config/tmux/tmux.conf rename to features/apps/tmux/config/tmux.conf diff --git a/modules/home/vscode.nix b/features/apps/vscode.nix similarity index 100% rename from modules/home/vscode.nix rename to features/apps/vscode.nix diff --git a/modules/home/walker.nix b/features/apps/walker.nix similarity index 100% rename from modules/home/walker.nix rename to features/apps/walker.nix diff --git a/modules/home/default.nix b/features/default.nix similarity index 71% rename from modules/home/default.nix rename to features/default.nix index 0d7c219..346e3d7 100644 --- a/modules/home/default.nix +++ b/features/default.nix @@ -15,28 +15,28 @@ in imports = [ inputs.nix-colors.homeManagerModules.default inputs.walker.homeManagerModules.default - ./stylix-compat.nix # Compatibility shims for stylix target modules - ./options.nix - ./state.nix - ./overrides.nix - ./behavior-configs.nix - ./theme-loader.nix - ./theme-files.nix - ./fonts.nix - ./alacritty.nix - ./nightlight.nix - ./idle.nix - ./stylix.nix - ./hyprland.nix - ./waybar.nix - ./walker.nix - ./theme-switcher.nix - ./scripts.nix - ./configs.nix - ./swayosd.nix - ./security.nix - ./battery-monitor.nix - ./bash.nix + ../themes/engine/stylix-compat.nix + ../core/home/options.nix + ../core/home/state.nix + ../core/home/overrides.nix + ../core/home/behavior.nix + ../themes/engine/loader.nix + ../themes/engine/files.nix + ../core/home/fonts.nix + ./apps/alacritty/default.nix + ./desktop/nightlight.nix + ./desktop/idle.nix + ../themes/engine/stylix.nix + ./desktop/hyprland/default.nix + ./desktop/waybar/default.nix + ./apps/walker.nix + ../themes/engine/switcher.nix + ./scripts/default.nix + ../core/home/configs.nix + ./apps/swayosd.nix + ../core/home/security.nix + ./scripts/battery-monitor.nix + ../core/home/bash.nix ]; colorScheme = lib.mkDefault (nomarchyLib.getColorScheme config.nomarchy.theme); diff --git a/config/hyprland-preview-share-picker/config.yaml b/features/desktop/hyprland-preview-share-picker/config/config.yaml similarity index 100% rename from config/hyprland-preview-share-picker/config.yaml rename to features/desktop/hyprland-preview-share-picker/config/config.yaml diff --git a/config/hypr/autostart.conf b/features/desktop/hyprland/config/autostart.conf similarity index 100% rename from config/hypr/autostart.conf rename to features/desktop/hyprland/config/autostart.conf diff --git a/config/hypr/bindings.conf b/features/desktop/hyprland/config/bindings.conf similarity index 100% rename from config/hypr/bindings.conf rename to features/desktop/hyprland/config/bindings.conf diff --git a/config/hypr/hyprlock.conf b/features/desktop/hyprland/config/hyprlock.conf similarity index 100% rename from config/hypr/hyprlock.conf rename to features/desktop/hyprland/config/hyprlock.conf diff --git a/config/hypr/hyprsunset.conf b/features/desktop/hyprland/config/hyprsunset.conf similarity index 100% rename from config/hypr/hyprsunset.conf rename to features/desktop/hyprland/config/hyprsunset.conf diff --git a/config/hypr/input.conf b/features/desktop/hyprland/config/input.conf similarity index 100% rename from config/hypr/input.conf rename to features/desktop/hyprland/config/input.conf diff --git a/config/hypr/looknfeel.conf b/features/desktop/hyprland/config/looknfeel.conf similarity index 100% rename from config/hypr/looknfeel.conf rename to features/desktop/hyprland/config/looknfeel.conf diff --git a/config/hypr/monitors.conf b/features/desktop/hyprland/config/monitors.conf similarity index 100% rename from config/hypr/monitors.conf rename to features/desktop/hyprland/config/monitors.conf diff --git a/config/hypr/nomarchy.conf b/features/desktop/hyprland/config/nomarchy.conf similarity index 100% rename from config/hypr/nomarchy.conf rename to features/desktop/hyprland/config/nomarchy.conf diff --git a/config/hypr/xdph.conf b/features/desktop/hyprland/config/xdph.conf similarity index 100% rename from config/hypr/xdph.conf rename to features/desktop/hyprland/config/xdph.conf diff --git a/modules/home/hyprland.nix b/features/desktop/hyprland/default.nix similarity index 100% rename from modules/home/hyprland.nix rename to features/desktop/hyprland/default.nix diff --git a/assets/themes/kanagawa/apps/hyprland.conf b/features/desktop/hyprland/themes/kanagawa/hyprland.conf similarity index 100% rename from assets/themes/kanagawa/apps/hyprland.conf rename to features/desktop/hyprland/themes/kanagawa/hyprland.conf diff --git a/assets/themes/lumon/apps/hyprland.conf b/features/desktop/hyprland/themes/lumon/hyprland.conf similarity index 100% rename from assets/themes/lumon/apps/hyprland.conf rename to features/desktop/hyprland/themes/lumon/hyprland.conf diff --git a/assets/themes/nord/apps/hyprland.conf b/features/desktop/hyprland/themes/nord/hyprland.conf similarity index 100% rename from assets/themes/nord/apps/hyprland.conf rename to features/desktop/hyprland/themes/nord/hyprland.conf diff --git a/assets/themes/retro-82/apps/hyprland.conf b/features/desktop/hyprland/themes/retro-82/hyprland.conf similarity index 100% rename from assets/themes/retro-82/apps/hyprland.conf rename to features/desktop/hyprland/themes/retro-82/hyprland.conf diff --git a/assets/themes/summer-night/apps/hyprland.conf b/features/desktop/hyprland/themes/summer-night/hyprland.conf similarity index 100% rename from assets/themes/summer-night/apps/hyprland.conf rename to features/desktop/hyprland/themes/summer-night/hyprland.conf diff --git a/modules/home/idle.nix b/features/desktop/idle.nix similarity index 100% rename from modules/home/idle.nix rename to features/desktop/idle.nix diff --git a/modules/home/nightlight.nix b/features/desktop/nightlight.nix similarity index 100% rename from modules/home/nightlight.nix rename to features/desktop/nightlight.nix diff --git a/bin/wm/nomarchy-hyprland-active-window-transparency-toggle b/features/desktop/scripts/nomarchy-hyprland-active-window-transparency-toggle similarity index 100% rename from bin/wm/nomarchy-hyprland-active-window-transparency-toggle rename to features/desktop/scripts/nomarchy-hyprland-active-window-transparency-toggle diff --git a/bin/wm/nomarchy-hyprland-monitor-scaling-cycle b/features/desktop/scripts/nomarchy-hyprland-monitor-scaling-cycle similarity index 100% rename from bin/wm/nomarchy-hyprland-monitor-scaling-cycle rename to features/desktop/scripts/nomarchy-hyprland-monitor-scaling-cycle diff --git a/bin/wm/nomarchy-hyprland-window-close-all b/features/desktop/scripts/nomarchy-hyprland-window-close-all similarity index 100% rename from bin/wm/nomarchy-hyprland-window-close-all rename to features/desktop/scripts/nomarchy-hyprland-window-close-all diff --git a/bin/wm/nomarchy-hyprland-window-gaps-toggle b/features/desktop/scripts/nomarchy-hyprland-window-gaps-toggle similarity index 100% rename from bin/wm/nomarchy-hyprland-window-gaps-toggle rename to features/desktop/scripts/nomarchy-hyprland-window-gaps-toggle diff --git a/bin/wm/nomarchy-hyprland-window-pop b/features/desktop/scripts/nomarchy-hyprland-window-pop similarity index 100% rename from bin/wm/nomarchy-hyprland-window-pop rename to features/desktop/scripts/nomarchy-hyprland-window-pop diff --git a/bin/wm/nomarchy-hyprland-window-single-square-aspect-toggle b/features/desktop/scripts/nomarchy-hyprland-window-single-square-aspect-toggle similarity index 100% rename from bin/wm/nomarchy-hyprland-window-single-square-aspect-toggle rename to features/desktop/scripts/nomarchy-hyprland-window-single-square-aspect-toggle diff --git a/bin/wm/nomarchy-hyprland-workspace-layout-toggle b/features/desktop/scripts/nomarchy-hyprland-workspace-layout-toggle similarity index 100% rename from bin/wm/nomarchy-hyprland-workspace-layout-toggle rename to features/desktop/scripts/nomarchy-hyprland-workspace-layout-toggle diff --git a/bin/wm/nomarchy-restart-hyprctl b/features/desktop/scripts/nomarchy-restart-hyprctl similarity index 100% rename from bin/wm/nomarchy-restart-hyprctl rename to features/desktop/scripts/nomarchy-restart-hyprctl diff --git a/bin/wm/nomarchy-restart-hypridle b/features/desktop/scripts/nomarchy-restart-hypridle similarity index 100% rename from bin/wm/nomarchy-restart-hypridle rename to features/desktop/scripts/nomarchy-restart-hypridle diff --git a/bin/wm/nomarchy-restart-hyprsunset b/features/desktop/scripts/nomarchy-restart-hyprsunset similarity index 100% rename from bin/wm/nomarchy-restart-hyprsunset rename to features/desktop/scripts/nomarchy-restart-hyprsunset diff --git a/bin/wm/nomarchy-restart-mako b/features/desktop/scripts/nomarchy-restart-mako similarity index 100% rename from bin/wm/nomarchy-restart-mako rename to features/desktop/scripts/nomarchy-restart-mako diff --git a/bin/wm/nomarchy-restart-swayosd b/features/desktop/scripts/nomarchy-restart-swayosd similarity index 100% rename from bin/wm/nomarchy-restart-swayosd rename to features/desktop/scripts/nomarchy-restart-swayosd diff --git a/bin/wm/nomarchy-restart-walker b/features/desktop/scripts/nomarchy-restart-walker similarity index 100% rename from bin/wm/nomarchy-restart-walker rename to features/desktop/scripts/nomarchy-restart-walker diff --git a/bin/wm/nomarchy-restart-waybar b/features/desktop/scripts/nomarchy-restart-waybar similarity index 100% rename from bin/wm/nomarchy-restart-waybar rename to features/desktop/scripts/nomarchy-restart-waybar diff --git a/bin/wm/nomarchy-swayosd-brightness b/features/desktop/scripts/nomarchy-swayosd-brightness similarity index 100% rename from bin/wm/nomarchy-swayosd-brightness rename to features/desktop/scripts/nomarchy-swayosd-brightness diff --git a/bin/wm/nomarchy-swayosd-kbd-brightness b/features/desktop/scripts/nomarchy-swayosd-kbd-brightness similarity index 100% rename from bin/wm/nomarchy-swayosd-kbd-brightness rename to features/desktop/scripts/nomarchy-swayosd-kbd-brightness diff --git a/bin/wm/nomarchy-toggle-screensaver b/features/desktop/scripts/nomarchy-toggle-screensaver similarity index 100% rename from bin/wm/nomarchy-toggle-screensaver rename to features/desktop/scripts/nomarchy-toggle-screensaver diff --git a/bin/wm/nomarchy-toggle-waybar b/features/desktop/scripts/nomarchy-toggle-waybar similarity index 100% rename from bin/wm/nomarchy-toggle-waybar rename to features/desktop/scripts/nomarchy-toggle-waybar diff --git a/config/waybar/config.jsonc b/features/desktop/waybar/config/config.jsonc similarity index 100% rename from config/waybar/config.jsonc rename to features/desktop/waybar/config/config.jsonc diff --git a/config/waybar/style.css b/features/desktop/waybar/config/style.css similarity index 100% rename from config/waybar/style.css rename to features/desktop/waybar/config/style.css diff --git a/features/desktop/waybar/default.nix b/features/desktop/waybar/default.nix new file mode 100644 index 0000000..6e872f8 --- /dev/null +++ b/features/desktop/waybar/default.nix @@ -0,0 +1,32 @@ +{ config, pkgs, lib, ... }: + +let + activeTheme = config.nomarchy.theme; + + # Path to local theme files + themeDir = ./themes + "/${activeTheme}"; + hasThemeConfig = builtins.pathExists (themeDir + "/config.jsonc"); + hasThemeStyle = builtins.pathExists (themeDir + "/style.css"); + + # Default fallback files + defaultConfig = ./config/config.jsonc; + defaultStyle = ./config/style.css; + + # Selected files + configFile = if hasThemeConfig then (themeDir + "/config.jsonc") else defaultConfig; + styleFile = if hasThemeStyle then (themeDir + "/style.css") else defaultStyle; + +in +{ + programs.waybar = { + enable = lib.mkDefault true; + systemd.enable = lib.mkDefault true; + + settings = lib.mkDefault [ (builtins.fromJSON (builtins.readFile configFile)) ]; + style = lib.mkDefault (builtins.readFile styleFile); + }; + + home.packages = lib.mkDefault (with pkgs; [ + font-awesome + ]); +} diff --git a/assets/themes/catppuccin/apps/waybar.css b/features/desktop/waybar/themes/catppuccin/style.css similarity index 100% rename from assets/themes/catppuccin/apps/waybar.css rename to features/desktop/waybar/themes/catppuccin/style.css diff --git a/assets/themes/lumon/apps/waybar.css b/features/desktop/waybar/themes/lumon/style.css similarity index 100% rename from assets/themes/lumon/apps/waybar.css rename to features/desktop/waybar/themes/lumon/style.css diff --git a/assets/themes/retro-82/apps/waybar.css b/features/desktop/waybar/themes/retro-82/style.css similarity index 100% rename from assets/themes/retro-82/apps/waybar.css rename to features/desktop/waybar/themes/retro-82/style.css diff --git a/assets/themes/summer-night/apps/waybar.json b/features/desktop/waybar/themes/summer-night/config.jsonc similarity index 100% rename from assets/themes/summer-night/apps/waybar.json rename to features/desktop/waybar/themes/summer-night/config.jsonc diff --git a/assets/themes/summer-night/apps/waybar.css b/features/desktop/waybar/themes/summer-night/style.css similarity index 100% rename from assets/themes/summer-night/apps/waybar.css rename to features/desktop/waybar/themes/summer-night/style.css diff --git a/modules/home/battery-monitor.nix b/features/scripts/battery-monitor.nix similarity index 100% rename from modules/home/battery-monitor.nix rename to features/scripts/battery-monitor.nix diff --git a/modules/home/scripts.nix b/features/scripts/default.nix similarity index 100% rename from modules/home/scripts.nix rename to features/scripts/default.nix diff --git a/bin/utils/nomarchy-build-iso b/features/scripts/utils/nomarchy-build-iso similarity index 100% rename from bin/utils/nomarchy-build-iso rename to features/scripts/utils/nomarchy-build-iso diff --git a/bin/utils/nomarchy-cmd-audio-switch b/features/scripts/utils/nomarchy-cmd-audio-switch similarity index 100% rename from bin/utils/nomarchy-cmd-audio-switch rename to features/scripts/utils/nomarchy-cmd-audio-switch diff --git a/bin/utils/nomarchy-cmd-present b/features/scripts/utils/nomarchy-cmd-present similarity index 100% rename from bin/utils/nomarchy-cmd-present rename to features/scripts/utils/nomarchy-cmd-present diff --git a/bin/utils/nomarchy-cmd-screenrecord b/features/scripts/utils/nomarchy-cmd-screenrecord similarity index 100% rename from bin/utils/nomarchy-cmd-screenrecord rename to features/scripts/utils/nomarchy-cmd-screenrecord diff --git a/bin/utils/nomarchy-cmd-screensaver b/features/scripts/utils/nomarchy-cmd-screensaver similarity index 100% rename from bin/utils/nomarchy-cmd-screensaver rename to features/scripts/utils/nomarchy-cmd-screensaver diff --git a/bin/utils/nomarchy-cmd-screenshot b/features/scripts/utils/nomarchy-cmd-screenshot similarity index 100% rename from bin/utils/nomarchy-cmd-screenshot rename to features/scripts/utils/nomarchy-cmd-screenshot diff --git a/bin/utils/nomarchy-cmd-share b/features/scripts/utils/nomarchy-cmd-share similarity index 100% rename from bin/utils/nomarchy-cmd-share rename to features/scripts/utils/nomarchy-cmd-share diff --git a/bin/utils/nomarchy-cmd-terminal-cwd b/features/scripts/utils/nomarchy-cmd-terminal-cwd similarity index 100% rename from bin/utils/nomarchy-cmd-terminal-cwd rename to features/scripts/utils/nomarchy-cmd-terminal-cwd diff --git a/bin/utils/nomarchy-config-direct-boot b/features/scripts/utils/nomarchy-config-direct-boot similarity index 100% rename from bin/utils/nomarchy-config-direct-boot rename to features/scripts/utils/nomarchy-config-direct-boot diff --git a/bin/utils/nomarchy-drive-info b/features/scripts/utils/nomarchy-drive-info similarity index 100% rename from bin/utils/nomarchy-drive-info rename to features/scripts/utils/nomarchy-drive-info diff --git a/bin/utils/nomarchy-drive-select b/features/scripts/utils/nomarchy-drive-select similarity index 100% rename from bin/utils/nomarchy-drive-select rename to features/scripts/utils/nomarchy-drive-select diff --git a/bin/utils/nomarchy-drive-set-password b/features/scripts/utils/nomarchy-drive-set-password similarity index 100% rename from bin/utils/nomarchy-drive-set-password rename to features/scripts/utils/nomarchy-drive-set-password diff --git a/bin/utils/nomarchy-hook b/features/scripts/utils/nomarchy-hook similarity index 100% rename from bin/utils/nomarchy-hook rename to features/scripts/utils/nomarchy-hook diff --git a/bin/utils/nomarchy-lock-screen b/features/scripts/utils/nomarchy-lock-screen similarity index 100% rename from bin/utils/nomarchy-lock-screen rename to features/scripts/utils/nomarchy-lock-screen diff --git a/bin/utils/nomarchy-menu b/features/scripts/utils/nomarchy-menu similarity index 100% rename from bin/utils/nomarchy-menu rename to features/scripts/utils/nomarchy-menu diff --git a/bin/utils/nomarchy-menu-keybindings b/features/scripts/utils/nomarchy-menu-keybindings similarity index 100% rename from bin/utils/nomarchy-menu-keybindings rename to features/scripts/utils/nomarchy-menu-keybindings diff --git a/bin/utils/nomarchy-migrate-state b/features/scripts/utils/nomarchy-migrate-state similarity index 100% rename from bin/utils/nomarchy-migrate-state rename to features/scripts/utils/nomarchy-migrate-state diff --git a/bin/utils/nomarchy-notification-dismiss b/features/scripts/utils/nomarchy-notification-dismiss similarity index 100% rename from bin/utils/nomarchy-notification-dismiss rename to features/scripts/utils/nomarchy-notification-dismiss diff --git a/bin/utils/nomarchy-npx-install b/features/scripts/utils/nomarchy-npx-install similarity index 100% rename from bin/utils/nomarchy-npx-install rename to features/scripts/utils/nomarchy-npx-install diff --git a/bin/utils/nomarchy-on-boot b/features/scripts/utils/nomarchy-on-boot similarity index 100% rename from bin/utils/nomarchy-on-boot rename to features/scripts/utils/nomarchy-on-boot diff --git a/bin/utils/nomarchy-refresh-fastfetch b/features/scripts/utils/nomarchy-refresh-fastfetch similarity index 100% rename from bin/utils/nomarchy-refresh-fastfetch rename to features/scripts/utils/nomarchy-refresh-fastfetch diff --git a/bin/utils/nomarchy-snapshot b/features/scripts/utils/nomarchy-snapshot similarity index 100% rename from bin/utils/nomarchy-snapshot rename to features/scripts/utils/nomarchy-snapshot diff --git a/bin/utils/nomarchy-state b/features/scripts/utils/nomarchy-state similarity index 100% rename from bin/utils/nomarchy-state rename to features/scripts/utils/nomarchy-state diff --git a/bin/utils/nomarchy-state-write b/features/scripts/utils/nomarchy-state-write similarity index 100% rename from bin/utils/nomarchy-state-write rename to features/scripts/utils/nomarchy-state-write diff --git a/bin/utils/nomarchy-sync b/features/scripts/utils/nomarchy-sync similarity index 100% rename from bin/utils/nomarchy-sync rename to features/scripts/utils/nomarchy-sync diff --git a/bin/utils/nomarchy-test-installer b/features/scripts/utils/nomarchy-test-installer similarity index 100% rename from bin/utils/nomarchy-test-installer rename to features/scripts/utils/nomarchy-test-installer diff --git a/bin/utils/nomarchy-test-vm b/features/scripts/utils/nomarchy-test-vm similarity index 100% rename from bin/utils/nomarchy-test-vm rename to features/scripts/utils/nomarchy-test-vm diff --git a/bin/utils/nomarchy-toggle-notification-silencing b/features/scripts/utils/nomarchy-toggle-notification-silencing similarity index 100% rename from bin/utils/nomarchy-toggle-notification-silencing rename to features/scripts/utils/nomarchy-toggle-notification-silencing diff --git a/bin/utils/nomarchy-welcome b/features/scripts/utils/nomarchy-welcome similarity index 100% rename from bin/utils/nomarchy-welcome rename to features/scripts/utils/nomarchy-welcome diff --git a/flake.nix b/flake.nix index 3149c88..6d494a5 100644 --- a/flake.nix +++ b/flake.nix @@ -27,8 +27,8 @@ inherit inputs; nixosModules = { - system = import ./modules/system; - home = import ./modules/home; + system = import ./core; + home = import ./features; }; nixosConfigurations = { @@ -53,7 +53,7 @@ { nixpkgs.hostPlatform = "x86_64-linux"; } "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix" ./hosts/live-iso.nix - ./modules/system + ./core home-manager.nixosModules.home-manager { system.stateVersion = "25.11"; @@ -65,7 +65,7 @@ home-manager.useGlobalPkgs = false; home-manager.useUserPackages = true; home-manager.users.nixos = { - imports = [ ./modules/home ]; + imports = [ ./features ]; home.username = "nixos"; home.homeDirectory = "/home/nixos"; home.stateVersion = "25.11"; @@ -80,8 +80,8 @@ modules = [ { nixpkgs.hostPlatform = "x86_64-linux"; } ./hosts/live-iso.nix - ./modules/system/default.nix - ./modules/system/vm-guest.nix + ./core/default.nix + ./core/system/vm-guest.nix home-manager.nixosModules.home-manager { system.stateVersion = "25.11"; @@ -97,7 +97,7 @@ home-manager.useGlobalPkgs = false; home-manager.useUserPackages = true; home-manager.users.nixos = { - imports = [ ./modules/home/default.nix ]; + imports = [ ./features/default.nix ]; home.username = "nixos"; home.homeDirectory = "/home/nixos"; home.stateVersion = "25.11"; @@ -117,8 +117,8 @@ specialArgs = { inherit inputs; }; modules = [ { nixpkgs.hostPlatform = "x86_64-linux"; } - ./modules/system/default.nix - ./modules/system/vm-guest.nix + ./core/default.nix + ./core/system/vm-guest.nix home-manager.nixosModules.home-manager { system.stateVersion = "25.11"; @@ -141,7 +141,7 @@ home-manager.useGlobalPkgs = false; home-manager.useUserPackages = true; home-manager.users.nomarchy = { - imports = [ ./modules/home/default.nix ]; + imports = [ ./features/default.nix ]; home.username = "nomarchy"; home.homeDirectory = "/home/nomarchy"; home.stateVersion = "25.11"; diff --git a/modules/lib/default.nix b/lib/default.nix similarity index 97% rename from modules/lib/default.nix rename to lib/default.nix index 34312b2..34a101f 100644 --- a/modules/lib/default.nix +++ b/lib/default.nix @@ -4,7 +4,7 @@ let # Import theme palettes once - used by multiple modules - palettes = import ../../assets/themes/nomarchy-palettes.nix; + palettes = import ../themes/palettes; # Unified state reading function # Handles both JSON and plain text files with graceful fallbacks diff --git a/modules/lib/state-schema.nix b/lib/state-schema.nix similarity index 100% rename from modules/lib/state-schema.nix rename to lib/state-schema.nix diff --git a/modules/home/waybar.nix b/modules/home/waybar.nix deleted file mode 100644 index 970b9ab..0000000 --- a/modules/home/waybar.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ config, pkgs, lib, ... }: - -{ - programs.waybar = { - enable = lib.mkDefault true; - systemd.enable = lib.mkDefault true; - style = lib.mkDefault '' - * { - background-color: #${config.colorScheme.palette.base00}; - color: #${config.colorScheme.palette.base05}; - border: none; - border-radius: 0; - min-height: 0; - font-family: '${config.nomarchy.fonts.monospace}'; - font-size: 12px; - } - - .modules-left { margin-left: 8px; } - .modules-right { margin-right: 8px; } - - #workspaces button { - all: initial; - padding: 0 6px; - margin: 0 1.5px; - min-width: 9px; - color: #${config.colorScheme.palette.base04}; - } - - #workspaces button.focused, #workspaces button.active { - color: #${config.colorScheme.palette.base0B}; - } - - #workspaces button.empty { opacity: 0.5; } - - #cpu, #battery, #pulseaudio, #custom-nomarchy, #custom-update { - min-width: 12px; - margin: 0 7.5px; - } - - #tray { margin-right: 16px; } - #bluetooth { margin-right: 17px; } - ''; - settings = lib.mkDefault [ (builtins.fromJSON (builtins.readFile ../../config/waybar/config.jsonc)) ]; - }; - - home.packages = lib.mkDefault (with pkgs; [ - font-awesome - ]); -} diff --git a/modules/system/default.nix b/modules/system/default.nix deleted file mode 100644 index 00625fe..0000000 --- a/modules/system/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - imports = [ - ./options.nix - ./state.nix - ./systemd.nix - ./plymouth.nix - ./sddm.nix - ./hardware.nix - ./audio.nix - ./bluetooth.nix - ./network.nix - ./browser.nix - ./impermanence.nix - ./makima.nix - ]; - - time.timeZone = lib.mkDefault config.nomarchy.system.timezone; -} diff --git a/modules/home/theme-files.nix b/themes/engine/files.nix similarity index 70% rename from modules/home/theme-files.nix rename to themes/engine/files.nix index ae9b486..bcc456f 100644 --- a/modules/home/theme-files.nix +++ b/themes/engine/files.nix @@ -1,9 +1,9 @@ { config, lib, ... }: let - themePath = ../../assets/themes + "/${config.nomarchy.theme}"; + themePath = ../palettes + "/${config.nomarchy.theme}"; themeAppsPath = themePath + "/apps"; - nordAppsPath = ../../assets/themes/nord/apps; + nordAppsPath = ../palettes/nord/apps; # Check if theme has apps/hyprland.conf hasHyprlandConf = builtins.pathExists (themeAppsPath + "/hyprland.conf"); @@ -31,17 +31,17 @@ in xdg.configFile."nomarchy/current/theme.name".text = config.nomarchy.theme; # Expose branding assets - xdg.configFile."nomarchy/branding/logo.png".source = ../../assets/branding/logo.png; - xdg.configFile."nomarchy/branding/logo.txt".source = ../../assets/branding/logo.txt; - xdg.configFile."nomarchy/branding/logo.svg".source = ../../assets/branding/logo.svg; - xdg.configFile."nomarchy/branding/icon.png".source = ../../assets/branding/icon.png; - xdg.configFile."nomarchy/branding/icon.txt".source = ../../assets/branding/icon.txt; + xdg.configFile."nomarchy/branding/logo.png".source = ../../core/branding/logo.png; + xdg.configFile."nomarchy/branding/logo.txt".source = ../../core/branding/logo.txt; + xdg.configFile."nomarchy/branding/logo.svg".source = ../../core/branding/logo.svg; + xdg.configFile."nomarchy/branding/icon.png".source = ../../core/branding/icon.png; + xdg.configFile."nomarchy/branding/icon.txt".source = ../../core/branding/icon.txt; # Expose all themes to the system via local share for script accessibility # We filter out images to prevent Nix Store bloat xdg.dataFile."nomarchy/themes".source = builtins.path { name = "nomarchy-themes-no-images"; - path = ../../assets/themes; + path = ../palettes; filter = path: type: let baseName = baseNameOf path; @@ -54,5 +54,5 @@ in }; # Nautilus python extensions - xdg.dataFile."nautilus-python/extensions/localsend.py".source = ../../assets/nautilus-python/extensions/localsend.py; + xdg.dataFile."nautilus-python/extensions/localsend.py".source = ../../core/home/config/nautilus-python/extensions/localsend.py; } diff --git a/modules/home/theme-loader.nix b/themes/engine/loader.nix similarity index 99% rename from modules/home/theme-loader.nix rename to themes/engine/loader.nix index fc1f13d..efe4334 100644 --- a/modules/home/theme-loader.nix +++ b/themes/engine/loader.nix @@ -26,7 +26,7 @@ let nomarchyLib = import ../lib { inherit lib; }; - assetsPath = ../../assets/themes; + assetsPath = ../palettes; activeTheme = config.nomarchy.theme; themePath = assetsPath + "/${activeTheme}"; themeAppsPath = themePath + "/apps"; diff --git a/modules/system/plymouth.nix b/themes/engine/plymouth.nix similarity index 96% rename from modules/system/plymouth.nix rename to themes/engine/plymouth.nix index 1c8f51a..8d72a62 100644 --- a/modules/system/plymouth.nix +++ b/themes/engine/plymouth.nix @@ -5,7 +5,7 @@ let pname = "nomarchy-plymouth"; version = "1.0"; - src = ../../assets/plymouth; + src = ./plymouth; installPhase = '' mkdir -p $out/share/plymouth/themes/nomarchy diff --git a/assets/plymouth/bullet.png b/themes/engine/plymouth/bullet.png similarity index 100% rename from assets/plymouth/bullet.png rename to themes/engine/plymouth/bullet.png diff --git a/assets/plymouth/entry.png b/themes/engine/plymouth/entry.png similarity index 100% rename from assets/plymouth/entry.png rename to themes/engine/plymouth/entry.png diff --git a/assets/plymouth/lock.png b/themes/engine/plymouth/lock.png similarity index 100% rename from assets/plymouth/lock.png rename to themes/engine/plymouth/lock.png diff --git a/assets/plymouth/logo.png b/themes/engine/plymouth/logo.png similarity index 100% rename from assets/plymouth/logo.png rename to themes/engine/plymouth/logo.png diff --git a/assets/plymouth/nomarchy.plymouth b/themes/engine/plymouth/nomarchy.plymouth similarity index 100% rename from assets/plymouth/nomarchy.plymouth rename to themes/engine/plymouth/nomarchy.plymouth diff --git a/assets/plymouth/nomarchy.script b/themes/engine/plymouth/nomarchy.script similarity index 100% rename from assets/plymouth/nomarchy.script rename to themes/engine/plymouth/nomarchy.script diff --git a/assets/plymouth/progress_bar.png b/themes/engine/plymouth/progress_bar.png similarity index 100% rename from assets/plymouth/progress_bar.png rename to themes/engine/plymouth/progress_bar.png diff --git a/assets/plymouth/progress_box.png b/themes/engine/plymouth/progress_box.png similarity index 100% rename from assets/plymouth/progress_box.png rename to themes/engine/plymouth/progress_box.png diff --git a/bin/appearance/nomarchy-font-current b/themes/engine/scripts/nomarchy-font-current similarity index 100% rename from bin/appearance/nomarchy-font-current rename to themes/engine/scripts/nomarchy-font-current diff --git a/bin/appearance/nomarchy-font-list b/themes/engine/scripts/nomarchy-font-list similarity index 100% rename from bin/appearance/nomarchy-font-list rename to themes/engine/scripts/nomarchy-font-list diff --git a/bin/appearance/nomarchy-font-set b/themes/engine/scripts/nomarchy-font-set similarity index 100% rename from bin/appearance/nomarchy-font-set rename to themes/engine/scripts/nomarchy-font-set diff --git a/bin/appearance/nomarchy-show-done b/themes/engine/scripts/nomarchy-show-done similarity index 100% rename from bin/appearance/nomarchy-show-done rename to themes/engine/scripts/nomarchy-show-done diff --git a/bin/appearance/nomarchy-show-logo b/themes/engine/scripts/nomarchy-show-logo similarity index 100% rename from bin/appearance/nomarchy-show-logo rename to themes/engine/scripts/nomarchy-show-logo diff --git a/bin/appearance/nomarchy-theme-bg-install b/themes/engine/scripts/nomarchy-theme-bg-install similarity index 100% rename from bin/appearance/nomarchy-theme-bg-install rename to themes/engine/scripts/nomarchy-theme-bg-install diff --git a/bin/appearance/nomarchy-theme-bg-next b/themes/engine/scripts/nomarchy-theme-bg-next similarity index 100% rename from bin/appearance/nomarchy-theme-bg-next rename to themes/engine/scripts/nomarchy-theme-bg-next diff --git a/bin/appearance/nomarchy-theme-bg-set b/themes/engine/scripts/nomarchy-theme-bg-set similarity index 100% rename from bin/appearance/nomarchy-theme-bg-set rename to themes/engine/scripts/nomarchy-theme-bg-set diff --git a/bin/appearance/nomarchy-theme-current b/themes/engine/scripts/nomarchy-theme-current similarity index 100% rename from bin/appearance/nomarchy-theme-current rename to themes/engine/scripts/nomarchy-theme-current diff --git a/bin/appearance/nomarchy-theme-install b/themes/engine/scripts/nomarchy-theme-install similarity index 100% rename from bin/appearance/nomarchy-theme-install rename to themes/engine/scripts/nomarchy-theme-install diff --git a/bin/appearance/nomarchy-theme-list b/themes/engine/scripts/nomarchy-theme-list similarity index 100% rename from bin/appearance/nomarchy-theme-list rename to themes/engine/scripts/nomarchy-theme-list diff --git a/bin/appearance/nomarchy-theme-refresh b/themes/engine/scripts/nomarchy-theme-refresh similarity index 100% rename from bin/appearance/nomarchy-theme-refresh rename to themes/engine/scripts/nomarchy-theme-refresh diff --git a/bin/appearance/nomarchy-theme-remove b/themes/engine/scripts/nomarchy-theme-remove similarity index 100% rename from bin/appearance/nomarchy-theme-remove rename to themes/engine/scripts/nomarchy-theme-remove diff --git a/bin/appearance/nomarchy-theme-set b/themes/engine/scripts/nomarchy-theme-set similarity index 100% rename from bin/appearance/nomarchy-theme-set rename to themes/engine/scripts/nomarchy-theme-set diff --git a/bin/appearance/nomarchy-theme-set-keyboard b/themes/engine/scripts/nomarchy-theme-set-keyboard similarity index 100% rename from bin/appearance/nomarchy-theme-set-keyboard rename to themes/engine/scripts/nomarchy-theme-set-keyboard diff --git a/bin/appearance/nomarchy-theme-set-keyboard-asus-rog b/themes/engine/scripts/nomarchy-theme-set-keyboard-asus-rog similarity index 100% rename from bin/appearance/nomarchy-theme-set-keyboard-asus-rog rename to themes/engine/scripts/nomarchy-theme-set-keyboard-asus-rog diff --git a/bin/appearance/nomarchy-theme-set-keyboard-f16 b/themes/engine/scripts/nomarchy-theme-set-keyboard-f16 similarity index 100% rename from bin/appearance/nomarchy-theme-set-keyboard-f16 rename to themes/engine/scripts/nomarchy-theme-set-keyboard-f16 diff --git a/bin/appearance/nomarchy-theme-set-obsidian b/themes/engine/scripts/nomarchy-theme-set-obsidian similarity index 100% rename from bin/appearance/nomarchy-theme-set-obsidian rename to themes/engine/scripts/nomarchy-theme-set-obsidian diff --git a/bin/appearance/nomarchy-theme-set-templates b/themes/engine/scripts/nomarchy-theme-set-templates similarity index 100% rename from bin/appearance/nomarchy-theme-set-templates rename to themes/engine/scripts/nomarchy-theme-set-templates diff --git a/bin/appearance/nomarchy-theme-set-vscode b/themes/engine/scripts/nomarchy-theme-set-vscode similarity index 100% rename from bin/appearance/nomarchy-theme-set-vscode rename to themes/engine/scripts/nomarchy-theme-set-vscode diff --git a/bin/appearance/nomarchy-theme-update b/themes/engine/scripts/nomarchy-theme-update similarity index 100% rename from bin/appearance/nomarchy-theme-update rename to themes/engine/scripts/nomarchy-theme-update diff --git a/bin/appearance/nomarchy-toggle-nightlight b/themes/engine/scripts/nomarchy-toggle-nightlight similarity index 100% rename from bin/appearance/nomarchy-toggle-nightlight rename to themes/engine/scripts/nomarchy-toggle-nightlight diff --git a/modules/system/sddm.nix b/themes/engine/sddm.nix similarity index 96% rename from modules/system/sddm.nix rename to themes/engine/sddm.nix index 7199b8a..6e0e851 100644 --- a/modules/system/sddm.nix +++ b/themes/engine/sddm.nix @@ -4,7 +4,7 @@ let nomarchy-sddm-theme = pkgs.stdenv.mkDerivation { pname = "nomarchy-sddm-theme"; version = "1.0"; - src = ../../assets/sddm/nomarchy; + src = ./sddm/nomarchy; nativeBuildInputs = [ pkgs.libsForQt5.qt5.wrapQtAppsHook ]; installPhase = '' mkdir -p $out/share/sddm/themes/nomarchy diff --git a/assets/sddm/nomarchy/Main.qml b/themes/engine/sddm/nomarchy/Main.qml similarity index 100% rename from assets/sddm/nomarchy/Main.qml rename to themes/engine/sddm/nomarchy/Main.qml diff --git a/assets/sddm/nomarchy/logo.svg b/themes/engine/sddm/nomarchy/logo.svg similarity index 100% rename from assets/sddm/nomarchy/logo.svg rename to themes/engine/sddm/nomarchy/logo.svg diff --git a/assets/sddm/nomarchy/metadata.desktop b/themes/engine/sddm/nomarchy/metadata.desktop similarity index 100% rename from assets/sddm/nomarchy/metadata.desktop rename to themes/engine/sddm/nomarchy/metadata.desktop diff --git a/assets/sddm/nomarchy/theme.conf b/themes/engine/sddm/nomarchy/theme.conf similarity index 100% rename from assets/sddm/nomarchy/theme.conf rename to themes/engine/sddm/nomarchy/theme.conf diff --git a/modules/home/stylix-compat.nix b/themes/engine/stylix-compat.nix similarity index 100% rename from modules/home/stylix-compat.nix rename to themes/engine/stylix-compat.nix diff --git a/modules/home/stylix.nix b/themes/engine/stylix.nix similarity index 98% rename from modules/home/stylix.nix rename to themes/engine/stylix.nix index 344302c..7c5633a 100644 --- a/modules/home/stylix.nix +++ b/themes/engine/stylix.nix @@ -19,7 +19,7 @@ let nomarchyLib = import ../lib { inherit lib; }; - assetsPath = ../../assets/themes; + assetsPath = ../palettes; activeThemeName = config.nomarchy.theme; diff --git a/modules/home/theme-switcher.nix b/themes/engine/switcher.nix similarity index 100% rename from modules/home/theme-switcher.nix rename to themes/engine/switcher.nix diff --git a/assets/themes/catppuccin-latte/apps/btop.theme b/themes/palettes/catppuccin-latte/apps/btop.theme similarity index 100% rename from assets/themes/catppuccin-latte/apps/btop.theme rename to themes/palettes/catppuccin-latte/apps/btop.theme diff --git a/assets/themes/catppuccin-latte/apps/neovim.lua b/themes/palettes/catppuccin-latte/apps/neovim.lua similarity index 100% rename from assets/themes/catppuccin-latte/apps/neovim.lua rename to themes/palettes/catppuccin-latte/apps/neovim.lua diff --git a/assets/themes/catppuccin-latte/apps/vscode.json b/themes/palettes/catppuccin-latte/apps/vscode.json similarity index 100% rename from assets/themes/catppuccin-latte/apps/vscode.json rename to themes/palettes/catppuccin-latte/apps/vscode.json diff --git a/assets/themes/catppuccin-latte/backgrounds/1-color-fade.png b/themes/palettes/catppuccin-latte/backgrounds/1-color-fade.png similarity index 100% rename from assets/themes/catppuccin-latte/backgrounds/1-color-fade.png rename to themes/palettes/catppuccin-latte/backgrounds/1-color-fade.png diff --git a/assets/themes/catppuccin-latte/colors.toml b/themes/palettes/catppuccin-latte/colors.toml similarity index 100% rename from assets/themes/catppuccin-latte/colors.toml rename to themes/palettes/catppuccin-latte/colors.toml diff --git a/assets/themes/catppuccin-latte/icons.theme b/themes/palettes/catppuccin-latte/icons.theme similarity index 100% rename from assets/themes/catppuccin-latte/icons.theme rename to themes/palettes/catppuccin-latte/icons.theme diff --git a/assets/themes/catppuccin-latte/light.mode b/themes/palettes/catppuccin-latte/light.mode similarity index 100% rename from assets/themes/catppuccin-latte/light.mode rename to themes/palettes/catppuccin-latte/light.mode diff --git a/assets/themes/catppuccin-latte/preview.png b/themes/palettes/catppuccin-latte/preview.png similarity index 100% rename from assets/themes/catppuccin-latte/preview.png rename to themes/palettes/catppuccin-latte/preview.png diff --git a/assets/themes/catppuccin/apps/btop.theme b/themes/palettes/catppuccin/apps/btop.theme similarity index 100% rename from assets/themes/catppuccin/apps/btop.theme rename to themes/palettes/catppuccin/apps/btop.theme diff --git a/assets/themes/catppuccin/apps/neovim.lua b/themes/palettes/catppuccin/apps/neovim.lua similarity index 100% rename from assets/themes/catppuccin/apps/neovim.lua rename to themes/palettes/catppuccin/apps/neovim.lua diff --git a/assets/themes/catppuccin/apps/vscode.json b/themes/palettes/catppuccin/apps/vscode.json similarity index 100% rename from assets/themes/catppuccin/apps/vscode.json rename to themes/palettes/catppuccin/apps/vscode.json diff --git a/assets/themes/catppuccin/backgrounds/1-totoro.png b/themes/palettes/catppuccin/backgrounds/1-totoro.png similarity index 100% rename from assets/themes/catppuccin/backgrounds/1-totoro.png rename to themes/palettes/catppuccin/backgrounds/1-totoro.png diff --git a/assets/themes/catppuccin/backgrounds/2-waves.png b/themes/palettes/catppuccin/backgrounds/2-waves.png similarity index 100% rename from assets/themes/catppuccin/backgrounds/2-waves.png rename to themes/palettes/catppuccin/backgrounds/2-waves.png diff --git a/assets/themes/catppuccin/backgrounds/3-blue-eye.png b/themes/palettes/catppuccin/backgrounds/3-blue-eye.png similarity index 100% rename from assets/themes/catppuccin/backgrounds/3-blue-eye.png rename to themes/palettes/catppuccin/backgrounds/3-blue-eye.png diff --git a/assets/themes/catppuccin/colors.toml b/themes/palettes/catppuccin/colors.toml similarity index 100% rename from assets/themes/catppuccin/colors.toml rename to themes/palettes/catppuccin/colors.toml diff --git a/assets/themes/catppuccin/icons.theme b/themes/palettes/catppuccin/icons.theme similarity index 100% rename from assets/themes/catppuccin/icons.theme rename to themes/palettes/catppuccin/icons.theme diff --git a/assets/themes/catppuccin/preview.png b/themes/palettes/catppuccin/preview.png similarity index 100% rename from assets/themes/catppuccin/preview.png rename to themes/palettes/catppuccin/preview.png diff --git a/assets/themes/nomarchy-palettes.nix b/themes/palettes/default.nix similarity index 100% rename from assets/themes/nomarchy-palettes.nix rename to themes/palettes/default.nix diff --git a/assets/themes/ethereal/apps/btop.theme b/themes/palettes/ethereal/apps/btop.theme similarity index 100% rename from assets/themes/ethereal/apps/btop.theme rename to themes/palettes/ethereal/apps/btop.theme diff --git a/assets/themes/ethereal/apps/neovim.lua b/themes/palettes/ethereal/apps/neovim.lua similarity index 100% rename from assets/themes/ethereal/apps/neovim.lua rename to themes/palettes/ethereal/apps/neovim.lua diff --git a/assets/themes/ethereal/apps/vscode.json b/themes/palettes/ethereal/apps/vscode.json similarity index 100% rename from assets/themes/ethereal/apps/vscode.json rename to themes/palettes/ethereal/apps/vscode.json diff --git a/assets/themes/ethereal/backgrounds/1-cosmic.jpg b/themes/palettes/ethereal/backgrounds/1-cosmic.jpg similarity index 100% rename from assets/themes/ethereal/backgrounds/1-cosmic.jpg rename to themes/palettes/ethereal/backgrounds/1-cosmic.jpg diff --git a/assets/themes/ethereal/backgrounds/2-meadow.jpg b/themes/palettes/ethereal/backgrounds/2-meadow.jpg similarity index 100% rename from assets/themes/ethereal/backgrounds/2-meadow.jpg rename to themes/palettes/ethereal/backgrounds/2-meadow.jpg diff --git a/assets/themes/ethereal/colors.toml b/themes/palettes/ethereal/colors.toml similarity index 100% rename from assets/themes/ethereal/colors.toml rename to themes/palettes/ethereal/colors.toml diff --git a/assets/themes/ethereal/icons.theme b/themes/palettes/ethereal/icons.theme similarity index 100% rename from assets/themes/ethereal/icons.theme rename to themes/palettes/ethereal/icons.theme diff --git a/assets/themes/ethereal/preview.png b/themes/palettes/ethereal/preview.png similarity index 100% rename from assets/themes/ethereal/preview.png rename to themes/palettes/ethereal/preview.png diff --git a/assets/themes/everforest/apps/btop.theme b/themes/palettes/everforest/apps/btop.theme similarity index 100% rename from assets/themes/everforest/apps/btop.theme rename to themes/palettes/everforest/apps/btop.theme diff --git a/assets/themes/everforest/apps/neovim.lua b/themes/palettes/everforest/apps/neovim.lua similarity index 100% rename from assets/themes/everforest/apps/neovim.lua rename to themes/palettes/everforest/apps/neovim.lua diff --git a/assets/themes/everforest/apps/vscode.json b/themes/palettes/everforest/apps/vscode.json similarity index 100% rename from assets/themes/everforest/apps/vscode.json rename to themes/palettes/everforest/apps/vscode.json diff --git a/assets/themes/everforest/backgrounds/1-tree-tops.jpg b/themes/palettes/everforest/backgrounds/1-tree-tops.jpg similarity index 100% rename from assets/themes/everforest/backgrounds/1-tree-tops.jpg rename to themes/palettes/everforest/backgrounds/1-tree-tops.jpg diff --git a/assets/themes/everforest/colors.toml b/themes/palettes/everforest/colors.toml similarity index 100% rename from assets/themes/everforest/colors.toml rename to themes/palettes/everforest/colors.toml diff --git a/assets/themes/everforest/icons.theme b/themes/palettes/everforest/icons.theme similarity index 100% rename from assets/themes/everforest/icons.theme rename to themes/palettes/everforest/icons.theme diff --git a/assets/themes/everforest/preview.png b/themes/palettes/everforest/preview.png similarity index 100% rename from assets/themes/everforest/preview.png rename to themes/palettes/everforest/preview.png diff --git a/assets/themes/flexoki-light/apps/btop.theme b/themes/palettes/flexoki-light/apps/btop.theme similarity index 100% rename from assets/themes/flexoki-light/apps/btop.theme rename to themes/palettes/flexoki-light/apps/btop.theme diff --git a/assets/themes/flexoki-light/apps/chromium.theme b/themes/palettes/flexoki-light/apps/chromium.theme similarity index 100% rename from assets/themes/flexoki-light/apps/chromium.theme rename to themes/palettes/flexoki-light/apps/chromium.theme diff --git a/assets/themes/flexoki-light/apps/neovim.lua b/themes/palettes/flexoki-light/apps/neovim.lua similarity index 100% rename from assets/themes/flexoki-light/apps/neovim.lua rename to themes/palettes/flexoki-light/apps/neovim.lua diff --git a/assets/themes/flexoki-light/apps/vscode.json b/themes/palettes/flexoki-light/apps/vscode.json similarity index 100% rename from assets/themes/flexoki-light/apps/vscode.json rename to themes/palettes/flexoki-light/apps/vscode.json diff --git a/assets/themes/flexoki-light/backgrounds/1-orb.png b/themes/palettes/flexoki-light/backgrounds/1-orb.png similarity index 100% rename from assets/themes/flexoki-light/backgrounds/1-orb.png rename to themes/palettes/flexoki-light/backgrounds/1-orb.png diff --git a/assets/themes/flexoki-light/backgrounds/2-nomarchy.png b/themes/palettes/flexoki-light/backgrounds/2-nomarchy.png similarity index 100% rename from assets/themes/flexoki-light/backgrounds/2-nomarchy.png rename to themes/palettes/flexoki-light/backgrounds/2-nomarchy.png diff --git a/assets/themes/flexoki-light/colors.toml b/themes/palettes/flexoki-light/colors.toml similarity index 100% rename from assets/themes/flexoki-light/colors.toml rename to themes/palettes/flexoki-light/colors.toml diff --git a/assets/themes/flexoki-light/icons.theme b/themes/palettes/flexoki-light/icons.theme similarity index 100% rename from assets/themes/flexoki-light/icons.theme rename to themes/palettes/flexoki-light/icons.theme diff --git a/assets/themes/flexoki-light/light.mode b/themes/palettes/flexoki-light/light.mode similarity index 100% rename from assets/themes/flexoki-light/light.mode rename to themes/palettes/flexoki-light/light.mode diff --git a/assets/themes/flexoki-light/preview.png b/themes/palettes/flexoki-light/preview.png similarity index 100% rename from assets/themes/flexoki-light/preview.png rename to themes/palettes/flexoki-light/preview.png diff --git a/assets/themes/gruvbox/apps/btop.theme b/themes/palettes/gruvbox/apps/btop.theme similarity index 100% rename from assets/themes/gruvbox/apps/btop.theme rename to themes/palettes/gruvbox/apps/btop.theme diff --git a/assets/themes/gruvbox/apps/neovim.lua b/themes/palettes/gruvbox/apps/neovim.lua similarity index 100% rename from assets/themes/gruvbox/apps/neovim.lua rename to themes/palettes/gruvbox/apps/neovim.lua diff --git a/assets/themes/gruvbox/apps/vscode.json b/themes/palettes/gruvbox/apps/vscode.json similarity index 100% rename from assets/themes/gruvbox/apps/vscode.json rename to themes/palettes/gruvbox/apps/vscode.json diff --git a/assets/themes/gruvbox/backgrounds/1-the-backwater.jpg b/themes/palettes/gruvbox/backgrounds/1-the-backwater.jpg similarity index 100% rename from assets/themes/gruvbox/backgrounds/1-the-backwater.jpg rename to themes/palettes/gruvbox/backgrounds/1-the-backwater.jpg diff --git a/assets/themes/gruvbox/backgrounds/2-flower-basket.jpg b/themes/palettes/gruvbox/backgrounds/2-flower-basket.jpg similarity index 100% rename from assets/themes/gruvbox/backgrounds/2-flower-basket.jpg rename to themes/palettes/gruvbox/backgrounds/2-flower-basket.jpg diff --git a/assets/themes/gruvbox/backgrounds/3-village-square.jpg b/themes/palettes/gruvbox/backgrounds/3-village-square.jpg similarity index 100% rename from assets/themes/gruvbox/backgrounds/3-village-square.jpg rename to themes/palettes/gruvbox/backgrounds/3-village-square.jpg diff --git a/assets/themes/gruvbox/backgrounds/4-idyllic-procession.jpg b/themes/palettes/gruvbox/backgrounds/4-idyllic-procession.jpg similarity index 100% rename from assets/themes/gruvbox/backgrounds/4-idyllic-procession.jpg rename to themes/palettes/gruvbox/backgrounds/4-idyllic-procession.jpg diff --git a/assets/themes/gruvbox/backgrounds/5-leaves.jpg b/themes/palettes/gruvbox/backgrounds/5-leaves.jpg similarity index 100% rename from assets/themes/gruvbox/backgrounds/5-leaves.jpg rename to themes/palettes/gruvbox/backgrounds/5-leaves.jpg diff --git a/assets/themes/gruvbox/colors.toml b/themes/palettes/gruvbox/colors.toml similarity index 100% rename from assets/themes/gruvbox/colors.toml rename to themes/palettes/gruvbox/colors.toml diff --git a/assets/themes/gruvbox/icons.theme b/themes/palettes/gruvbox/icons.theme similarity index 100% rename from assets/themes/gruvbox/icons.theme rename to themes/palettes/gruvbox/icons.theme diff --git a/assets/themes/gruvbox/preview.png b/themes/palettes/gruvbox/preview.png similarity index 100% rename from assets/themes/gruvbox/preview.png rename to themes/palettes/gruvbox/preview.png diff --git a/assets/themes/hackerman/apps/btop.theme b/themes/palettes/hackerman/apps/btop.theme similarity index 100% rename from assets/themes/hackerman/apps/btop.theme rename to themes/palettes/hackerman/apps/btop.theme diff --git a/assets/themes/hackerman/apps/neovim.lua b/themes/palettes/hackerman/apps/neovim.lua similarity index 100% rename from assets/themes/hackerman/apps/neovim.lua rename to themes/palettes/hackerman/apps/neovim.lua diff --git a/assets/themes/hackerman/apps/vscode.json b/themes/palettes/hackerman/apps/vscode.json similarity index 100% rename from assets/themes/hackerman/apps/vscode.json rename to themes/palettes/hackerman/apps/vscode.json diff --git a/assets/themes/hackerman/backgrounds/1-synth-scape.jpg b/themes/palettes/hackerman/backgrounds/1-synth-scape.jpg similarity index 100% rename from assets/themes/hackerman/backgrounds/1-synth-scape.jpg rename to themes/palettes/hackerman/backgrounds/1-synth-scape.jpg diff --git a/assets/themes/hackerman/backgrounds/2-geometric.jpg b/themes/palettes/hackerman/backgrounds/2-geometric.jpg similarity index 100% rename from assets/themes/hackerman/backgrounds/2-geometric.jpg rename to themes/palettes/hackerman/backgrounds/2-geometric.jpg diff --git a/assets/themes/hackerman/colors.toml b/themes/palettes/hackerman/colors.toml similarity index 100% rename from assets/themes/hackerman/colors.toml rename to themes/palettes/hackerman/colors.toml diff --git a/assets/themes/hackerman/icons.theme b/themes/palettes/hackerman/icons.theme similarity index 100% rename from assets/themes/hackerman/icons.theme rename to themes/palettes/hackerman/icons.theme diff --git a/assets/themes/hackerman/preview.png b/themes/palettes/hackerman/preview.png similarity index 100% rename from assets/themes/hackerman/preview.png rename to themes/palettes/hackerman/preview.png diff --git a/assets/themes/kanagawa/apps/btop.theme b/themes/palettes/kanagawa/apps/btop.theme similarity index 100% rename from assets/themes/kanagawa/apps/btop.theme rename to themes/palettes/kanagawa/apps/btop.theme diff --git a/assets/themes/kanagawa/apps/neovim.lua b/themes/palettes/kanagawa/apps/neovim.lua similarity index 100% rename from assets/themes/kanagawa/apps/neovim.lua rename to themes/palettes/kanagawa/apps/neovim.lua diff --git a/assets/themes/kanagawa/apps/vscode.json b/themes/palettes/kanagawa/apps/vscode.json similarity index 100% rename from assets/themes/kanagawa/apps/vscode.json rename to themes/palettes/kanagawa/apps/vscode.json diff --git a/assets/themes/kanagawa/backgrounds/1-kanagawa.jpg b/themes/palettes/kanagawa/backgrounds/1-kanagawa.jpg similarity index 100% rename from assets/themes/kanagawa/backgrounds/1-kanagawa.jpg rename to themes/palettes/kanagawa/backgrounds/1-kanagawa.jpg diff --git a/assets/themes/kanagawa/colors.toml b/themes/palettes/kanagawa/colors.toml similarity index 100% rename from assets/themes/kanagawa/colors.toml rename to themes/palettes/kanagawa/colors.toml diff --git a/assets/themes/kanagawa/icons.theme b/themes/palettes/kanagawa/icons.theme similarity index 100% rename from assets/themes/kanagawa/icons.theme rename to themes/palettes/kanagawa/icons.theme diff --git a/assets/themes/kanagawa/preview.png b/themes/palettes/kanagawa/preview.png similarity index 100% rename from assets/themes/kanagawa/preview.png rename to themes/palettes/kanagawa/preview.png diff --git a/assets/themes/lumon/apps/btop.theme b/themes/palettes/lumon/apps/btop.theme similarity index 100% rename from assets/themes/lumon/apps/btop.theme rename to themes/palettes/lumon/apps/btop.theme diff --git a/assets/themes/lumon/apps/chromium.theme b/themes/palettes/lumon/apps/chromium.theme similarity index 100% rename from assets/themes/lumon/apps/chromium.theme rename to themes/palettes/lumon/apps/chromium.theme diff --git a/assets/themes/lumon/apps/neovim.lua b/themes/palettes/lumon/apps/neovim.lua similarity index 100% rename from assets/themes/lumon/apps/neovim.lua rename to themes/palettes/lumon/apps/neovim.lua diff --git a/assets/themes/lumon/apps/swayosd.css b/themes/palettes/lumon/apps/swayosd.css similarity index 100% rename from assets/themes/lumon/apps/swayosd.css rename to themes/palettes/lumon/apps/swayosd.css diff --git a/assets/themes/lumon/apps/vscode.json b/themes/palettes/lumon/apps/vscode.json similarity index 100% rename from assets/themes/lumon/apps/vscode.json rename to themes/palettes/lumon/apps/vscode.json diff --git a/assets/themes/lumon/backgrounds/01-united-in-severance.jpg b/themes/palettes/lumon/backgrounds/01-united-in-severance.jpg similarity index 100% rename from assets/themes/lumon/backgrounds/01-united-in-severance.jpg rename to themes/palettes/lumon/backgrounds/01-united-in-severance.jpg diff --git a/assets/themes/lumon/backgrounds/02-opinions-equally.jpg b/themes/palettes/lumon/backgrounds/02-opinions-equally.jpg similarity index 100% rename from assets/themes/lumon/backgrounds/02-opinions-equally.jpg rename to themes/palettes/lumon/backgrounds/02-opinions-equally.jpg diff --git a/assets/themes/lumon/colors.toml b/themes/palettes/lumon/colors.toml similarity index 100% rename from assets/themes/lumon/colors.toml rename to themes/palettes/lumon/colors.toml diff --git a/assets/themes/lumon/icons.theme b/themes/palettes/lumon/icons.theme similarity index 100% rename from assets/themes/lumon/icons.theme rename to themes/palettes/lumon/icons.theme diff --git a/assets/themes/lumon/preview.png b/themes/palettes/lumon/preview.png similarity index 100% rename from assets/themes/lumon/preview.png rename to themes/palettes/lumon/preview.png diff --git a/assets/themes/matte-black/apps/btop.theme b/themes/palettes/matte-black/apps/btop.theme similarity index 100% rename from assets/themes/matte-black/apps/btop.theme rename to themes/palettes/matte-black/apps/btop.theme diff --git a/assets/themes/matte-black/apps/neovim.lua b/themes/palettes/matte-black/apps/neovim.lua similarity index 100% rename from assets/themes/matte-black/apps/neovim.lua rename to themes/palettes/matte-black/apps/neovim.lua diff --git a/assets/themes/matte-black/apps/vscode.json b/themes/palettes/matte-black/apps/vscode.json similarity index 100% rename from assets/themes/matte-black/apps/vscode.json rename to themes/palettes/matte-black/apps/vscode.json diff --git a/assets/themes/matte-black/backgrounds/0-ship-at-sea.jpg b/themes/palettes/matte-black/backgrounds/0-ship-at-sea.jpg similarity index 100% rename from assets/themes/matte-black/backgrounds/0-ship-at-sea.jpg rename to themes/palettes/matte-black/backgrounds/0-ship-at-sea.jpg diff --git a/assets/themes/matte-black/backgrounds/1-dark-waters.jpg b/themes/palettes/matte-black/backgrounds/1-dark-waters.jpg similarity index 100% rename from assets/themes/matte-black/backgrounds/1-dark-waters.jpg rename to themes/palettes/matte-black/backgrounds/1-dark-waters.jpg diff --git a/assets/themes/matte-black/backgrounds/2-dot-hands.jpg b/themes/palettes/matte-black/backgrounds/2-dot-hands.jpg similarity index 100% rename from assets/themes/matte-black/backgrounds/2-dot-hands.jpg rename to themes/palettes/matte-black/backgrounds/2-dot-hands.jpg diff --git a/assets/themes/matte-black/colors.toml b/themes/palettes/matte-black/colors.toml similarity index 100% rename from assets/themes/matte-black/colors.toml rename to themes/palettes/matte-black/colors.toml diff --git a/assets/themes/matte-black/icons.theme b/themes/palettes/matte-black/icons.theme similarity index 100% rename from assets/themes/matte-black/icons.theme rename to themes/palettes/matte-black/icons.theme diff --git a/assets/themes/matte-black/preview.png b/themes/palettes/matte-black/preview.png similarity index 100% rename from assets/themes/matte-black/preview.png rename to themes/palettes/matte-black/preview.png diff --git a/assets/themes/miasma/apps/btop.theme b/themes/palettes/miasma/apps/btop.theme similarity index 100% rename from assets/themes/miasma/apps/btop.theme rename to themes/palettes/miasma/apps/btop.theme diff --git a/assets/themes/miasma/apps/neovim.lua b/themes/palettes/miasma/apps/neovim.lua similarity index 100% rename from assets/themes/miasma/apps/neovim.lua rename to themes/palettes/miasma/apps/neovim.lua diff --git a/assets/themes/miasma/apps/vscode.json b/themes/palettes/miasma/apps/vscode.json similarity index 100% rename from assets/themes/miasma/apps/vscode.json rename to themes/palettes/miasma/apps/vscode.json diff --git a/assets/themes/miasma/backgrounds/01-nature-of-fear.jpg b/themes/palettes/miasma/backgrounds/01-nature-of-fear.jpg similarity index 100% rename from assets/themes/miasma/backgrounds/01-nature-of-fear.jpg rename to themes/palettes/miasma/backgrounds/01-nature-of-fear.jpg diff --git a/assets/themes/miasma/backgrounds/02-crowned.jpg b/themes/palettes/miasma/backgrounds/02-crowned.jpg similarity index 100% rename from assets/themes/miasma/backgrounds/02-crowned.jpg rename to themes/palettes/miasma/backgrounds/02-crowned.jpg diff --git a/assets/themes/miasma/colors.toml b/themes/palettes/miasma/colors.toml similarity index 100% rename from assets/themes/miasma/colors.toml rename to themes/palettes/miasma/colors.toml diff --git a/assets/themes/miasma/icons.theme b/themes/palettes/miasma/icons.theme similarity index 100% rename from assets/themes/miasma/icons.theme rename to themes/palettes/miasma/icons.theme diff --git a/assets/themes/miasma/preview.png b/themes/palettes/miasma/preview.png similarity index 100% rename from assets/themes/miasma/preview.png rename to themes/palettes/miasma/preview.png diff --git a/assets/themes/nord/apps/btop.theme b/themes/palettes/nord/apps/btop.theme similarity index 100% rename from assets/themes/nord/apps/btop.theme rename to themes/palettes/nord/apps/btop.theme diff --git a/assets/themes/nord/apps/neovim.lua b/themes/palettes/nord/apps/neovim.lua similarity index 100% rename from assets/themes/nord/apps/neovim.lua rename to themes/palettes/nord/apps/neovim.lua diff --git a/assets/themes/nord/apps/vscode.json b/themes/palettes/nord/apps/vscode.json similarity index 100% rename from assets/themes/nord/apps/vscode.json rename to themes/palettes/nord/apps/vscode.json diff --git a/assets/themes/nord/backgrounds/0-black-moon.jpg b/themes/palettes/nord/backgrounds/0-black-moon.jpg similarity index 100% rename from assets/themes/nord/backgrounds/0-black-moon.jpg rename to themes/palettes/nord/backgrounds/0-black-moon.jpg diff --git a/assets/themes/nord/backgrounds/1-city-view.png b/themes/palettes/nord/backgrounds/1-city-view.png similarity index 100% rename from assets/themes/nord/backgrounds/1-city-view.png rename to themes/palettes/nord/backgrounds/1-city-view.png diff --git a/assets/themes/nord/backgrounds/2-night-hawks.png b/themes/palettes/nord/backgrounds/2-night-hawks.png similarity index 100% rename from assets/themes/nord/backgrounds/2-night-hawks.png rename to themes/palettes/nord/backgrounds/2-night-hawks.png diff --git a/assets/themes/nord/colors.toml b/themes/palettes/nord/colors.toml similarity index 100% rename from assets/themes/nord/colors.toml rename to themes/palettes/nord/colors.toml diff --git a/assets/themes/nord/icons.theme b/themes/palettes/nord/icons.theme similarity index 100% rename from assets/themes/nord/icons.theme rename to themes/palettes/nord/icons.theme diff --git a/assets/themes/nord/preview.png b/themes/palettes/nord/preview.png similarity index 100% rename from assets/themes/nord/preview.png rename to themes/palettes/nord/preview.png diff --git a/assets/themes/osaka-jade/apps/btop.theme b/themes/palettes/osaka-jade/apps/btop.theme similarity index 100% rename from assets/themes/osaka-jade/apps/btop.theme rename to themes/palettes/osaka-jade/apps/btop.theme diff --git a/assets/themes/osaka-jade/apps/neovim.lua b/themes/palettes/osaka-jade/apps/neovim.lua similarity index 100% rename from assets/themes/osaka-jade/apps/neovim.lua rename to themes/palettes/osaka-jade/apps/neovim.lua diff --git a/assets/themes/osaka-jade/apps/vscode.json b/themes/palettes/osaka-jade/apps/vscode.json similarity index 100% rename from assets/themes/osaka-jade/apps/vscode.json rename to themes/palettes/osaka-jade/apps/vscode.json diff --git a/assets/themes/osaka-jade/backgrounds/1-glowing-city.jpg b/themes/palettes/osaka-jade/backgrounds/1-glowing-city.jpg similarity index 100% rename from assets/themes/osaka-jade/backgrounds/1-glowing-city.jpg rename to themes/palettes/osaka-jade/backgrounds/1-glowing-city.jpg diff --git a/assets/themes/osaka-jade/backgrounds/2-shaded-entrance.jpg b/themes/palettes/osaka-jade/backgrounds/2-shaded-entrance.jpg similarity index 100% rename from assets/themes/osaka-jade/backgrounds/2-shaded-entrance.jpg rename to themes/palettes/osaka-jade/backgrounds/2-shaded-entrance.jpg diff --git a/assets/themes/osaka-jade/backgrounds/3-mountain-moon.jpg b/themes/palettes/osaka-jade/backgrounds/3-mountain-moon.jpg similarity index 100% rename from assets/themes/osaka-jade/backgrounds/3-mountain-moon.jpg rename to themes/palettes/osaka-jade/backgrounds/3-mountain-moon.jpg diff --git a/assets/themes/osaka-jade/colors.toml b/themes/palettes/osaka-jade/colors.toml similarity index 100% rename from assets/themes/osaka-jade/colors.toml rename to themes/palettes/osaka-jade/colors.toml diff --git a/assets/themes/osaka-jade/icons.theme b/themes/palettes/osaka-jade/icons.theme similarity index 100% rename from assets/themes/osaka-jade/icons.theme rename to themes/palettes/osaka-jade/icons.theme diff --git a/assets/themes/osaka-jade/preview.png b/themes/palettes/osaka-jade/preview.png similarity index 100% rename from assets/themes/osaka-jade/preview.png rename to themes/palettes/osaka-jade/preview.png diff --git a/assets/themes/retro-82/apps/btop.theme b/themes/palettes/retro-82/apps/btop.theme similarity index 100% rename from assets/themes/retro-82/apps/btop.theme rename to themes/palettes/retro-82/apps/btop.theme diff --git a/assets/themes/retro-82/apps/chromium.theme b/themes/palettes/retro-82/apps/chromium.theme similarity index 100% rename from assets/themes/retro-82/apps/chromium.theme rename to themes/palettes/retro-82/apps/chromium.theme diff --git a/assets/themes/retro-82/apps/neovim.lua b/themes/palettes/retro-82/apps/neovim.lua similarity index 100% rename from assets/themes/retro-82/apps/neovim.lua rename to themes/palettes/retro-82/apps/neovim.lua diff --git a/assets/themes/retro-82/apps/swayosd.css b/themes/palettes/retro-82/apps/swayosd.css similarity index 100% rename from assets/themes/retro-82/apps/swayosd.css rename to themes/palettes/retro-82/apps/swayosd.css diff --git a/assets/themes/retro-82/apps/vscode.json b/themes/palettes/retro-82/apps/vscode.json similarity index 100% rename from assets/themes/retro-82/apps/vscode.json rename to themes/palettes/retro-82/apps/vscode.json diff --git a/assets/themes/retro-82/backgrounds/1-in-the-groove.jpg b/themes/palettes/retro-82/backgrounds/1-in-the-groove.jpg similarity index 100% rename from assets/themes/retro-82/backgrounds/1-in-the-groove.jpg rename to themes/palettes/retro-82/backgrounds/1-in-the-groove.jpg diff --git a/assets/themes/retro-82/backgrounds/2-dusk-guardian.jpg b/themes/palettes/retro-82/backgrounds/2-dusk-guardian.jpg similarity index 100% rename from assets/themes/retro-82/backgrounds/2-dusk-guardian.jpg rename to themes/palettes/retro-82/backgrounds/2-dusk-guardian.jpg diff --git a/assets/themes/retro-82/backgrounds/3-glassy-lines.jpg b/themes/palettes/retro-82/backgrounds/3-glassy-lines.jpg similarity index 100% rename from assets/themes/retro-82/backgrounds/3-glassy-lines.jpg rename to themes/palettes/retro-82/backgrounds/3-glassy-lines.jpg diff --git a/assets/themes/retro-82/backgrounds/4-gateway.jpg b/themes/palettes/retro-82/backgrounds/4-gateway.jpg similarity index 100% rename from assets/themes/retro-82/backgrounds/4-gateway.jpg rename to themes/palettes/retro-82/backgrounds/4-gateway.jpg diff --git a/assets/themes/retro-82/backgrounds/5-zen-boat.jpg b/themes/palettes/retro-82/backgrounds/5-zen-boat.jpg similarity index 100% rename from assets/themes/retro-82/backgrounds/5-zen-boat.jpg rename to themes/palettes/retro-82/backgrounds/5-zen-boat.jpg diff --git a/assets/themes/retro-82/backgrounds/6-abstract-pyramids.jpg b/themes/palettes/retro-82/backgrounds/6-abstract-pyramids.jpg similarity index 100% rename from assets/themes/retro-82/backgrounds/6-abstract-pyramids.jpg rename to themes/palettes/retro-82/backgrounds/6-abstract-pyramids.jpg diff --git a/assets/themes/retro-82/backgrounds/7-the-journey.jpg b/themes/palettes/retro-82/backgrounds/7-the-journey.jpg similarity index 100% rename from assets/themes/retro-82/backgrounds/7-the-journey.jpg rename to themes/palettes/retro-82/backgrounds/7-the-journey.jpg diff --git a/assets/themes/retro-82/backgrounds/8-glitter-glass.jpg b/themes/palettes/retro-82/backgrounds/8-glitter-glass.jpg similarity index 100% rename from assets/themes/retro-82/backgrounds/8-glitter-glass.jpg rename to themes/palettes/retro-82/backgrounds/8-glitter-glass.jpg diff --git a/assets/themes/retro-82/colors.toml b/themes/palettes/retro-82/colors.toml similarity index 100% rename from assets/themes/retro-82/colors.toml rename to themes/palettes/retro-82/colors.toml diff --git a/assets/themes/retro-82/icons.theme b/themes/palettes/retro-82/icons.theme similarity index 100% rename from assets/themes/retro-82/icons.theme rename to themes/palettes/retro-82/icons.theme diff --git a/assets/themes/retro-82/preview.png b/themes/palettes/retro-82/preview.png similarity index 100% rename from assets/themes/retro-82/preview.png rename to themes/palettes/retro-82/preview.png diff --git a/assets/themes/ristretto/apps/btop.theme b/themes/palettes/ristretto/apps/btop.theme similarity index 100% rename from assets/themes/ristretto/apps/btop.theme rename to themes/palettes/ristretto/apps/btop.theme diff --git a/assets/themes/ristretto/apps/neovim.lua b/themes/palettes/ristretto/apps/neovim.lua similarity index 100% rename from assets/themes/ristretto/apps/neovim.lua rename to themes/palettes/ristretto/apps/neovim.lua diff --git a/assets/themes/ristretto/apps/vscode.json b/themes/palettes/ristretto/apps/vscode.json similarity index 100% rename from assets/themes/ristretto/apps/vscode.json rename to themes/palettes/ristretto/apps/vscode.json diff --git a/assets/themes/ristretto/backgrounds/1-color-curves.jpg b/themes/palettes/ristretto/backgrounds/1-color-curves.jpg similarity index 100% rename from assets/themes/ristretto/backgrounds/1-color-curves.jpg rename to themes/palettes/ristretto/backgrounds/1-color-curves.jpg diff --git a/assets/themes/ristretto/backgrounds/2-coffee-beans.jpg b/themes/palettes/ristretto/backgrounds/2-coffee-beans.jpg similarity index 100% rename from assets/themes/ristretto/backgrounds/2-coffee-beans.jpg rename to themes/palettes/ristretto/backgrounds/2-coffee-beans.jpg diff --git a/assets/themes/ristretto/backgrounds/3-industrial-moon.jpg b/themes/palettes/ristretto/backgrounds/3-industrial-moon.jpg similarity index 100% rename from assets/themes/ristretto/backgrounds/3-industrial-moon.jpg rename to themes/palettes/ristretto/backgrounds/3-industrial-moon.jpg diff --git a/assets/themes/ristretto/colors.toml b/themes/palettes/ristretto/colors.toml similarity index 100% rename from assets/themes/ristretto/colors.toml rename to themes/palettes/ristretto/colors.toml diff --git a/assets/themes/ristretto/icons.theme b/themes/palettes/ristretto/icons.theme similarity index 100% rename from assets/themes/ristretto/icons.theme rename to themes/palettes/ristretto/icons.theme diff --git a/assets/themes/ristretto/preview.png b/themes/palettes/ristretto/preview.png similarity index 100% rename from assets/themes/ristretto/preview.png rename to themes/palettes/ristretto/preview.png diff --git a/assets/themes/rose-pine/apps/btop.theme b/themes/palettes/rose-pine/apps/btop.theme similarity index 100% rename from assets/themes/rose-pine/apps/btop.theme rename to themes/palettes/rose-pine/apps/btop.theme diff --git a/assets/themes/rose-pine/apps/chromium.theme b/themes/palettes/rose-pine/apps/chromium.theme similarity index 100% rename from assets/themes/rose-pine/apps/chromium.theme rename to themes/palettes/rose-pine/apps/chromium.theme diff --git a/assets/themes/rose-pine/apps/neovim.lua b/themes/palettes/rose-pine/apps/neovim.lua similarity index 100% rename from assets/themes/rose-pine/apps/neovim.lua rename to themes/palettes/rose-pine/apps/neovim.lua diff --git a/assets/themes/rose-pine/apps/vscode.json b/themes/palettes/rose-pine/apps/vscode.json similarity index 100% rename from assets/themes/rose-pine/apps/vscode.json rename to themes/palettes/rose-pine/apps/vscode.json diff --git a/assets/themes/rose-pine/backgrounds/1-funky-shapes.jpg b/themes/palettes/rose-pine/backgrounds/1-funky-shapes.jpg similarity index 100% rename from assets/themes/rose-pine/backgrounds/1-funky-shapes.jpg rename to themes/palettes/rose-pine/backgrounds/1-funky-shapes.jpg diff --git a/assets/themes/rose-pine/backgrounds/2-dot-map.png b/themes/palettes/rose-pine/backgrounds/2-dot-map.png similarity index 100% rename from assets/themes/rose-pine/backgrounds/2-dot-map.png rename to themes/palettes/rose-pine/backgrounds/2-dot-map.png diff --git a/assets/themes/rose-pine/backgrounds/3-nomarchy-plants.png b/themes/palettes/rose-pine/backgrounds/3-nomarchy-plants.png similarity index 100% rename from assets/themes/rose-pine/backgrounds/3-nomarchy-plants.png rename to themes/palettes/rose-pine/backgrounds/3-nomarchy-plants.png diff --git a/assets/themes/rose-pine/colors.toml b/themes/palettes/rose-pine/colors.toml similarity index 100% rename from assets/themes/rose-pine/colors.toml rename to themes/palettes/rose-pine/colors.toml diff --git a/assets/themes/rose-pine/icons.theme b/themes/palettes/rose-pine/icons.theme similarity index 100% rename from assets/themes/rose-pine/icons.theme rename to themes/palettes/rose-pine/icons.theme diff --git a/assets/themes/rose-pine/light.mode b/themes/palettes/rose-pine/light.mode similarity index 100% rename from assets/themes/rose-pine/light.mode rename to themes/palettes/rose-pine/light.mode diff --git a/assets/themes/rose-pine/preview.png b/themes/palettes/rose-pine/preview.png similarity index 100% rename from assets/themes/rose-pine/preview.png rename to themes/palettes/rose-pine/preview.png diff --git a/assets/themes/summer-night/apps/btop.theme b/themes/palettes/summer-night/apps/btop.theme similarity index 100% rename from assets/themes/summer-night/apps/btop.theme rename to themes/palettes/summer-night/apps/btop.theme diff --git a/assets/themes/summer-night/apps/neovim.lua b/themes/palettes/summer-night/apps/neovim.lua similarity index 100% rename from assets/themes/summer-night/apps/neovim.lua rename to themes/palettes/summer-night/apps/neovim.lua diff --git a/assets/themes/summer-night/apps/vscode.json b/themes/palettes/summer-night/apps/vscode.json similarity index 100% rename from assets/themes/summer-night/apps/vscode.json rename to themes/palettes/summer-night/apps/vscode.json diff --git a/assets/themes/summer-night/backgrounds/summer-day.png b/themes/palettes/summer-night/backgrounds/summer-day.png similarity index 100% rename from assets/themes/summer-night/backgrounds/summer-day.png rename to themes/palettes/summer-night/backgrounds/summer-day.png diff --git a/assets/themes/summer-night/backgrounds/summer-night.png b/themes/palettes/summer-night/backgrounds/summer-night.png similarity index 100% rename from assets/themes/summer-night/backgrounds/summer-night.png rename to themes/palettes/summer-night/backgrounds/summer-night.png diff --git a/assets/themes/summer-night/colors.toml b/themes/palettes/summer-night/colors.toml similarity index 100% rename from assets/themes/summer-night/colors.toml rename to themes/palettes/summer-night/colors.toml diff --git a/assets/themes/summer-night/icons.theme b/themes/palettes/summer-night/icons.theme similarity index 100% rename from assets/themes/summer-night/icons.theme rename to themes/palettes/summer-night/icons.theme diff --git a/assets/themes/tokyo-night/apps/btop.theme b/themes/palettes/tokyo-night/apps/btop.theme similarity index 100% rename from assets/themes/tokyo-night/apps/btop.theme rename to themes/palettes/tokyo-night/apps/btop.theme diff --git a/assets/themes/tokyo-night/apps/keyboard.rgb b/themes/palettes/tokyo-night/apps/keyboard.rgb similarity index 100% rename from assets/themes/tokyo-night/apps/keyboard.rgb rename to themes/palettes/tokyo-night/apps/keyboard.rgb diff --git a/assets/themes/tokyo-night/apps/neovim.lua b/themes/palettes/tokyo-night/apps/neovim.lua similarity index 100% rename from assets/themes/tokyo-night/apps/neovim.lua rename to themes/palettes/tokyo-night/apps/neovim.lua diff --git a/assets/themes/tokyo-night/apps/vscode.json b/themes/palettes/tokyo-night/apps/vscode.json similarity index 100% rename from assets/themes/tokyo-night/apps/vscode.json rename to themes/palettes/tokyo-night/apps/vscode.json diff --git a/assets/themes/tokyo-night/backgrounds/0-swirl-buck.jpg b/themes/palettes/tokyo-night/backgrounds/0-swirl-buck.jpg similarity index 100% rename from assets/themes/tokyo-night/backgrounds/0-swirl-buck.jpg rename to themes/palettes/tokyo-night/backgrounds/0-swirl-buck.jpg diff --git a/assets/themes/tokyo-night/backgrounds/1-sunset-lake.png b/themes/palettes/tokyo-night/backgrounds/1-sunset-lake.png similarity index 100% rename from assets/themes/tokyo-night/backgrounds/1-sunset-lake.png rename to themes/palettes/tokyo-night/backgrounds/1-sunset-lake.png diff --git a/assets/themes/tokyo-night/backgrounds/2-pawel-czerwinski.jpg b/themes/palettes/tokyo-night/backgrounds/2-pawel-czerwinski.jpg similarity index 100% rename from assets/themes/tokyo-night/backgrounds/2-pawel-czerwinski.jpg rename to themes/palettes/tokyo-night/backgrounds/2-pawel-czerwinski.jpg diff --git a/assets/themes/tokyo-night/backgrounds/3-milad-fakurian.jpg b/themes/palettes/tokyo-night/backgrounds/3-milad-fakurian.jpg similarity index 100% rename from assets/themes/tokyo-night/backgrounds/3-milad-fakurian.jpg rename to themes/palettes/tokyo-night/backgrounds/3-milad-fakurian.jpg diff --git a/assets/themes/tokyo-night/colors.toml b/themes/palettes/tokyo-night/colors.toml similarity index 100% rename from assets/themes/tokyo-night/colors.toml rename to themes/palettes/tokyo-night/colors.toml diff --git a/assets/themes/tokyo-night/icons.theme b/themes/palettes/tokyo-night/icons.theme similarity index 100% rename from assets/themes/tokyo-night/icons.theme rename to themes/palettes/tokyo-night/icons.theme diff --git a/assets/themes/tokyo-night/preview.png b/themes/palettes/tokyo-night/preview.png similarity index 100% rename from assets/themes/tokyo-night/preview.png rename to themes/palettes/tokyo-night/preview.png diff --git a/assets/themes/vantablack/apps/btop.theme b/themes/palettes/vantablack/apps/btop.theme similarity index 100% rename from assets/themes/vantablack/apps/btop.theme rename to themes/palettes/vantablack/apps/btop.theme diff --git a/assets/themes/vantablack/apps/neovim.lua b/themes/palettes/vantablack/apps/neovim.lua similarity index 100% rename from assets/themes/vantablack/apps/neovim.lua rename to themes/palettes/vantablack/apps/neovim.lua diff --git a/assets/themes/vantablack/apps/vscode.json b/themes/palettes/vantablack/apps/vscode.json similarity index 100% rename from assets/themes/vantablack/apps/vscode.json rename to themes/palettes/vantablack/apps/vscode.json diff --git a/assets/themes/vantablack/backgrounds/1-twisted-stairs.jpg b/themes/palettes/vantablack/backgrounds/1-twisted-stairs.jpg similarity index 100% rename from assets/themes/vantablack/backgrounds/1-twisted-stairs.jpg rename to themes/palettes/vantablack/backgrounds/1-twisted-stairs.jpg diff --git a/assets/themes/vantablack/backgrounds/2-layers-deep.jpg b/themes/palettes/vantablack/backgrounds/2-layers-deep.jpg similarity index 100% rename from assets/themes/vantablack/backgrounds/2-layers-deep.jpg rename to themes/palettes/vantablack/backgrounds/2-layers-deep.jpg diff --git a/assets/themes/vantablack/backgrounds/3-layers-stacked.jpg b/themes/palettes/vantablack/backgrounds/3-layers-stacked.jpg similarity index 100% rename from assets/themes/vantablack/backgrounds/3-layers-stacked.jpg rename to themes/palettes/vantablack/backgrounds/3-layers-stacked.jpg diff --git a/assets/themes/vantablack/colors.toml b/themes/palettes/vantablack/colors.toml similarity index 100% rename from assets/themes/vantablack/colors.toml rename to themes/palettes/vantablack/colors.toml diff --git a/assets/themes/vantablack/icons.theme b/themes/palettes/vantablack/icons.theme similarity index 100% rename from assets/themes/vantablack/icons.theme rename to themes/palettes/vantablack/icons.theme diff --git a/assets/themes/vantablack/preview.png b/themes/palettes/vantablack/preview.png similarity index 100% rename from assets/themes/vantablack/preview.png rename to themes/palettes/vantablack/preview.png diff --git a/assets/themes/white/apps/btop.theme b/themes/palettes/white/apps/btop.theme similarity index 100% rename from assets/themes/white/apps/btop.theme rename to themes/palettes/white/apps/btop.theme diff --git a/assets/themes/white/apps/neovim.lua b/themes/palettes/white/apps/neovim.lua similarity index 100% rename from assets/themes/white/apps/neovim.lua rename to themes/palettes/white/apps/neovim.lua diff --git a/assets/themes/white/apps/vscode.json b/themes/palettes/white/apps/vscode.json similarity index 100% rename from assets/themes/white/apps/vscode.json rename to themes/palettes/white/apps/vscode.json diff --git a/assets/themes/white/backgrounds/1-white.jpg b/themes/palettes/white/backgrounds/1-white.jpg similarity index 100% rename from assets/themes/white/backgrounds/1-white.jpg rename to themes/palettes/white/backgrounds/1-white.jpg diff --git a/assets/themes/white/backgrounds/2-white.jpg b/themes/palettes/white/backgrounds/2-white.jpg similarity index 100% rename from assets/themes/white/backgrounds/2-white.jpg rename to themes/palettes/white/backgrounds/2-white.jpg diff --git a/assets/themes/white/backgrounds/3-white.jpg b/themes/palettes/white/backgrounds/3-white.jpg similarity index 100% rename from assets/themes/white/backgrounds/3-white.jpg rename to themes/palettes/white/backgrounds/3-white.jpg diff --git a/assets/themes/white/colors.toml b/themes/palettes/white/colors.toml similarity index 100% rename from assets/themes/white/colors.toml rename to themes/palettes/white/colors.toml diff --git a/assets/themes/white/icons.theme b/themes/palettes/white/icons.theme similarity index 100% rename from assets/themes/white/icons.theme rename to themes/palettes/white/icons.theme diff --git a/assets/themes/white/light.mode b/themes/palettes/white/light.mode similarity index 100% rename from assets/themes/white/light.mode rename to themes/palettes/white/light.mode diff --git a/assets/themes/white/preview.png b/themes/palettes/white/preview.png similarity index 100% rename from assets/themes/white/preview.png rename to themes/palettes/white/preview.png diff --git a/assets/themed/alacritty.toml.tpl b/themes/templates/alacritty.toml.tpl similarity index 100% rename from assets/themed/alacritty.toml.tpl rename to themes/templates/alacritty.toml.tpl diff --git a/assets/themed/btop.theme.tpl b/themes/templates/btop.theme.tpl similarity index 100% rename from assets/themed/btop.theme.tpl rename to themes/templates/btop.theme.tpl diff --git a/assets/themed/chromium.theme.tpl b/themes/templates/chromium.theme.tpl similarity index 100% rename from assets/themed/chromium.theme.tpl rename to themes/templates/chromium.theme.tpl diff --git a/assets/themed/ghostty.conf.tpl b/themes/templates/ghostty.conf.tpl similarity index 100% rename from assets/themed/ghostty.conf.tpl rename to themes/templates/ghostty.conf.tpl diff --git a/assets/themed/hyprland-preview-share-picker.css.tpl b/themes/templates/hyprland-preview-share-picker.css.tpl similarity index 100% rename from assets/themed/hyprland-preview-share-picker.css.tpl rename to themes/templates/hyprland-preview-share-picker.css.tpl diff --git a/assets/themed/hyprland.conf.tpl b/themes/templates/hyprland.conf.tpl similarity index 100% rename from assets/themed/hyprland.conf.tpl rename to themes/templates/hyprland.conf.tpl diff --git a/assets/themed/hyprlock.conf.tpl b/themes/templates/hyprlock.conf.tpl similarity index 100% rename from assets/themed/hyprlock.conf.tpl rename to themes/templates/hyprlock.conf.tpl diff --git a/assets/themed/keyboard.rgb.tpl b/themes/templates/keyboard.rgb.tpl similarity index 100% rename from assets/themed/keyboard.rgb.tpl rename to themes/templates/keyboard.rgb.tpl diff --git a/assets/themed/kitty.conf.tpl b/themes/templates/kitty.conf.tpl similarity index 100% rename from assets/themed/kitty.conf.tpl rename to themes/templates/kitty.conf.tpl diff --git a/assets/themed/mako.ini.tpl b/themes/templates/mako.ini.tpl similarity index 100% rename from assets/themed/mako.ini.tpl rename to themes/templates/mako.ini.tpl diff --git a/assets/themed/obsidian.css.tpl b/themes/templates/obsidian.css.tpl similarity index 100% rename from assets/themed/obsidian.css.tpl rename to themes/templates/obsidian.css.tpl diff --git a/assets/themed/swayosd.css.tpl b/themes/templates/swayosd.css.tpl similarity index 100% rename from assets/themed/swayosd.css.tpl rename to themes/templates/swayosd.css.tpl