From 7b0bb3e5be53693673b55f2d0cab31c200fbd692 Mon Sep 17 00:00:00 2001 From: "info@data-pro.nu" Date: Thu, 2 Apr 2026 22:13:55 +0200 Subject: [PATCH] Regenerated --- Droidnix/README.html | 889 +++++++++++------------ Droidnix/README.org | 228 +++--- Droidnix/generated/.config/waybar/config | 112 +-- 3 files changed, 613 insertions(+), 616 deletions(-) diff --git a/Droidnix/README.html b/Droidnix/README.html index 365ae98f0..7bff724bf 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,121 +204,121 @@

Table of Contents

-
-

Shortcuts

-
+
+

Shortcuts

+

Introduction The Assets Folder @@ -334,26 +334,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: @@ -366,9 +366,9 @@ The Droidnix repository is organized into two main parts:

-
-

Root Level

-
+
+

Root Level

+
  • flake.nix is the entry point and imports:
      @@ -379,16 +379,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. @@ -418,9 +418,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.

@@ -489,9 +489,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, ... }:
 
@@ -549,9 +549,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. @@ -609,9 +609,9 @@ in
-
-

generated/hosts/traveldroid/boot.nix

-
+
+

generated/hosts/traveldroid/boot.nix

+
{ config, pkgs, lib, flakeRoot, ... }:
 
@@ -660,17 +660,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

