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">
- +generated/modules/traveldroid/apps/2_b_installed.nixgenerated/assets/2_b_installed.confgenerated/modules/traveldroid/apps/flameshot.nixgenerated/modules/traveldroid/apps/kitty.nixgenerated/modules/traveldroid/apps/starship.nix.config/starship.tomlgenerated/modules/traveldroid/apps/thunar.nixgenerated/modules/traveldroid/apps/wofi.nix.config/wofi/config.config/wofi/style.cssgenerated/modules/traveldroid/apps/zenbrowser.nixgenerated/modules/traveldroid/apps/zsh.nixgenerated/modules/traveldroid/apps/emacs/emacs.nixgenerated/.config/emacs/early-init.elgenerated/.config/emacs/init.elgenerated/modules/traveldroid/apps/2_b_installed.nixgenerated/assets/2_b_installed.confgenerated/modules/traveldroid/apps/flameshot.nixgenerated/modules/traveldroid/apps/kitty.nixgenerated/modules/traveldroid/apps/starship.nix.config/starship.tomlgenerated/modules/traveldroid/apps/thunar.nixgenerated/modules/traveldroid/apps/wofi.nix.config/wofi/config.config/wofi/style.cssgenerated/modules/traveldroid/apps/zenbrowser.nixgenerated/modules/traveldroid/apps/zsh.nixgenerated/modules/traveldroid/apps/emacs/emacs.nixgenerated/.config/emacs/early-init.elgenerated/.config/emacs/init.elgenerated/modules/traveldroid/desktop/fonts.nixgenerated/modules/traveldroid/desktop/gtk.nixgenerated/modules/traveldroid/desktop/hyprland.nix.config/hypr/animations.conf.config/hypr/behaviour.conf.config/hypr/bindings.conf.config/hypr/exec-once.conf.config/hypr/hypridle.conf.config/hypr/hyprland.conf.config/hypr/hyprlock.conf.config/hypr/layer-rules.conf.config/hypr/layout.conf.config/hypr/monitor-rules.conf.config/hypr/scripts/layout-selector.sh.config/hypr/theming.css.config/hypr/window-rules.conf.config/hypr/workspace-rules.confgenerated/modules/traveldroid/desktop/wallpaper.nixgenerated/modules/traveldroid/desktop/stylix.nix.config/stylix/stylix.conf.config/stylix/palette.json.config/stylix/palette.htmlgenerated/modules/traveldroid/desktop/waybar.nix.config/waybar/config.config/waybar/style.cssgenerated/modules/traveldroid/desktop/fonts.nixgenerated/modules/traveldroid/desktop/gtk.nixgenerated/modules/traveldroid/desktop/hyprland.nix.config/hypr/animations.conf.config/hypr/behaviour.conf.config/hypr/bindings.conf.config/hypr/exec-once.conf.config/hypr/hypridle.conf.config/hypr/hyprland.conf.config/hypr/hyprlock.conf.config/hypr/layer-rules.conf.config/hypr/layout.conf.config/hypr/monitor-rules.conf.config/hypr/scripts/layout-selector.sh.config/hypr/theming.css.config/hypr/window-rules.conf.config/hypr/workspace-rules.confgenerated/modules/traveldroid/desktop/wallpaper.nixgenerated/modules/traveldroid/desktop/stylix.nix.config/stylix/stylix.conf.config/stylix/palette.json.config/stylix/palette.htmlgenerated/modules/traveldroid/desktop/waybar.nix.config/waybar/config.config/waybar/style.css.config/waybar/scripts/bluetooth-status.sh.config/waybar/scripts/workspaceswindows.sh.config/waybar/scripts/workspaceswindowsmenu.sh.config/waypaper/config.inigenerated/modules/traveldroid/desktop/wayland.nixgenerated/modules/traveldroid/desktop/xdg.nix.config/waybar/scripts/bluetooth-status.sh.config/waybar/scripts/workspaceswindows.sh.config/waybar/scripts/workspaceswindowsmenu.sh.config/waypaper/config.inigenerated/modules/traveldroid/desktop/wayland.nixgenerated/modules/traveldroid/desktop/xdg.nixgenerated/modules/traveldroid/system/audio.nixgenerated/modules/traveldroid/system/bluetooth.nixgenerated/modules/traveldroid/system/dbus.nixgenerated/modules/traveldroid/system/login-tuigreet.nixgenerated/modules/traveldroid/system/networking.nixgenerated/modules/traveldroid/system/nix.nixgenerated/modules/traveldroid/system/printing.nixgenerated/modules/traveldroid/system/audio.nixgenerated/modules/traveldroid/system/bluetooth.nixgenerated/modules/traveldroid/system/dbus.nixgenerated/modules/traveldroid/system/login-tuigreet.nixgenerated/modules/traveldroid/system/networking.nixgenerated/modules/traveldroid/system/nix.nixgenerated/modules/traveldroid/system/printing.nixIntroduction The Assets Folder @@ -334,26 +334,26 @@
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.
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:
flake.nix is the entry point and imports:
The generated/ directory contains all generated configurations, divided into three main groups: system, hyprland, and mangowc.
./setup_droid..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.nixflake.nixThe Nix flake definition for Droidnix.
@@ -489,9 +489,9 @@ The Nix flake definition for Droidnix.generated/hosts/traveldroid/host.nixgenerated/hosts/traveldroid/host.nix{ lib, config, pkgs, flakeRoot, import-tree, home-manager, ... }:
@@ -549,9 +549,9 @@ in
generated/hosts/traveldroid/hardware-configuration.nixgenerated/hosts/traveldroid/hardware-configuration.nixgenerated/hosts/traveldroid/boot.nixgenerated/hosts/traveldroid/boot.nix{ config, pkgs, lib, flakeRoot, ... }:
@@ -660,17 +660,17 @@ in
generated/modules/traveldroid/apps/2_b_installed.nixgenerated/modules/traveldroid/apps/2_b_installed.nixThis installs a list of apps
@@ -778,9 +778,9 @@ in {generated/assets/2_b_installed.confgenerated/assets/2_b_installed.confThis is a list of additional apps to install
@@ -833,9 +833,9 @@ com.todoist.Todoistgenerated/modules/traveldroid/apps/flameshot.nixgenerated/modules/traveldroid/apps/flameshot.nixThis 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 @@ ingenerated/modules/traveldroid/apps/kitty.nixgenerated/modules/traveldroid/apps/kitty.nixThis file sets up Kitty terminal
@@ -934,9 +934,9 @@ ingenerated/modules/traveldroid/apps/starship.nixgenerated/modules/traveldroid/apps/starship.nixThis file sets up starship prompt
@@ -975,9 +975,9 @@ in.config/starship.toml.config/starship.tomlThese are config files for .config
@@ -1266,9 +1266,9 @@ crust = "#181926"generated/modules/traveldroid/apps/thunar.nixgenerated/modules/traveldroid/apps/thunar.nixThis 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 @@ ingenerated/modules/traveldroid/apps/wofi.nixgenerated/modules/traveldroid/apps/wofi.nixThis is the install for Wofi, the launcher
@@ -1344,9 +1344,9 @@ in.config/wofi/config.config/wofi/configThese are config files for .config/wofi
@@ -1393,9 +1393,9 @@ prompt = >.config/wofi/style.css.config/wofi/style.cssThese are config files for .config/wofi
@@ -1484,9 +1484,9 @@ These are config files for .config/wofigenerated/modules/traveldroid/apps/zenbrowser.nixgenerated/modules/traveldroid/apps/zenbrowser.nixThis installs zen browser
@@ -1506,9 +1506,9 @@ ingenerated/modules/traveldroid/apps/zsh.nixgenerated/modules/traveldroid/apps/zsh.nixThis sets up the zsh in the terminal
@@ -1571,9 +1571,9 @@ inThis sets up the zsh in the terminal
@@ -1594,9 +1594,9 @@ figenerated/modules/traveldroid/apps/emacs/emacs.nixgenerated/modules/traveldroid/apps/emacs/emacs.nixThis installs emacs
@@ -1692,9 +1692,9 @@ ingenerated/.config/emacs/early-init.elgenerated/.config/emacs/early-init.elThis contaions emacs
@@ -1795,9 +1795,9 @@ package-archive-priorities '(("gnu" . 99)generated/.config/emacs/init.elgenerated/.config/emacs/init.elThis contaions emacs
@@ -2208,13 +2208,13 @@ the top of the file."generated/modules/traveldroid/desktop/fonts.nixgenerated/modules/traveldroid/desktop/fonts.nixThis file installs and configures fonts
@@ -2232,9 +2232,9 @@ This file installs and configures fontsgenerated/modules/traveldroid/desktop/gtk.nixgenerated/modules/traveldroid/desktop/gtk.nixSetting up GTK
@@ -2260,9 +2260,9 @@ ingenerated/modules/traveldroid/desktop/hyprland.nixgenerated/modules/traveldroid/desktop/hyprland.nixSetting up Hyprland
@@ -2309,9 +2309,9 @@ in.config/hypr/animations.conf.config/hypr/animations.confThese are config files for .config/hypr
@@ -2332,9 +2332,9 @@ animations {.config/hypr/behaviour.conf.config/hypr/behaviour.confThese are config files for .config/hypr
@@ -2348,9 +2348,9 @@ These are config files for .config/hypr.config/hypr/bindings.conf.config/hypr/bindings.confThese are config files for .config/hypr
@@ -2513,9 +2513,9 @@ bind = $mainMod, W, exec, zen.config/hypr/exec-once.conf.config/hypr/exec-once.confThese are config files for .config/hypr
@@ -2531,9 +2531,9 @@ exec-once = sh ~/Wallpapers/scripts/wallpaper.sh &.config/hypr/hypridle.conf.config/hypr/hypridle.confThese are config files for .config/hypr
@@ -2558,9 +2558,9 @@ listener {.config/hypr/hyprland.conf.config/hypr/hyprland.confThese are config files for .config/hypr
@@ -2607,9 +2607,9 @@ misc {.config/hypr/hyprlock.conf.config/hypr/hyprlock.confThese are config files for .config/hypr
@@ -2650,9 +2650,9 @@ label {.config/hypr/layer-rules.conf.config/hypr/layer-rules.confThese 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.confThese 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.confThese 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.shThese 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.cssThese are config files for .config/hypr
@@ -2788,9 +2788,9 @@ decoration {.config/hypr/window-rules.conf.config/hypr/window-rules.confThese are config files for .config/hypr
@@ -2828,9 +2828,9 @@ windowrule {.config/hypr/workspace-rules.conf.config/hypr/workspace-rules.confThese are config files for .config/hypr
@@ -2856,9 +2856,9 @@ workspace = 10generated/modules/traveldroid/desktop/wallpaper.nixgenerated/modules/traveldroid/desktop/wallpaper.nixSetting up wallpaper engine + wallpaper gui
@@ -2957,9 +2957,9 @@ ingenerated/modules/traveldroid/desktop/stylix.nixgenerated/modules/traveldroid/desktop/stylix.nix{ lib, config, pkgs, flakeRoot, stylix, ... }:
@@ -3046,9 +3046,9 @@ in
.config/stylix/stylix.conf.config/stylix/stylix.confThese are config files for .config/stylix
@@ -3085,9 +3085,9 @@ icons = {.config/stylix/palette.json.config/stylix/palette.jsonThese are config files for .config/stylix
@@ -3117,9 +3117,9 @@ These are config files for .config/stylix.config/stylix/palette.html.config/stylix/palette.htmlThese are config files for .config/stylix
@@ -3197,9 +3197,9 @@ These are config files for .config/stylixgenerated/modules/traveldroid/desktop/waybar.nixgenerated/modules/traveldroid/desktop/waybar.nixThis file installs and configures waybar
@@ -3265,9 +3265,9 @@ in.config/waybar/config.config/waybar/configThese 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.cssThis 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 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; -} -
- -
-/* =======================================================
-
======================================================= */-* 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; -} -
- - -
-/* =======================================================
-
======================================================= */-#custom-notifications { - margin: 0 4px; - padding: 0 4px; -} -
- --#custom-notifications.empty { - color: @overlay1; -} -#custom-notifications.unread { - color: @yellow; -} -
- -
-/* =======================================================
-
======================================================= */#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; -} -
- -
-/* =======================================================
-
======================================================= */#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.shThese 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.shThese are config files for waybar
@@ -3624,9 +3597,9 @@ fi.config/waybar/scripts/workspaceswindowsmenu.sh.config/waybar/scripts/workspaceswindowsmenu.shThese are config files for waybar
@@ -3643,9 +3616,9 @@ hyprctl dispatch focuswindow address:$addr.config/waypaper/config.ini.config/waypaper/config.iniThese are config files for waypaper
@@ -3682,9 +3655,9 @@ keybindings = ~/.config/waypaper/keybindings.inigenerated/modules/traveldroid/desktop/wayland.nixgenerated/modules/traveldroid/desktop/wayland.nix{ lib, config, pkgs, ... }:
@@ -3714,9 +3687,9 @@ keybindings = ~/.config/waypaper/keybindings.ini
generated/modules/traveldroid/desktop/xdg.nixgenerated/modules/traveldroid/desktop/xdg.nixThis sets the XDG implementation
@@ -3770,13 +3743,13 @@ ingenerated/modules/traveldroid/system/audio.nixgenerated/modules/traveldroid/system/audio.nix{ lib, config, pkgs, ... }:
@@ -3794,9 +3767,9 @@ in
generated/modules/traveldroid/system/bluetooth.nixgenerated/modules/traveldroid/system/bluetooth.nix{ lib, config, pkgs, home-manager, ... }:
@@ -3817,9 +3790,9 @@ in
generated/modules/traveldroid/system/dbus.nixgenerated/modules/traveldroid/system/dbus.nixThis sets the dbus implementation
@@ -3846,9 +3819,9 @@ This sets the dbus implementationgenerated/modules/traveldroid/system/login-tuigreet.nixgenerated/modules/traveldroid/system/login-tuigreet.nixThis sets up tuigreeter which is not fancy but imo fits the aesthetic I am aiming for
@@ -3902,9 +3875,9 @@ ingenerated/modules/traveldroid/system/networking.nixgenerated/modules/traveldroid/system/networking.nixThis sets the networking.
@@ -3967,9 +3940,9 @@ This sets the networking.generated/modules/traveldroid/system/nix.nixgenerated/modules/traveldroid/system/nix.nix{ lib, config, ... }:
@@ -3985,9 +3958,9 @@ This sets the networking.
generated/modules/traveldroid/system/printing.nixgenerated/modules/traveldroid/system/printing.nixThis sets the dbus implementation
@@ -4012,13 +3985,13 @@ This sets the dbus implementationgenerated/users/henrov.nixgenerated/users/henrov.nixThis is the default user, just search and replace henrov another name if you want to change
@@ -4076,9 +4049,9 @@ in.config/waybar/style.css.config/waybar/style.cssThese are config files for .config/waybar
@@ -4312,9 +4285,9 @@ window#waybar {.config/waypaper/config.ini.config/waypaper/config.iniThese are config files for .config/waypaper
@@ -4351,9 +4324,9 @@ keybindings = ~/.config/waypaper/keybindings.ini.config/zed/settings.json.config/zed/settings.jsonThese are config files for .config/zed
@@ -4393,7 +4366,7 @@ These are config files for .config/zed