diff --git a/Droidnix/README.html b/Droidnix/README.html index ee73af700..09201697a 100644 --- a/Droidnix/README.html +++ b/Droidnix/README.html @@ -3,7 +3,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - + Droidnix: A Dendritic NixOS + Home Manager Configuration NixOS Configuration Structure @@ -204,117 +204,117 @@

Table of Contents

-
-

Shortcuts

-
+
+

Shortcuts

+

Introduction The Assets Folder @@ -330,26 +330,26 @@

Introduction   intro

-
-

What is Droidnix

-
+
+

What is Droidnix

+

Droidnix is a modular, declarative NixOS + Home Manager configuration system. It allows users to choose between Hyprland and Mangowc as their window manager, with shared and WM-specific configurations managed via Emacs Org and Nix Flakes. The project is designed for reproducibility, maintainability, and cross-machine compatibility.

-
-

Installed components:

-
+
+

Installed components:

+
    -
  • Core
  • -
  • Hyprland
  • -
  • Mangowc
  • +
  • Core
  • +
  • Hyprland
  • +
  • Mangowc
-
-

Goals, project Structure, import hierarchy

-
+
+

Goals, project Structure, import hierarchy

+

This project uses a modular NixOS configuration with Hyprland and MangoWC support, designed for literate programming and cross-device reusability. The Droidnix repository is organized into two main parts: @@ -362,9 +362,9 @@ The Droidnix repository is organized into two main parts:

-
-

Root Level

-
+
+

Root Level

+
  • flake.nix is the entry point and imports:
      @@ -375,16 +375,16 @@ The Droidnix repository is organized into two main parts:
-
-

Generated Structure

-
+
+

Generated Structure

+

The generated/ directory contains all generated configurations, divided into three main groups: system, hyprland, and mangowc.

-
-

First Setup

-
+
+

First Setup

+
  1. Clone this repository.
  2. Run the setup script: ./setup_droid.
  3. @@ -414,9 +414,9 @@ The .assets/ folder contains all static files, such as configs, scr This section contains the Org blocks for tangling Nix code into the generated folders.

-
-

flake.nix

-
+
+

flake.nix

+

The Nix flake definition for Droidnix.

@@ -485,9 +485,9 @@ The Nix flake definition for Droidnix.
-
-

generated/hosts/traveldroid/host.nix

-
+
+

generated/hosts/traveldroid/host.nix

+
{ lib, config, pkgs, flakeRoot, import-tree, home-manager, ... }:
 
@@ -545,9 +545,9 @@ in
 
-
-

generated/hosts/traveldroid/hardware-configuration.nix

-
+
+

generated/hosts/traveldroid/hardware-configuration.nix

+
  1. Boot into NixOS Live ISO or your installed system.
  2. Open a terminal.
  3. @@ -605,9 +605,9 @@ in
-
-

generated/hosts/traveldroid/boot.nix

-
+
+

generated/hosts/traveldroid/boot.nix

+
{ config, pkgs, lib, flakeRoot, ... }:
 
@@ -656,17 +656,17 @@ in
 
-
-

Following are the imported modules

+
+

Following are the imported modules

-
-

generated/traveldroid/modules/apps

-
+
+

generated/traveldroid/modules/apps

+
-
-

generated/modules/traveldroid/apps/2_b_installed.nix

-
+
+

generated/modules/traveldroid/apps/2_b_installed.nix

+

This installs a list of apps