@@ -778,9 +778,9 @@ in {
-
-

generated/assets/2_b_installed.conf

-
+
+

generated/assets/2_b_installed.conf

+

This is a list of additional apps to install

@@ -833,9 +833,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

@@ -874,9 +874,9 @@ in
-
-

generated/modules/traveldroid/apps/kitty.nix

-
+
+

generated/modules/traveldroid/apps/kitty.nix

+

This file sets up Kitty terminal

@@ -934,9 +934,9 @@ in
-
-

generated/modules/traveldroid/apps/starship.nix

-
+
+

generated/modules/traveldroid/apps/starship.nix

+

This file sets up starship prompt

@@ -975,9 +975,9 @@ in
-
-

.config/starship.toml

-
+
+

.config/starship.toml

+

These are config files for .config

@@ -1266,9 +1266,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

@@ -1309,9 +1309,9 @@ in
-
-

generated/modules/traveldroid/apps/wofi.nix

-
+
+

generated/modules/traveldroid/apps/wofi.nix

+

This is the install for Wofi, the launcher

@@ -1344,9 +1344,9 @@ in
-
-

.config/wofi/config

-
+
+

.config/wofi/config

+

These are config files for .config/wofi

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

.config/wofi/style.css

-
+
+

.config/wofi/style.css

+

These are config files for .config/wofi

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

generated/modules/traveldroid/apps/zenbrowser.nix

-
+
+

generated/modules/traveldroid/apps/zenbrowser.nix

+

This installs zen browser

@@ -1506,9 +1506,9 @@ in
-
-

generated/modules/traveldroid/apps/zsh.nix

-
+
+

generated/modules/traveldroid/apps/zsh.nix

+

This sets up the zsh in the terminal

@@ -1571,9 +1571,9 @@ in
-
-

=generated/.config/zsh/.zshrc

-
+
+

=generated/.config/zsh/.zshrc

+

This sets up the zsh in the terminal

@@ -1594,9 +1594,9 @@ fi
-
-

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

-
+
+

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

+

This installs emacs

@@ -1692,9 +1692,9 @@ in
-
-

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

-
+
+

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

+

This contaions emacs

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

generated/.config/emacs/init.el

-
+
+

generated/.config/emacs/init.el

+

This contaions emacs

@@ -2208,13 +2208,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

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

generated/modules/traveldroid/desktop/gtk.nix

-
+
+

generated/modules/traveldroid/desktop/gtk.nix

+

Setting up GTK

@@ -2260,9 +2260,9 @@ in
-
-

generated/modules/traveldroid/desktop/hyprland.nix

-
+
+

generated/modules/traveldroid/desktop/hyprland.nix

+

Setting up Hyprland

@@ -2309,9 +2309,9 @@ in
-
-

.config/hypr/animations.conf

-
+
+

.config/hypr/animations.conf

+

These are config files for .config/hypr

@@ -2332,9 +2332,9 @@ animations {
-
-

.config/hypr/behaviour.conf

-
+
+

.config/hypr/behaviour.conf

+

These are config files for .config/hypr

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

.config/hypr/bindings.conf

-
+
+

.config/hypr/bindings.conf

+

These are config files for .config/hypr

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

.config/hypr/exec-once.conf

-
+
+

.config/hypr/exec-once.conf

+

These are config files for .config/hypr

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

.config/hypr/hypridle.conf

-
+
+

.config/hypr/hypridle.conf

+

These are config files for .config/hypr

@@ -2558,9 +2558,9 @@ listener {
-
-

.config/hypr/hyprland.conf

-
+
+

.config/hypr/hyprland.conf

+

These are config files for .config/hypr

@@ -2607,9 +2607,9 @@ misc {
-
-

.config/hypr/hyprlock.conf

-
+
+

.config/hypr/hyprlock.conf

+

These are config files for .config/hypr

@@ -2650,9 +2650,9 @@ label {
-
-

.config/hypr/layer-rules.conf

-
+
+

.config/hypr/layer-rules.conf

+

These are config files for .config/hypr

@@ -2667,9 +2667,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

@@ -2679,9 +2679,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

@@ -2692,9 +2692,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

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

.config/hypr/theming.css

-
+
+

.config/hypr/theming.css

+

These are config files for .config/hypr

@@ -2788,9 +2788,9 @@ decoration {
-
-

.config/hypr/window-rules.conf

-
+
+

.config/hypr/window-rules.conf

+

These are config files for .config/hypr

@@ -2828,9 +2828,9 @@ windowrule {
-
-

.config/hypr/workspace-rules.conf

-
+
+

.config/hypr/workspace-rules.conf

+

These are config files for .config/hypr

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

generated/modules/traveldroid/desktop/wallpaper.nix

-
+
+

generated/modules/traveldroid/desktop/wallpaper.nix

+

Setting up wallpaper engine + wallpaper gui

@@ -2957,9 +2957,9 @@ in
-
-

generated/modules/traveldroid/desktop/stylix.nix

-
+
+

generated/modules/traveldroid/desktop/stylix.nix

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

.config/stylix/stylix.conf

-
+
+

.config/stylix/stylix.conf

+

These are config files for .config/stylix

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

.config/stylix/palette.json

-
+
+

.config/stylix/palette.json

+

These are config files for .config/stylix

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

.config/stylix/palette.html

-
+
+

.config/stylix/palette.html

+

These are config files for .config/stylix

@@ -3197,9 +3197,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

@@ -3265,9 +3265,9 @@ in
-
-

.config/waybar/config

-
+
+

.config/waybar/config

+

These are config files for waybar

@@ -3276,55 +3276,23 @@ These are config files for waybar "layer": "top", "height": 34, - "modules-center": [ - "hyprland/workspaces" - "custom/workspaceswindows" - ], + //"modules-left": ["hyprland/window"], + + "modules-center": ["hyprland/workspaces" ], "modules-right": [ "idle_inhibitor", "pulseaudio", "network", - "custom/bluetooth", + // "cpu", + // "memory", + // "temperature", "battery", "tray", - "clock" + "clock", + "custom/notifications", ], - "custom/workspaceswindows": { - "exec": "~/.config/waybar/scripts/workspaceswindows.sh", - "interval": 2, - "return-type": "json", - "format": "{}", - "on-click": "~/.config/waybar/scripts/workspaceswindowsmenu.sh", - "tooltip": true - }, - - "idle_inhibitor": { - "tooltip": true, - "format": "{icon}", - "format-icons": { - "activated": "  ", - "deactivated": " 󰒲 " - } - }, - - "pulseaudio": { - "format": "{volume}% {icon}", - "format-muted": "", - "format-icons": { - "default": ["", ""] - }, - "on-click": "pavucontrol" - }, - - "network": { - "format-wifi": " ({bandwidthDownBits})", - "format-ethernet": " ({bandwidthDownBits})", - "format-disconnected": "Disconnected ⚠", - "on-click": "nm-connection-editor" - }, - "custom/bluetooth": { "exec": "~/.config/waybar/scripts/bluetooth-status.sh", "interval": 5, @@ -3333,38 +3301,98 @@ These are config files for waybar "format": "{}" }, + "idle_inhibitor": { + "tooltip": true, + "format": "{icon}", + "format-icons": { + "activated": "  ", + "deactivated": " 󰒲 ", + }, + "tooltip-format-activated": "Staying awake", + "tooltip-format-deactivated": "Might sleep....", + }, + + "pulseaudio": { + "format": "{volume}% {icon}", + "format-bluetooth": "{volume}% {icon}", + "format-muted": "", + "format-icons": { + "headphones": "", + "headset": "", + "phone": "", + "portable": "", + "default": ["", ""], + }, + "on-click": "pavucontrol", + }, + + "network": { + "format-wifi": " ({bandwidthDownBits})", + "format-ethernet": " ({bandwidthDownBits})", + "format-disconnected": "Disconnected ⚠", + "tooltip-format-wifi": "{essid} ({signalStrength}%)", + "tooltip-format-ethernet": "{ifname}: {ipaddr}/{cidr}", + "on-click": "impala", + "on-click-right": "nm-connection-editor", + }, + + "cpu": { + "format": "{usage}%  ", + "tooltip": false, + }, + + "memory": { + "format": "{percentage}%  ", + }, + + "temperature": { + "format": "{temperatureC}°C ", + "tooltip": false, + }, + "tray": { "spacing": 10, - "icon-size": 14 + "icon-size": 14, }, "clock": { "format": "{:%a, %d %b %Y - %H:%M}", - "tooltip": false + "tooltip": false, + "on-click": "flatpak run eu.betterbird.Betterbird -calendar", }, "battery": { "bat": "BAT0", + "states": { + "good": 95, + "warning": 30, + "critical": 15, + }, "format": "{capacity}% {icon}", "format-charging": "{capacity}% 󰂄", - "format-icons": ["󰁺", "󰁼", "󰁾", "󰂀", "󱈏 "] - } + "format-plugged": "{capacity}%  ", + "format-icons": ["󰁺", "󰁼", "󰁾", "󰂀", "󱈏 "], + }, }
-
-

.config/waybar/style.css

-
+
+

.config/waybar/style.css

+

This file contains all css for waybar #+BEGINSRC css :tangle generated/.config/waybar/config :noweb yes :mkdirp yes :eval never -* — Hyprland palette — * -@define-color base rgba(30, 30, 46, 1.0); -@define-color inactive rgba(89, 89, 89, 0.667); -@define-color blue rgba(51, 204, 255, 0.933); -@define-color green rgba(0, 255, 153, 0.933); +* — 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); @@ -3372,18 +3400,20 @@ This file contains all css for waybar @define-color overlay1 rgba(255, 255, 255, 0.35); @define-color yellow rgba(255, 215, 0, 0.95);

- +
+
+
+
+

{

+

-* — Global font — * -

-
-
-
-
-

{

-
-

- font-family: Aporetic Sans Mono, Iosevka Nerd Font, Roboto, Helvetica, Arial, sans-serif; + font-family: + Aporetic Sans Mono, + Iosevka Nerd Font, + Roboto, + Helvetica, + Arial, + sans-serif; font-size: 13px; }

@@ -3392,18 +3422,12 @@ This file contains all css for waybar window#waybar { background-color: transparent; color: @text; - border-bottom: 0px solid rgba(0,0,0,0); - transition: background-color 0.5s; + transition-property: background-color; + border-bottom: 0px solid rgba(0, 0, 0, 0); + transition-duration: 0.5s; }

-

-/* ======================================================= -

-
    -
  • Workspaces buttons
  • -
  • ======================================================= */
  • -

#workspaces button { padding: 0px 1px; @@ -3415,82 +3439,28 @@ window#waybar { }

+

+#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(rgba(255, 255, 255, 0.15), rgba(255, 255, 255, 0.15)) + padding-box, linear-gradient(45deg, @blue, @green) border-box; }

-

-#workspaces button:hover { - background-color: @surface1; -} -

- -

-/* ======================================================= -

-
    -
  • Custom Workspaces Content
  • -
  • Always filled gradient
  • -
  • ======================================================= */
  • -
- -

-* Fill the module fully with gradient * -#custom-workspaceswindows { - padding: 0px 4px; - min-width: 80px; - border-radius: 10px; - font-weight: bold; - color: @text; - text-align: center; - background: linear-gradient(45deg, @blue, @green); -} -

- -

-* Ensure the inner span doesn’t block the gradient * -#custom-workspaceswindows span { - background: transparent !important; -} -

- - -

-/* ======================================================= -

-
    -
  • Notifications
  • -
  • ======================================================= */
  • -
-

-#custom-notifications { - margin: 0 4px; - padding: 0 4px; -} -

- -

-#custom-notifications.empty { - color: @overlay1; -} -#custom-notifications.unread { - color: @yellow; -} -

- -

-/* ======================================================= -

-
    -
  • Modules styling
  • -
  • ======================================================= */
  • -

#clock, #idleinhibitor, @@ -3520,36 +3490,24 @@ window#waybar {

@keyframes blink { - to { background-color: #ffffff; color: black; } + to { + background-color: #ffffff; + color: black; + } }

#battery.warning:not(.charging) { color: white; - animation: blink 0.5s linear infinite alternate; + animation-name: blink; + animation-duration: 0.5s; + animation-timing-function: linear; + animation-iteration-count: infinite; + animation-direction: alternate; }

-

-#network.disconnected { - background-color: @red; -} -

- -

-#temperature.critical { - background-color: @red; -} -

- -

-/* ======================================================= -

-
    -
  • Layout adjustments
  • -
  • ======================================================= */
  • -

#window, #workspaces { @@ -3567,12 +3525,27 @@ window#waybar { .modules-right > widget:last-child > #workspaces { margin-right: 0; } +

+ +

+#network.disconnected { + background-color: @red; +} +

+ +

+#temperature.critical { + background-color: @red; +} +

+ +

#+ENDSRC

-
-

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

-
+
+

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

+

These are config files for waybar

@@ -3598,9 +3571,9 @@ printf '{"text": "%s", "tooltip": "%s"}\n' "$icon" "$tooltip"
-
-

.config/waybar/scripts/workspaceswindows.sh

-
+
+

.config/waybar/scripts/workspaceswindows.sh

+

These are config files for waybar

@@ -3624,9 +3597,9 @@ fi
-
-

.config/waybar/scripts/workspaceswindowsmenu.sh

-
+
+

.config/waybar/scripts/workspaceswindowsmenu.sh

+

These are config files for waybar

@@ -3643,9 +3616,9 @@ hyprctl dispatch focuswindow address:$addr
-
-

.config/waypaper/config.ini

-
+
+

.config/waypaper/config.ini

+

These are config files for waypaper

@@ -3682,9 +3655,9 @@ keybindings = ~/.config/waypaper/keybindings.ini
-
-

generated/modules/traveldroid/desktop/wayland.nix

-
+
+

generated/modules/traveldroid/desktop/wayland.nix

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

generated/modules/traveldroid/desktop/xdg.nix

-
+
+

generated/modules/traveldroid/desktop/xdg.nix

+

This sets the XDG implementation

@@ -3770,13 +3743,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, ... }:
 
@@ -3794,9 +3767,9 @@ in
 
-
-

generated/modules/traveldroid/system/bluetooth.nix

-
+
+

generated/modules/traveldroid/system/bluetooth.nix

+
{ lib, config, pkgs, home-manager, ... }:
 
@@ -3817,9 +3790,9 @@ in
 
-
-

generated/modules/traveldroid/system/dbus.nix

-
+
+

generated/modules/traveldroid/system/dbus.nix

+

This sets the dbus implementation

@@ -3846,9 +3819,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

@@ -3902,9 +3875,9 @@ in
-
-

generated/modules/traveldroid/system/networking.nix

-
+
+

generated/modules/traveldroid/system/networking.nix

+

This sets the networking.

@@ -3967,9 +3940,9 @@ This sets the networking.
-
-

generated/modules/traveldroid/system/nix.nix

-
+
+

generated/modules/traveldroid/system/nix.nix

+
{ lib, config, ... }:
 
@@ -3985,9 +3958,9 @@ This sets the networking.
 
-
-

generated/modules/traveldroid/system/printing.nix

-
+
+

generated/modules/traveldroid/system/printing.nix

+

This sets the dbus implementation

@@ -4012,13 +3985,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

@@ -4076,9 +4049,9 @@ in

These are all the prepared config files

-
-

.config/waybar/style.css

-
+
+

.config/waybar/style.css

+

These are config files for .config/waybar

@@ -4312,9 +4285,9 @@ window#waybar {
-
-

.config/waypaper/config.ini

-
+
+

.config/waypaper/config.ini

+

These are config files for .config/waypaper

@@ -4351,9 +4324,9 @@ keybindings = ~/.config/waypaper/keybindings.ini
-
-

.config/zed/settings.json

-
+
+

.config/zed/settings.json

+

These are config files for .config/zed

@@ -4393,7 +4366,7 @@ These are config files for .config/zed

Author: Henro Veijer

-

Created: 2026-04-02 do 22:09

+

Created: 2026-04-02 do 22:13

Validate

diff --git a/Droidnix/README.org b/Droidnix/README.org index 486dce08c..ade1cfd20 100644 --- a/Droidnix/README.org +++ b/Droidnix/README.org @@ -2661,55 +2661,23 @@ These are config files for waybar "layer": "top", "height": 34, - "modules-center": [ - "hyprland/workspaces" - "custom/workspaceswindows" - ], + //"modules-left": ["hyprland/window"], + + "modules-center": ["hyprland/workspaces" ], "modules-right": [ "idle_inhibitor", "pulseaudio", "network", - "custom/bluetooth", + // "cpu", + // "memory", + // "temperature", "battery", "tray", - "clock" + "clock", + "custom/notifications", ], - "custom/workspaceswindows": { - "exec": "~/.config/waybar/scripts/workspaceswindows.sh", - "interval": 2, - "return-type": "json", - "format": "{}", - "on-click": "~/.config/waybar/scripts/workspaceswindowsmenu.sh", - "tooltip": true - }, - - "idle_inhibitor": { - "tooltip": true, - "format": "{icon}", - "format-icons": { - "activated": "  ", - "deactivated": " 󰒲 " - } - }, - - "pulseaudio": { - "format": "{volume}% {icon}", - "format-muted": "", - "format-icons": { - "default": ["", ""] - }, - "on-click": "pavucontrol" - }, - - "network": { - "format-wifi": " ({bandwidthDownBits})", - "format-ethernet": " ({bandwidthDownBits})", - "format-disconnected": "Disconnected ⚠", - "on-click": "nm-connection-editor" - }, - "custom/bluetooth": { "exec": "~/.config/waybar/scripts/bluetooth-status.sh", "interval": 5, @@ -2718,33 +2686,91 @@ These are config files for waybar "format": "{}" }, + "idle_inhibitor": { + "tooltip": true, + "format": "{icon}", + "format-icons": { + "activated": "  ", + "deactivated": " 󰒲 ", + }, + "tooltip-format-activated": "Staying awake", + "tooltip-format-deactivated": "Might sleep....", + }, + + "pulseaudio": { + "format": "{volume}% {icon}", + "format-bluetooth": "{volume}% {icon}", + "format-muted": "", + "format-icons": { + "headphones": "", + "headset": "", + "phone": "", + "portable": "", + "default": ["", ""], + }, + "on-click": "pavucontrol", + }, + + "network": { + "format-wifi": " ({bandwidthDownBits})", + "format-ethernet": " ({bandwidthDownBits})", + "format-disconnected": "Disconnected ⚠", + "tooltip-format-wifi": "{essid} ({signalStrength}%)", + "tooltip-format-ethernet": "{ifname}: {ipaddr}/{cidr}", + "on-click": "impala", + "on-click-right": "nm-connection-editor", + }, + + "cpu": { + "format": "{usage}%  ", + "tooltip": false, + }, + + "memory": { + "format": "{percentage}%  ", + }, + + "temperature": { + "format": "{temperatureC}°C ", + "tooltip": false, + }, + "tray": { "spacing": 10, - "icon-size": 14 + "icon-size": 14, }, "clock": { "format": "{:%a, %d %b %Y - %H:%M}", - "tooltip": false + "tooltip": false, + "on-click": "flatpak run eu.betterbird.Betterbird -calendar", }, "battery": { "bat": "BAT0", + "states": { + "good": 95, + "warning": 30, + "critical": 15, + }, "format": "{capacity}% {icon}", "format-charging": "{capacity}% 󰂄", - "format-icons": ["󰁺", "󰁼", "󰁾", "󰂀", "󱈏 "] - } + "format-plugged": "{capacity}%  ", + "format-icons": ["󰁺", "󰁼", "󰁾", "󰂀", "󱈏 "], + }, } #+END_SRC ** =.config/waybar/style.css= This file contains all css for waybar #+BEGIN_SRC css :tangle generated/.config/waybar/config :noweb yes :mkdirp yes :eval never -/* --- Hyprland palette --- */ -@define-color base rgba(30, 30, 46, 1.0); -@define-color inactive rgba(89, 89, 89, 0.667); -@define-color blue rgba(51, 204, 255, 0.933); -@define-color green rgba(0, 255, 153, 0.933); +/* --- 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); @@ -2752,22 +2778,25 @@ This file contains all css for waybar @define-color overlay1 rgba(255, 255, 255, 0.35); @define-color yellow rgba(255, 215, 0, 0.95); -/* --- Global font --- */ * { - font-family: Aporetic Sans Mono, Iosevka Nerd Font, Roboto, Helvetica, Arial, sans-serif; + font-family: + Aporetic Sans Mono, + Iosevka Nerd Font, + Roboto, + Helvetica, + Arial, + sans-serif; font-size: 13px; } window#waybar { background-color: transparent; color: @text; - border-bottom: 0px solid rgba(0,0,0,0); - transition: background-color 0.5s; + transition-property: background-color; + border-bottom: 0px solid rgba(0, 0, 0, 0); + transition-duration: 0.5s; } -/* ========================================================= - * Workspaces buttons - * ========================================================= */ #workspaces button { padding: 0px 1px; min-width: 80px; @@ -2777,58 +2806,24 @@ window#waybar { border-radius: 10px; } +#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(rgba(255, 255, 255, 0.15), rgba(255, 255, 255, 0.15)) + padding-box, linear-gradient(45deg, @blue, @green) border-box; } -#workspaces button:hover { - background-color: @surface1; -} - -/* ========================================================= - * Custom Workspaces Content - * Always filled gradient - * ========================================================= */ - - /* Fill the module fully with gradient */ - #custom-workspaceswindows { - padding: 0px 4px; - min-width: 80px; - border-radius: 10px; - font-weight: bold; - color: @text; - text-align: center; - background: linear-gradient(45deg, @blue, @green); - } - - /* Ensure the inner span doesn’t block the gradient */ - #custom-workspaceswindows span { - background: transparent !important; - } - - -/* ========================================================= - * Notifications - * ========================================================= */ -#custom-notifications { - margin: 0 4px; - padding: 0 4px; -} - -#custom-notifications.empty { - color: @overlay1; -} -#custom-notifications.unread { - color: @yellow; -} - -/* ========================================================= - * Modules styling - * ========================================================= */ #clock, #idle_inhibitor, #battery, @@ -2851,25 +2846,21 @@ window#waybar { } @keyframes blink { - to { background-color: #ffffff; color: black; } + to { + background-color: #ffffff; + color: black; + } } #battery.warning:not(.charging) { color: white; - animation: blink 0.5s linear infinite alternate; + animation-name: blink; + animation-duration: 0.5s; + animation-timing-function: linear; + animation-iteration-count: infinite; + animation-direction: alternate; } -#network.disconnected { - background-color: @red; -} - -#temperature.critical { - background-color: @red; -} - -/* ========================================================= - * Layout adjustments - * ========================================================= */ #window, #workspaces { margin: 0 4px; @@ -2882,6 +2873,15 @@ window#waybar { .modules-right > widget:last-child > #workspaces { margin-right: 0; } + +#network.disconnected { + background-color: @red; +} + +#temperature.critical { + background-color: @red; +} + #+END_SRC ** =.config/waybar/scripts/bluetooth-status.sh= diff --git a/Droidnix/generated/.config/waybar/config b/Droidnix/generated/.config/waybar/config index a808752be..96e7a1ab2 100644 --- a/Droidnix/generated/.config/waybar/config +++ b/Droidnix/generated/.config/waybar/config @@ -2,55 +2,23 @@ "layer": "top", "height": 34, - "modules-center": [ - "hyprland/workspaces" - "custom/workspaceswindows" - ], + //"modules-left": ["hyprland/window"], + + "modules-center": ["hyprland/workspaces" ], "modules-right": [ "idle_inhibitor", "pulseaudio", "network", - "custom/bluetooth", + // "cpu", + // "memory", + // "temperature", "battery", "tray", - "clock" + "clock", + "custom/notifications", ], - "custom/workspaceswindows": { - "exec": "~/.config/waybar/scripts/workspaceswindows.sh", - "interval": 2, - "return-type": "json", - "format": "{}", - "on-click": "~/.config/waybar/scripts/workspaceswindowsmenu.sh", - "tooltip": true - }, - - "idle_inhibitor": { - "tooltip": true, - "format": "{icon}", - "format-icons": { - "activated": "  ", - "deactivated": " 󰒲 " - } - }, - - "pulseaudio": { - "format": "{volume}% {icon}", - "format-muted": "", - "format-icons": { - "default": ["", ""] - }, - "on-click": "pavucontrol" - }, - - "network": { - "format-wifi": " ({bandwidthDownBits})", - "format-ethernet": " ({bandwidthDownBits})", - "format-disconnected": "Disconnected ⚠", - "on-click": "nm-connection-editor" - }, - "custom/bluetooth": { "exec": "~/.config/waybar/scripts/bluetooth-status.sh", "interval": 5, @@ -59,20 +27,76 @@ "format": "{}" }, + "idle_inhibitor": { + "tooltip": true, + "format": "{icon}", + "format-icons": { + "activated": "  ", + "deactivated": " 󰒲 ", + }, + "tooltip-format-activated": "Staying awake", + "tooltip-format-deactivated": "Might sleep....", + }, + + "pulseaudio": { + "format": "{volume}% {icon}", + "format-bluetooth": "{volume}% {icon}", + "format-muted": "", + "format-icons": { + "headphones": "", + "headset": "", + "phone": "", + "portable": "", + "default": ["", ""], + }, + "on-click": "pavucontrol", + }, + + "network": { + "format-wifi": " ({bandwidthDownBits})", + "format-ethernet": " ({bandwidthDownBits})", + "format-disconnected": "Disconnected ⚠", + "tooltip-format-wifi": "{essid} ({signalStrength}%)", + "tooltip-format-ethernet": "{ifname}: {ipaddr}/{cidr}", + "on-click": "impala", + "on-click-right": "nm-connection-editor", + }, + + "cpu": { + "format": "{usage}%  ", + "tooltip": false, + }, + + "memory": { + "format": "{percentage}%  ", + }, + + "temperature": { + "format": "{temperatureC}°C ", + "tooltip": false, + }, + "tray": { "spacing": 10, - "icon-size": 14 + "icon-size": 14, }, "clock": { "format": "{:%a, %d %b %Y - %H:%M}", - "tooltip": false + "tooltip": false, + "on-click": "flatpak run eu.betterbird.Betterbird -calendar", }, "battery": { "bat": "BAT0", + "states": { + "good": 95, + "warning": 30, + "critical": 15, + }, "format": "{capacity}% {icon}", "format-charging": "{capacity}% 󰂄", - "format-icons": ["󰁺", "󰁼", "󰁾", "󰂀", "󱈏 "] - } + "format-plugged": "{capacity}%  ", + "format-icons": ["󰁺", "󰁼", "󰁾", "󰂀", "󱈏 "], + }, }