@@ -774,9 +774,9 @@ in {
-
-

generated/assets/2_b_installed.conf

-
+
+

generated/assets/2_b_installed.conf

+

This is a list of additional apps to install

@@ -829,9 +829,9 @@ com.todoist.Todoist
-
-

generated/modules/traveldroid/apps/flameshot.nix

-
+
+

generated/modules/traveldroid/apps/flameshot.nix

+

This is top file of this level which contains just an import statement for all relevant files and/or the subfolder in this folder

@@ -870,9 +870,9 @@ in
-
-

generated/modules/traveldroid/apps/kitty.nix

-
+
+

generated/modules/traveldroid/apps/kitty.nix

+

This file sets up Kitty terminal

@@ -930,9 +930,9 @@ in
-
-

generated/modules/traveldroid/apps/starship.nix

-
+
+

generated/modules/traveldroid/apps/starship.nix

+

This file sets up starship prompt

@@ -971,9 +971,9 @@ in
-
-

.config/starship.toml

-
+
+

.config/starship.toml

+

These are config files for .config

@@ -1262,9 +1262,9 @@ crust = "#181926"
-
-

generated/modules/traveldroid/apps/thunar.nix

-
+
+

generated/modules/traveldroid/apps/thunar.nix

+

This is top file of this level which contains just an import statement for all relevant files and/or the subfolder in this folder

@@ -1305,9 +1305,9 @@ in
-
-

generated/modules/traveldroid/apps/wofi.nix

-
+
+

generated/modules/traveldroid/apps/wofi.nix

+

This is the install for Wofi, the launcher

@@ -1340,9 +1340,9 @@ in
-
-

.config/wofi/config

-
+
+

.config/wofi/config

+

These are config files for .config/wofi

@@ -1389,9 +1389,9 @@ prompt = >
-
-

.config/wofi/style.css

-
+
+

.config/wofi/style.css

+

These are config files for .config/wofi

@@ -1480,9 +1480,9 @@ These are config files for .config/wofi
-
-

generated/modules/traveldroid/apps/zenbrowser.nix

-
+
+

generated/modules/traveldroid/apps/zenbrowser.nix

+

This installs zen browser

@@ -1502,9 +1502,9 @@ in
-
-

generated/modules/traveldroid/apps/zsh.nix

-
+
+

generated/modules/traveldroid/apps/zsh.nix

+

This sets up the zsh in the terminal

@@ -1567,9 +1567,9 @@ in
-
-

=generated/.config/zsh/.zshrc

-
+
+

=generated/.config/zsh/.zshrc

+

This sets up the zsh in the terminal

@@ -1590,9 +1590,9 @@ fi
-
-

generated/modules/traveldroid/apps/emacs/emacs.nix

-
+
+

generated/modules/traveldroid/apps/emacs/emacs.nix

+

This installs emacs

@@ -1688,9 +1688,9 @@ in
-
-

generated/.config/emacs/early-init.el

-
+
+

generated/.config/emacs/early-init.el

+

This contaions emacs

@@ -1791,9 +1791,9 @@ package-archive-priorities '(("gnu" . 99)
-
-

generated/.config/emacs/init.el

-
+
+

generated/.config/emacs/init.el

+

This contaions emacs

@@ -2204,13 +2204,13 @@ the top of the file."
-
-

generated/modules/traveldroid/desktop

-
+
+

generated/modules/traveldroid/desktop

+
-
-

generated/modules/traveldroid/desktop/fonts.nix

-
+
+

generated/modules/traveldroid/desktop/fonts.nix

+

This file installs and configures fonts

@@ -2228,9 +2228,9 @@ This file installs and configures fonts
-
-

generated/modules/traveldroid/desktop/gtk.nix

-
+
+

generated/modules/traveldroid/desktop/gtk.nix

+

Setting up GTK

@@ -2256,9 +2256,9 @@ in
-
-

generated/modules/traveldroid/desktop/hyprland.nix

-
+
+

generated/modules/traveldroid/desktop/hyprland.nix

+

Setting up Hyprland

@@ -2305,9 +2305,9 @@ in
-
-

.config/hypr/animations.conf

-
+
+

.config/hypr/animations.conf

+

These are config files for .config/hypr

@@ -2328,9 +2328,9 @@ animations {
-
-

.config/hypr/behaviour.conf

-
+
+

.config/hypr/behaviour.conf

+

These are config files for .config/hypr

@@ -2344,9 +2344,9 @@ These are config files for .config/hypr
-
-

.config/hypr/bindings.conf

-
+
+

.config/hypr/bindings.conf

+

These are config files for .config/hypr

@@ -2509,9 +2509,9 @@ bind = $mainMod, W, exec, zen
-
-

.config/hypr/exec-once.conf

-
+
+

.config/hypr/exec-once.conf

+

These are config files for .config/hypr

@@ -2527,9 +2527,9 @@ exec-once = sh ~/Wallpapers/scripts/wallpaper.sh &
-
-

.config/hypr/hypridle.conf

-
+
+

.config/hypr/hypridle.conf

+

These are config files for .config/hypr

@@ -2554,9 +2554,9 @@ listener {
-
-

.config/hypr/hyprland.conf

-
+
+

.config/hypr/hyprland.conf

+

These are config files for .config/hypr

@@ -2603,9 +2603,9 @@ misc {
-
-

.config/hypr/hyprlock.conf

-
+
+

.config/hypr/hyprlock.conf

+

These are config files for .config/hypr

@@ -2646,9 +2646,9 @@ label {
-
-

.config/hypr/layer-rules.conf

-
+
+

.config/hypr/layer-rules.conf

+

These are config files for .config/hypr

@@ -2663,9 +2663,9 @@ layerrule = blur on, ignore_alpha 1, match:namespace swaync-notification-window
-
-

.config/hypr/layout.conf

-
+
+

.config/hypr/layout.conf

+

These are config files for .config/hypr

@@ -2675,9 +2675,9 @@ These are config files for .config/hypr
-
-

.config/hypr/monitor-rules.conf

-
+
+

.config/hypr/monitor-rules.conf

+

These are config files for .config/hypr

@@ -2688,9 +2688,9 @@ monitor=DP-1,3840x1080@144,1920x0,1
-
-

.config/hypr/scripts/layout-selector.sh

-
+
+

.config/hypr/scripts/layout-selector.sh

+

These are config files for .config/hypr/scripts

@@ -2733,9 +2733,9 @@ hyprctl dispatch oSD "Layout: $LAYOUT_NAME" 2000
-
-

.config/hypr/theming.css

-
+
+

.config/hypr/theming.css

+

These are config files for .config/hypr

@@ -2784,9 +2784,9 @@ decoration {
-
-

.config/hypr/window-rules.conf

-
+
+

.config/hypr/window-rules.conf

+

These are config files for .config/hypr

@@ -2824,9 +2824,9 @@ windowrule {
-
-

.config/hypr/workspace-rules.conf

-
+
+

.config/hypr/workspace-rules.conf

+

These are config files for .config/hypr

@@ -2852,9 +2852,9 @@ workspace = 10
-
-

generated/modules/traveldroid/desktop/wallpaper.nix

-
+
+

generated/modules/traveldroid/desktop/wallpaper.nix

+

Setting up wallpaper engine + wallpaper gui

@@ -2953,9 +2953,9 @@ in
-
-

generated/modules/traveldroid/desktop/stylix.nix

-
+
+

generated/modules/traveldroid/desktop/stylix.nix

+
{ lib, config, pkgs, flakeRoot, stylix, ... }:
 
@@ -3042,9 +3042,9 @@ in
 
-
-

.config/stylix/stylix.conf

-
+
+

.config/stylix/stylix.conf

+

These are config files for .config/stylix

@@ -3081,9 +3081,9 @@ icons = {
-
-

.config/stylix/palette.json

-
+
+

.config/stylix/palette.json

+

These are config files for .config/stylix

@@ -3113,9 +3113,9 @@ These are config files for .config/stylix
-
-

.config/stylix/palette.html

-
+
+

.config/stylix/palette.html

+

These are config files for .config/stylix

@@ -3193,9 +3193,9 @@ These are config files for .config/stylix
-
-

generated/modules/traveldroid/desktop/waybar.nix

-
+
+

generated/modules/traveldroid/desktop/waybar.nix

+

This file installs and configures waybar

@@ -3261,9 +3261,9 @@ in
-
-

.config/waybar/config

-
+
+

.config/waybar/config

+

These are config files for waybar

@@ -3275,7 +3275,6 @@ These are config files for waybar //"modules-left": ["hyprland/window"], "modules-center": [ - "hyprland/workspaces", "custom/hyprscroll_overflow" ], @@ -3402,13 +3401,254 @@ These are config files for waybar "format-icons": ["󰁺", "󰁼", "󰁾", "󰂀", "󱈏 "], }, } + +/* --- Hyprland palette (ported) --- */ +@define-color base rgba(30, 30, 46, 1.0); /* 1e1e2eff */ +@define-color inactive rgba(89, 89, 89, 0.667); /* 595959aa */ +@define-color blue rgba(51, 204, 255, 0.933); /* 33ccffee */ +@define-color green rgba(0, 255, 153, 0.933); /* 00ff99ee */ + +/* extra colors you referenced but didn’t define */ +@define-color text rgba(255, 255, 255, 1.0); +@define-color surface1 rgba(255, 255, 255, 0.08); +@define-color subtext1 rgba(255, 255, 255, 0.35); +@define-color red rgba(255, 0, 0, 0.90); +@define-color overlay1 rgba(255, 255, 255, 0.35); +@define-color yellow rgba(255, 215, 0, 0.95); + + * { + font-family: + Aporetic Sans Mono, + FiraCode Nerd Font, + Iosevka Nerd Font, + Roboto, + Helvetica, + Arial, + sans-serif; + font-size: 13px; +} + +window#waybar { + background-color: transparent; + color: @text; + transition-property: background-color; + border-bottom: 0px solid rgba(0, 0, 0, 0); + transition-duration: 0.5s; +} + +#workspaces button { + padding: 0px 1px; + min-width: 80px; + background-color: transparent; + color: @text; + border: 2px solid @inactive; + border-radius: 10px; +} + +#custom-notifications.empty { + color: @overlay1; +} + +#custom-notifications.unread { + color: @yellow; +} + +#workspaces button:hover { + background-color: @surface1; + color: @text; +} + +#workspaces button.active { + padding: 0px 1px; + min-width: 80px; + color: @text; + border-radius: 10px; + font-weight: bold; + border: 1px solid transparent; + background: + linear-gradient(rgba(255, 255, 255, 0.15), rgba(255, 255, 255, 0.15)) + padding-box, + linear-gradient(45deg, @blue, @green) border-box; +} + +#custom-hyprscroll_overflow.overflow { + padding: 0px 1px; + min-width: 80px; + color: @text; + border-radius: 10px; + font-weight: bold; + border: 1px dashed transparent; + background: + linear-gradient(rgba(255, 255, 255, 0.05), rgba(255, 255, 255, 0.05)) + padding-box, + linear-gradient(45deg, @blue, @green) border-box; +} + +#custom-hyprscroll_overflow.overflow { + background: + linear-gradient(rgba(255, 255, 255, 0.05), rgba(255, 255, 255, 0.05)) + padding-box, + linear-gradient(45deg, @blue, @green) border-box; +} + +#custom-hyprscroll_overflow.hidden { + padding: 0; + margin: 0; + min-width: 0; + border: 0; + background: transparent; + opacity: 0; +} + +#custom-bluetooth { + display: inline-block; + width: 4ch; /* width in character units */ + text-align: center; + overflow: visible; /* width in character units */ + white-space: nowrap; +} + +#clock, +#idle_inhibitor, +#battery, +#cpu, +#memory, +#temperature, +#network, +#pulseaudio, +#tray { + margin: 0 5px; + padding: 0 2px; +} + +#idle_inhibitor.activated { + background-color: @green; +} + +#battery.charging { + color: @green; +} + +@keyframes blink { + to { + background-color: #ffffff; + color: black; + } +} + +#battery.warning:not(.charging) { + color: white; + animation-name: blink; + animation-duration: 0.5s; + animation-timing-function: linear; + animation-iteration-count: infinite; + animation-direction: alternate; +} + +#window, +#workspaces { + margin: 0 4px; +} + +.modules-left > widget:first-child > #workspaces { + margin-left: 0; +} + +.modules-right > widget:last-child > #workspaces { + margin-right: 0; +} + +#network.disconnected { + background-color: @red; +} + +#temperature.critical { + background-color: @red; +} + +/* ========================================================= + * Notifications + * ========================================================= */ +#custom-notifications { + margin: 0 4px; + padding: 0 4px; + min-width: 0; +} + +#custom-notifications.empty { + color: @overlay1; +} +#custom-notifications.unread { + color: @yellow; +} + +/* ========================================================= + * Hyprscroll overflow indicator (custom/hyprscroll_overflow) + * States: .ok, .overflow, .error + * ========================================================= */ + +/* Default (no overflow): subtle pill, still hoverable for tooltip */ +#custom-hyprscroll_overflow.ok { + padding: 0px 1px; + min-width: 80px; + color: @subtext1; + border-radius: 10px; + + /* subtle outline so you know it's there */ + border: 1px solid rgba(255, 255, 255, 0.12); + background: rgba(255, 255, 255, 0.03); +} + +/* Make it feel interactive (hover) */ +#custom-hyprscroll_overflow.ok:hover { + color: @text; + background-color: @surface1; + border: 1px solid rgba(255, 255, 255, 0.18); +} + +/* Overflow state: you already have this; keep it. + Optional: add hover tweak so it "pops" a bit. */ +#custom-hyprscroll_overflow.overflow:hover { + background: + linear-gradient(rgba(255, 255, 255, 0.1), rgba(255, 255, 255, 0.1)) + padding-box, + linear-gradient(45deg, @blue, @green) border-box; +} + +/* Error state: clear but not screaming */ +#custom-hyprscroll_overflow.error { + padding: 0px 1px; + min-width: 80px; + color: @text; + border-radius: 10px; + + border: 1px solid rgba(255, 0, 0, 0.55); + background: rgba(255, 0, 0, 0.15); + font-weight: bold; +} + +/* Optional: if you keep .hidden in the script for any reason */ +#custom-hyprscroll_overflow.hidden { + padding: 0; + margin: 0; + min-width: 0; + border: 0; + background: transparent; + opacity: 0; +} + +[id^="custom-"] { + padding: 0 4px; + overflow: visible; + text-align: center; +}
-
-

.config/waybar/style.css

-
+
+

.config/waybar/style.css

+

These are config files for waybar

@@ -3658,9 +3898,9 @@ window#waybar {
-
-

.config/waybar/scripts/bluetooth-status.sh

-
+
+

.config/waybar/scripts/bluetooth-status.sh

+

These are config files for waybar

@@ -3686,49 +3926,35 @@ printf '{"text": "%s", "tooltip": "%s"}\n' "$icon" "$tooltip"
-
-

.config/waybar/scripts/hyprscroll-overflow.sh

-
+
+

.config/waybar/scripts/hyprscroll-overflow.sh

+

These are config files for waybar

#!/usr/bin/env bash
-set -euo pipefail
-fallback='{"text":" ","class":"hidden"}'
+
 # Get active workspace ID
-active_ws=$(hyprctl activeworkspace -j | jq '.id') || { echo "$fallback"; exit 0; }
-# Get all clients on this workspace
-ws_clients=$(hyprctl clients -j | jq "[.[] | select(.workspace.id==$active_ws)]")
-total_clients=$(echo "$ws_clients" | jq 'length')
-(( total_clients == 0 )) && { echo "$fallback"; exit 0; }
-# Get all monitors
-monitors=$(hyprctl monitors -j)
-# Count windows that are fully inside any monitor
-visible_count=$(jq -n --argjson clients "$ws_clients" --argjson monitors "$monitors" '
-  [ $clients[] | select(
-      ($monitors[] |
-         .x <= .at[0] and (.at[0] + .size[0]) <= (.x + .width) and
-         .y <= .at[1] and (.at[1] + .size[1]) <= (.y + .height)
-      )
-  ) ] | length
-')
-# Show fallback if all windows fit
-if (( total_clients <= visible_count )); then
-    echo "$fallback"
-    exit 0
+active_ws=$(hyprctl activeworkspace -j | jq -r '.id')
+
+# Count clients in the active workspace
+clients=$(hyprctl -j clients | jq --argjson w "$active_ws" '[.[] | select(.workspace.id==$w)] | length')
+
+# Output for Waybar
+if [ "$clients" -eq 0 ]; then
+    echo "$active_ws"
+else
+    echo "$active_ws ($clients)"
 fi
-# Build tooltip
-tooltip=$(echo "$ws_clients" | jq -r '.[].title' | sed ':a;N;$!ba;s/\n/\\n/g')
-# Output JSON
-echo "{\"text\":\"★ $total_clients\",\"tooltip\":\"$tooltip\",\"class\":\"overflow\"}"
+
 
-
-

.config/waybar/scripts/hyprscroll-menu.sh

-
+
+

.config/waybar/scripts/hyprscroll-menu.sh

+

These are config files for waybar

@@ -3745,9 +3971,9 @@ hyprctl dispatch focuswindow address:$addr
-
-

.config/waypaper/config.ini

-
+
+

.config/waypaper/config.ini

+

These are config files for waypaper

@@ -3784,9 +4010,9 @@ keybindings = ~/.config/waypaper/keybindings.ini
-
-

generated/modules/traveldroid/desktop/wayland.nix

-
+
+

generated/modules/traveldroid/desktop/wayland.nix

+
{ lib, config, pkgs, ... }:
 
@@ -3816,9 +4042,9 @@ keybindings = ~/.config/waypaper/keybindings.ini
 
-
-

generated/modules/traveldroid/desktop/xdg.nix

-
+
+

generated/modules/traveldroid/desktop/xdg.nix

+

This sets the XDG implementation

@@ -3872,13 +4098,13 @@ in
-
-

generated/modules/traveldroid/system

-
+
+

generated/modules/traveldroid/system

+
-
-

generated/modules/traveldroid/system/audio.nix

-
+
+

generated/modules/traveldroid/system/audio.nix

+
{ lib, config, pkgs, ... }:
 
@@ -3896,9 +4122,9 @@ in
 
-
-

generated/modules/traveldroid/system/bluetooth.nix

-
+
+

generated/modules/traveldroid/system/bluetooth.nix

+
{ lib, config, pkgs, home-manager, ... }:
 
@@ -3919,9 +4145,9 @@ in
 
-
-

generated/modules/traveldroid/system/dbus.nix

-
+
+

generated/modules/traveldroid/system/dbus.nix

+

This sets the dbus implementation

@@ -3948,9 +4174,9 @@ This sets the dbus implementation
-
-

generated/modules/traveldroid/system/login-tuigreet.nix

-
+
+

generated/modules/traveldroid/system/login-tuigreet.nix

+

This sets up tuigreeter which is not fancy but imo fits the aesthetic I am aiming for

@@ -4004,9 +4230,9 @@ in
-
-

generated/modules/traveldroid/system/networking.nix

-
+
+

generated/modules/traveldroid/system/networking.nix

+

This sets the networking.

@@ -4069,9 +4295,9 @@ This sets the networking.
-
-

generated/modules/traveldroid/system/nix.nix

-
+
+

generated/modules/traveldroid/system/nix.nix

+
{ lib, config, ... }:
 
@@ -4087,9 +4313,9 @@ This sets the networking.
 
-
-

generated/modules/traveldroid/system/printing.nix

-
+
+

generated/modules/traveldroid/system/printing.nix

+

This sets the dbus implementation

@@ -4114,13 +4340,13 @@ This sets the dbus implementation
-
-

generated/users

-
+
+

generated/users

+
-
-

generated/users/henrov.nix

-
+
+

generated/users/henrov.nix

+

This is the default user, just search and replace henrov another name if you want to change

@@ -4178,9 +4404,9 @@ in

These are all the prepared config files

-
-

.config/waybar/style.css

-
+
+

.config/waybar/style.css

+

These are config files for .config/waybar

@@ -4414,9 +4640,9 @@ window#waybar {
-
-

.config/waypaper/config.ini

-
+
+

.config/waypaper/config.ini

+

These are config files for .config/waypaper

@@ -4453,9 +4679,9 @@ keybindings = ~/.config/waypaper/keybindings.ini
-
-

.config/zed/settings.json

-
+
+

.config/zed/settings.json

+

These are config files for .config/zed

@@ -4495,7 +4721,7 @@ These are config files for .config/zed

Author: Henro Veijer

-

Created: 2026-04-02 do 15:50

+

Created: 2026-04-02 do 17:37

Validate

diff --git a/Droidnix/README.org b/Droidnix/README.org index c5cd4d8a6..f3eb6a888 100644 --- a/Droidnix/README.org +++ b/Droidnix/README.org @@ -2664,7 +2664,6 @@ These are config files for waybar //"modules-left": ["hyprland/window"], "modules-center": [ - "hyprland/workspaces", "custom/hyprscroll_overflow" ], @@ -2791,6 +2790,247 @@ These are config files for waybar "format-icons": ["󰁺", "󰁼", "󰁾", "󰂀", "󱈏 "], }, } + +/* --- Hyprland palette (ported) --- */ +@define-color base rgba(30, 30, 46, 1.0); /* 1e1e2eff */ +@define-color inactive rgba(89, 89, 89, 0.667); /* 595959aa */ +@define-color blue rgba(51, 204, 255, 0.933); /* 33ccffee */ +@define-color green rgba(0, 255, 153, 0.933); /* 00ff99ee */ + +/* extra colors you referenced but didn’t define */ +@define-color text rgba(255, 255, 255, 1.0); +@define-color surface1 rgba(255, 255, 255, 0.08); +@define-color subtext1 rgba(255, 255, 255, 0.35); +@define-color red rgba(255, 0, 0, 0.90); +@define-color overlay1 rgba(255, 255, 255, 0.35); +@define-color yellow rgba(255, 215, 0, 0.95); + + * { + font-family: + Aporetic Sans Mono, + FiraCode Nerd Font, + Iosevka Nerd Font, + Roboto, + Helvetica, + Arial, + sans-serif; + font-size: 13px; +} + +window#waybar { + background-color: transparent; + color: @text; + transition-property: background-color; + border-bottom: 0px solid rgba(0, 0, 0, 0); + transition-duration: 0.5s; +} + +#workspaces button { + padding: 0px 1px; + min-width: 80px; + background-color: transparent; + color: @text; + border: 2px solid @inactive; + border-radius: 10px; +} + +#custom-notifications.empty { + color: @overlay1; +} + +#custom-notifications.unread { + color: @yellow; +} + +#workspaces button:hover { + background-color: @surface1; + color: @text; +} + +#workspaces button.active { + padding: 0px 1px; + min-width: 80px; + color: @text; + border-radius: 10px; + font-weight: bold; + border: 1px solid transparent; + background: + linear-gradient(rgba(255, 255, 255, 0.15), rgba(255, 255, 255, 0.15)) + padding-box, + linear-gradient(45deg, @blue, @green) border-box; +} + +#custom-hyprscroll_overflow.overflow { + padding: 0px 1px; + min-width: 80px; + color: @text; + border-radius: 10px; + font-weight: bold; + border: 1px dashed transparent; + background: + linear-gradient(rgba(255, 255, 255, 0.05), rgba(255, 255, 255, 0.05)) + padding-box, + linear-gradient(45deg, @blue, @green) border-box; +} + +#custom-hyprscroll_overflow.overflow { + background: + linear-gradient(rgba(255, 255, 255, 0.05), rgba(255, 255, 255, 0.05)) + padding-box, + linear-gradient(45deg, @blue, @green) border-box; +} + +#custom-hyprscroll_overflow.hidden { + padding: 0; + margin: 0; + min-width: 0; + border: 0; + background: transparent; + opacity: 0; +} + +#custom-bluetooth { + display: inline-block; + width: 4ch; /* width in character units */ + text-align: center; + overflow: visible; /* width in character units */ + white-space: nowrap; +} + +#clock, +#idle_inhibitor, +#battery, +#cpu, +#memory, +#temperature, +#network, +#pulseaudio, +#tray { + margin: 0 5px; + padding: 0 2px; +} + +#idle_inhibitor.activated { + background-color: @green; +} + +#battery.charging { + color: @green; +} + +@keyframes blink { + to { + background-color: #ffffff; + color: black; + } +} + +#battery.warning:not(.charging) { + color: white; + animation-name: blink; + animation-duration: 0.5s; + animation-timing-function: linear; + animation-iteration-count: infinite; + animation-direction: alternate; +} + +#window, +#workspaces { + margin: 0 4px; +} + +.modules-left > widget:first-child > #workspaces { + margin-left: 0; +} + +.modules-right > widget:last-child > #workspaces { + margin-right: 0; +} + +#network.disconnected { + background-color: @red; +} + +#temperature.critical { + background-color: @red; +} + +/* ========================================================= + * Notifications + * ========================================================= */ +#custom-notifications { + margin: 0 4px; + padding: 0 4px; + min-width: 0; +} + +#custom-notifications.empty { + color: @overlay1; +} +#custom-notifications.unread { + color: @yellow; +} + +/* ========================================================= + * Hyprscroll overflow indicator (custom/hyprscroll_overflow) + * States: .ok, .overflow, .error + * ========================================================= */ + +/* Default (no overflow): subtle pill, still hoverable for tooltip */ +#custom-hyprscroll_overflow.ok { + padding: 0px 1px; + min-width: 80px; + color: @subtext1; + border-radius: 10px; + + /* subtle outline so you know it's there */ + border: 1px solid rgba(255, 255, 255, 0.12); + background: rgba(255, 255, 255, 0.03); +} + +/* Make it feel interactive (hover) */ +#custom-hyprscroll_overflow.ok:hover { + color: @text; + background-color: @surface1; + border: 1px solid rgba(255, 255, 255, 0.18); +} + +/* Overflow state: you already have this; keep it. + Optional: add hover tweak so it "pops" a bit. */ +#custom-hyprscroll_overflow.overflow:hover { + background: + linear-gradient(rgba(255, 255, 255, 0.1), rgba(255, 255, 255, 0.1)) + padding-box, + linear-gradient(45deg, @blue, @green) border-box; +} + +/* Error state: clear but not screaming */ +#custom-hyprscroll_overflow.error { + padding: 0px 1px; + min-width: 80px; + color: @text; + border-radius: 10px; + + border: 1px solid rgba(255, 0, 0, 0.55); + background: rgba(255, 0, 0, 0.15); + font-weight: bold; +} + +/* Optional: if you keep .hidden in the script for any reason */ +#custom-hyprscroll_overflow.hidden { + padding: 0; + margin: 0; + min-width: 0; + border: 0; + background: transparent; + opacity: 0; +} + +[id^="custom-"] { + padding: 0 4px; + overflow: visible; + text-align: center; +} #+END_SRC ** =.config/waybar/style.css= @@ -3065,34 +3305,20 @@ printf '{"text": "%s", "tooltip": "%s"}\n' "$icon" "$tooltip" These are config files for waybar #+BEGIN_SRC sh :tangle generated/.config/waybar/scripts/hyprscroll-overflow.sh :noweb yes :mkdirp yes :eval never #!/usr/bin/env bash -set -euo pipefail -fallback='{"text":" ","class":"hidden"}' + # Get active workspace ID -active_ws=$(hyprctl activeworkspace -j | jq '.id') || { echo "$fallback"; exit 0; } -# Get all clients on this workspace -ws_clients=$(hyprctl clients -j | jq "[.[] | select(.workspace.id==$active_ws)]") -total_clients=$(echo "$ws_clients" | jq 'length') -(( total_clients == 0 )) && { echo "$fallback"; exit 0; } -# Get all monitors -monitors=$(hyprctl monitors -j) -# Count windows that are fully inside any monitor -visible_count=$(jq -n --argjson clients "$ws_clients" --argjson monitors "$monitors" ' - [ $clients[] | select( - ($monitors[] | - .x <= .at[0] and (.at[0] + .size[0]) <= (.x + .width) and - .y <= .at[1] and (.at[1] + .size[1]) <= (.y + .height) - ) - ) ] | length -') -# Show fallback if all windows fit -if (( total_clients <= visible_count )); then - echo "$fallback" - exit 0 +active_ws=$(hyprctl activeworkspace -j | jq -r '.id') + +# Count clients in the active workspace +clients=$(hyprctl -j clients | jq --argjson w "$active_ws" '[.[] | select(.workspace.id==$w)] | length') + +# Output for Waybar +if [ "$clients" -eq 0 ]; then + echo "$active_ws" +else + echo "$active_ws ($clients)" fi -# Build tooltip -tooltip=$(echo "$ws_clients" | jq -r '.[].title' | sed ':a;N;$!ba;s/\n/\\n/g') -# Output JSON -echo "{\"text\":\"★ $total_clients\",\"tooltip\":\"$tooltip\",\"class\":\"overflow\"}" + #+END_SRC ** =.config/waybar/scripts/hyprscroll-menu.sh= diff --git a/Droidnix/generated/.config/waybar/config b/Droidnix/generated/.config/waybar/config index bafa12328..6ee3be15f 100644 --- a/Droidnix/generated/.config/waybar/config +++ b/Droidnix/generated/.config/waybar/config @@ -5,7 +5,6 @@ //"modules-left": ["hyprland/window"], "modules-center": [ - "hyprland/workspaces", "custom/hyprscroll_overflow" ], @@ -368,6 +367,247 @@ window#waybar { opacity: 0; } +[id^="custom-"] { + padding: 0 4px; + overflow: visible; + text-align: center; +} + +/* --- Hyprland palette (ported) --- */ +@define-color base rgba(30, 30, 46, 1.0); /* 1e1e2eff */ +@define-color inactive rgba(89, 89, 89, 0.667); /* 595959aa */ +@define-color blue rgba(51, 204, 255, 0.933); /* 33ccffee */ +@define-color green rgba(0, 255, 153, 0.933); /* 00ff99ee */ + +/* extra colors you referenced but didn’t define */ +@define-color text rgba(255, 255, 255, 1.0); +@define-color surface1 rgba(255, 255, 255, 0.08); +@define-color subtext1 rgba(255, 255, 255, 0.35); +@define-color red rgba(255, 0, 0, 0.90); +@define-color overlay1 rgba(255, 255, 255, 0.35); +@define-color yellow rgba(255, 215, 0, 0.95); + + * { + font-family: + Aporetic Sans Mono, + FiraCode Nerd Font, + Iosevka Nerd Font, + Roboto, + Helvetica, + Arial, + sans-serif; + font-size: 13px; +} + +window#waybar { + background-color: transparent; + color: @text; + transition-property: background-color; + border-bottom: 0px solid rgba(0, 0, 0, 0); + transition-duration: 0.5s; +} + +#workspaces button { + padding: 0px 1px; + min-width: 80px; + background-color: transparent; + color: @text; + border: 2px solid @inactive; + border-radius: 10px; +} + +#custom-notifications.empty { + color: @overlay1; +} + +#custom-notifications.unread { + color: @yellow; +} + +#workspaces button:hover { + background-color: @surface1; + color: @text; +} + +#workspaces button.active { + padding: 0px 1px; + min-width: 80px; + color: @text; + border-radius: 10px; + font-weight: bold; + border: 1px solid transparent; + background: + linear-gradient(rgba(255, 255, 255, 0.15), rgba(255, 255, 255, 0.15)) + padding-box, + linear-gradient(45deg, @blue, @green) border-box; +} + +#custom-hyprscroll_overflow.overflow { + padding: 0px 1px; + min-width: 80px; + color: @text; + border-radius: 10px; + font-weight: bold; + border: 1px dashed transparent; + background: + linear-gradient(rgba(255, 255, 255, 0.05), rgba(255, 255, 255, 0.05)) + padding-box, + linear-gradient(45deg, @blue, @green) border-box; +} + +#custom-hyprscroll_overflow.overflow { + background: + linear-gradient(rgba(255, 255, 255, 0.05), rgba(255, 255, 255, 0.05)) + padding-box, + linear-gradient(45deg, @blue, @green) border-box; +} + +#custom-hyprscroll_overflow.hidden { + padding: 0; + margin: 0; + min-width: 0; + border: 0; + background: transparent; + opacity: 0; +} + +#custom-bluetooth { + display: inline-block; + width: 4ch; /* width in character units */ + text-align: center; + overflow: visible; /* width in character units */ + white-space: nowrap; +} + +#clock, +#idle_inhibitor, +#battery, +#cpu, +#memory, +#temperature, +#network, +#pulseaudio, +#tray { + margin: 0 5px; + padding: 0 2px; +} + +#idle_inhibitor.activated { + background-color: @green; +} + +#battery.charging { + color: @green; +} + +@keyframes blink { + to { + background-color: #ffffff; + color: black; + } +} + +#battery.warning:not(.charging) { + color: white; + animation-name: blink; + animation-duration: 0.5s; + animation-timing-function: linear; + animation-iteration-count: infinite; + animation-direction: alternate; +} + +#window, +#workspaces { + margin: 0 4px; +} + +.modules-left > widget:first-child > #workspaces { + margin-left: 0; +} + +.modules-right > widget:last-child > #workspaces { + margin-right: 0; +} + +#network.disconnected { + background-color: @red; +} + +#temperature.critical { + background-color: @red; +} + +/* ========================================================= + * Notifications + * ========================================================= */ +#custom-notifications { + margin: 0 4px; + padding: 0 4px; + min-width: 0; +} + +#custom-notifications.empty { + color: @overlay1; +} +#custom-notifications.unread { + color: @yellow; +} + +/* ========================================================= + * Hyprscroll overflow indicator (custom/hyprscroll_overflow) + * States: .ok, .overflow, .error + * ========================================================= */ + +/* Default (no overflow): subtle pill, still hoverable for tooltip */ +#custom-hyprscroll_overflow.ok { + padding: 0px 1px; + min-width: 80px; + color: @subtext1; + border-radius: 10px; + + /* subtle outline so you know it's there */ + border: 1px solid rgba(255, 255, 255, 0.12); + background: rgba(255, 255, 255, 0.03); +} + +/* Make it feel interactive (hover) */ +#custom-hyprscroll_overflow.ok:hover { + color: @text; + background-color: @surface1; + border: 1px solid rgba(255, 255, 255, 0.18); +} + +/* Overflow state: you already have this; keep it. + Optional: add hover tweak so it "pops" a bit. */ +#custom-hyprscroll_overflow.overflow:hover { + background: + linear-gradient(rgba(255, 255, 255, 0.1), rgba(255, 255, 255, 0.1)) + padding-box, + linear-gradient(45deg, @blue, @green) border-box; +} + +/* Error state: clear but not screaming */ +#custom-hyprscroll_overflow.error { + padding: 0px 1px; + min-width: 80px; + color: @text; + border-radius: 10px; + + border: 1px solid rgba(255, 0, 0, 0.55); + background: rgba(255, 0, 0, 0.15); + font-weight: bold; +} + +/* Optional: if you keep .hidden in the script for any reason */ +#custom-hyprscroll_overflow.hidden { + padding: 0; + margin: 0; + min-width: 0; + border: 0; + background: transparent; + opacity: 0; +} + [id^="custom-"] { padding: 0 4px; diff --git a/Droidnix/generated/.config/waybar/scripts/bluetooth-status.sh b/Droidnix/generated/.config/waybar/scripts/bluetooth-status.sh old mode 100644 new mode 100755 diff --git a/Droidnix/generated/.config/waybar/scripts/hyprscroll-menu.sh b/Droidnix/generated/.config/waybar/scripts/hyprscroll-menu.sh old mode 100644 new mode 100755 diff --git a/Droidnix/generated/.config/waybar/scripts/hyprscroll-overflow.sh b/Droidnix/generated/.config/waybar/scripts/hyprscroll-overflow.sh old mode 100644 new mode 100755 index 7633ed83f..3e91f1820 --- a/Droidnix/generated/.config/waybar/scripts/hyprscroll-overflow.sh +++ b/Droidnix/generated/.config/waybar/scripts/hyprscroll-overflow.sh @@ -1,29 +1,14 @@ #!/usr/bin/env bash -set -euo pipefail -fallback='{"text":" ","class":"hidden"}' + # Get active workspace ID -active_ws=$(hyprctl activeworkspace -j | jq '.id') || { echo "$fallback"; exit 0; } -# Get all clients on this workspace -ws_clients=$(hyprctl clients -j | jq "[.[] | select(.workspace.id==$active_ws)]") -total_clients=$(echo "$ws_clients" | jq 'length') -(( total_clients == 0 )) && { echo "$fallback"; exit 0; } -# Get all monitors -monitors=$(hyprctl monitors -j) -# Count windows that are fully inside any monitor -visible_count=$(jq -n --argjson clients "$ws_clients" --argjson monitors "$monitors" ' - [ $clients[] | select( - ($monitors[] | - .x <= .at[0] and (.at[0] + .size[0]) <= (.x + .width) and - .y <= .at[1] and (.at[1] + .size[1]) <= (.y + .height) - ) - ) ] | length -') -# Show fallback if all windows fit -if (( total_clients <= visible_count )); then - echo "$fallback" - exit 0 +active_ws=$(hyprctl activeworkspace -j | jq -r '.id') + +# Count clients in the active workspace +clients=$(hyprctl -j clients | jq --argjson w "$active_ws" '[.[] | select(.workspace.id==$w)] | length') + +# Output for Waybar +if [ "$clients" -eq 0 ]; then + echo "$active_ws" +else + echo "$active_ws ($clients)" fi -# Build tooltip -tooltip=$(echo "$ws_clients" | jq -r '.[].title' | sed ':a;N;$!ba;s/\n/\\n/g') -# Output JSON -echo "{\"text\":\"★ $total_clients\",\"tooltip\":\"$tooltip\",\"class\":\"overflow\"}"