From 7f433f49465cd768007236fb695769ba66af3100 Mon Sep 17 00:00:00 2001 From: "info@data-pro.nu" Date: Mon, 16 Mar 2026 11:44:25 +0000 Subject: [PATCH] Still GTK looks --- Droidnix/README.html | 734 +++++++++--------- Droidnix/README.org | 5 +- .../out_of_tree/machines/traveldroid/gtk.nix | 4 +- .../machines/traveldroid/theme.nix | 24 - Droidnix/generated/system/core/gtk.nix | 18 - 5 files changed, 373 insertions(+), 412 deletions(-) delete mode 100644 Droidnix/generated/out_of_tree/machines/traveldroid/theme.nix delete mode 100644 Droidnix/generated/system/core/gtk.nix diff --git a/Droidnix/README.html b/Droidnix/README.html index 3ddae0a98..de75832dd 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,128 +204,128 @@

Table of Contents

-
-

Shortcuts

-
+
+

Shortcuts

+

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

-
-

Root Level

-
+
+

Root Level

+
  • flake.nix is the entry point and imports:
      @@ -386,23 +386,23 @@ 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.

-
-

System (generated/system/)

-
+
+

System (generated/system/)

+

This directory contains system-wide configurations that are independent of the window manager.

-
-

Applications (applications/)

-
+
+

Applications (applications/)

+
  • file_management/: Configurations for file managers and storage solutions.
  • gaming/: Settings for gaming-related software.
    • @@ -412,9 +412,9 @@ This directory contains system-wide configurations that are independent of the w
-
-

Development (development/)

-
+
+

Development (development/)

+
  • databases/: Settings for local databases.
  • devops_ci_cd/: Configurations for DevOps tools.
    • @@ -424,9 +424,9 @@ This directory contains system-wide configurations that are independent of the w
-
-

System Management (system_management/)

-
+
+

System Management (system_management/)

+
  • backups/: Settings for backup software.
  • bluetooth/: Configurations for Bluetooth devices and services.
    • @@ -445,9 +445,9 @@ This directory contains system-wide configurations that are independent of the w
-
-

Hyprland (generated/hyprland/)

-
+
+

Hyprland (generated/hyprland/)

+

This directory contains configurations specific to Hyprland.

@@ -463,14 +463,14 @@ This directory contains configurations specific to Hyprland.
  • window_rules/: Rules for window behavior.
    • -
    +
     <<TREE>>
    -
    -

    First Setup

    -
    +
    +

    First Setup

    +
    1. Clone this repository.
    2. Run the setup script: ./setup_droidnix.sh.
      3. @@ -492,9 +492,9 @@ This directory contains configurations specific to Hyprland. The .assets/ folder contains all static files, such as configs, scripts, and themes. These files are not generated and can be edited directly.

    -
    -

    .assets/system/

    -
    +
    +

    .assets/system/

    +

    This folder contains files shared across both window managers, such as wallpapers, shell configs, and system scripts.

    @@ -505,9 +505,9 @@ This folder contains files shared across both window managers, such as wallpaper
    -
    -

    .assets/hyprland/

    -
    +
    +

    .assets/hyprland/

    +

    Hyprland-specific assets, including configs, themes, and scripts.

    @@ -519,9 +519,9 @@ Hyprland-specific assets, including configs, themes, and scripts.
    -
    -

    .assets/mangowc/

    -
    +
    +

    .assets/mangowc/

    +

    Mangowc-specific assets, including configs, themes, and scripts.

    @@ -533,9 +533,9 @@ Mangowc-specific assets, including configs, themes, and scripts.
    -
    -

    .assets/machines/

    -
    +
    +

    .assets/machines/

    +

    Machine-specific NixOS configurations (e.g., configuration.nix for maindroid and traveldroid).

    @@ -553,9 +553,9 @@ Machine-specific NixOS configurations (e.g., configuration.nix for This section contains the Org blocks for tangling Nix code into the generated folders.

    -
    -

    flake.nix

    -
    +
    +

    flake.nix

    +

    The Nix flake definition for Droidnix.

    @@ -648,13 +648,13 @@ outputs =
    -
    -

    First the nix-files that flake really needs and that do not fit wel in the hierarchical structure

    -
    +
    +

    First the nix-files that flake really needs and that do not fit wel in the hierarchical structure

    +
    -
    -

    generated/out_of_tree/users/top.nix

    -
    +
    +

    generated/out_of_tree/users/top.nix

    +

    The ./generated/top.nix file acts as an anchor or entry point for the entire chain of imports in the pyramid structure.

    @@ -669,9 +669,9 @@ The ./generated/top.nix file acts as an anchor or entry point for the entire cha
    -
    -

    generated/out_of_tree/users/user.nix

    -
    +
    +

    generated/out_of_tree/users/user.nix

    +

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

    @@ -706,9 +706,9 @@ in
    -
    -

    generated/out_of_tree/users/henrov.nix

    -
    +
    +

    generated/out_of_tree/users/henrov.nix

    +

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

    @@ -724,9 +724,9 @@ This is the default user, just search and replace henrov another name if you wan
    -
    -

    generated/out_of_tree/terminal_shell/top.nix

    -
    +
    +

    generated/out_of_tree/terminal_shell/top.nix

    +

    This code defines a Nix shell environment (also called a "devShell") that you can enter using the nix develop command. When you enter this shell, Nix will provide the tools and dependencies listed in buildInputs.

    @@ -751,9 +751,9 @@ This code defines a Nix shell environment (also called a "devShell") that you ca
    -
    -

    generated/out_of_tree/terminal_shell/devshell.nix

    -
    +
    +

    generated/out_of_tree/terminal_shell/devshell.nix

    +

    This code defines a Nix shell environment (also called a "devShell") that you can enter using the nix develop command. When you enter this shell, Nix will provide the tools and dependencies listed in buildInputs.

    @@ -769,9 +769,9 @@ mkShell {
    -
    -

    generated/out_of_tree/machines/traveldroid/top.nix

    -
    +
    +

    generated/out_of_tree/machines/traveldroid/top.nix

    +

    This is the top of the machine hierarchy

    @@ -810,9 +810,9 @@ This is the top of the machine hierarchy
    -
    -

    generated/out_of_tree/machines/traveldroid/hardware-configuration.nix

    -
    +
    +

    generated/out_of_tree/machines/traveldroid/hardware-configuration.nix

    +
    1. Boot into NixOS Live ISO or your installed system.
    2. Open a terminal.
      3. @@ -870,9 +870,9 @@ This is the top of the machine hierarchy
    -
    -

    generated/out_of_tree/machines/traveldroid/boot.nix

    -
    +
    +

    generated/out_of_tree/machines/traveldroid/boot.nix

    +

    This file has most of the settings the control how the computer boots up.

    @@ -906,9 +906,9 @@ This file has most of the settings the control how the computer boots up.
    -
    -

    generated/out_of_tree/machines/traveldroid/machine.nix

    -
    +
    +

    generated/out_of_tree/machines/traveldroid/machine.nix

    +

    This is the top if the machine hierarchy

    @@ -955,9 +955,9 @@ This is the top if the machine hierarchy
    -
    -

    generated/out_of_tree/machines/traveldroid/dbus.nix

    -
    +
    +

    generated/out_of_tree/machines/traveldroid/dbus.nix

    +

    This sets the dbus implementation

    @@ -979,9 +979,9 @@ This sets the dbus implementation
    -
    -

    generated/out_of_tree/machines/traveldroid/networking.nix

    -
    +
    +

    generated/out_of_tree/machines/traveldroid/networking.nix

    +

    This sets the networking.

    @@ -1028,9 +1028,9 @@ This sets the networking.
    -
    -

    generated/out_of_tree/machines/traveldroid/session.nix

    -
    +
    +

    generated/out_of_tree/machines/traveldroid/session.nix

    +

    This sets the session variables

    @@ -1059,9 +1059,9 @@ This sets the session variables
    -
    -

    generated/out_of_tree/machines/traveldroid/bluetooth.nix

    -
    +
    +

    generated/out_of_tree/machines/traveldroid/bluetooth.nix

    +

    This sets the bluetooth implementation

    @@ -1098,9 +1098,9 @@ This sets the bluetooth implementation
    -
    -

    generated/out_of_tree/machines/traveldroid/audio.nix

    -
    +
    +

    generated/out_of_tree/machines/traveldroid/audio.nix

    +

    This sets audiosystem for this machine

    @@ -1121,9 +1121,9 @@ This sets audiosystem for this machine
    -
    -

    generated/out_of_tree/machines/traveldroid/xdg.nix

    -
    +
    +

    generated/out_of_tree/machines/traveldroid/xdg.nix

    +

    This sets the XDG implementation

    @@ -1141,13 +1141,13 @@ This sets the XDG implementation
    -
    -

    Now we reach the top of the hierarchy which will call all other imports

    -
    +
    +

    Now we reach the top of the hierarchy which will call all other imports

    +
    -
    -

    generated/top.nix

    -
    +
    +

    generated/top.nix

    +

    The ./generated/top.nix file acts as an anchor or entry point for the entire chain of imports in the pyramid structure.

    @@ -1184,9 +1184,9 @@ This is top file of this level which contains just an import statement for all r
    -
    -

    generated/hyprland/hyprland.nix

    -
    +
    +

    generated/hyprland/hyprland.nix

    +

    The ./generated/top.nix file acts as an anchor or entry point for the entire chain of imports in the pyramid structure.

    @@ -1239,9 +1239,9 @@ in
    -
    -

    generated/hyprland/animations_effects/top.nix

    -
    +
    +

    generated/hyprland/animations_effects/top.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

    @@ -1257,9 +1257,9 @@ This is top file of this level which contains just an import statement for all r
    -
    -

    generated/hyprland/decorations/top.nix

    -
    +
    +

    generated/hyprland/decorations/top.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

    @@ -1275,9 +1275,9 @@ This is top file of this level which contains just an import statement for all r
    -
    -

    generated/hyprland/notifications/top.nix

    -
    +
    +

    generated/hyprland/notifications/top.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

    @@ -1293,9 +1293,9 @@ This is top file of this level which contains just an import statement for all r
    -
    -

    generated/hyprland/statusbar_tray/top.nix

    -
    +
    +

    generated/hyprland/statusbar_tray/top.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

    @@ -1311,9 +1311,9 @@ This is top file of this level which contains just an import statement for all r
    -
    -

    generated/hyprland/task_window_workspace_switcher/top.nix

    -
    +
    +

    generated/hyprland/task_window_workspace_switcher/top.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

    @@ -1329,9 +1329,9 @@ This is top file of this level which contains just an import statement for all r
    -
    -

    generated/hyprland/window_rules/top.nix

    -
    +
    +

    generated/hyprland/window_rules/top.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

    @@ -1347,9 +1347,9 @@ This is top file of this level which contains just an import statement for all r
    -
    -

    generated/system/top.nix

    -
    +
    +

    generated/system/top.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

    @@ -1368,9 +1368,9 @@ This is top file of this level which contains just an import statement for all r
    -
    -

    generated/system/applications/top.nix

    -
    +
    +

    generated/system/applications/top.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

    @@ -1393,9 +1393,9 @@ This is top file of this level which contains just an import statement for all r
    -
    -

    generated/system/applications/packages.nix

    -
    +
    +

    generated/system/applications/packages.nix

    +

    This will import all packages listed in ./assets/system/apps/packlages.conf

    @@ -1448,9 +1448,9 @@ in
    -
    -

    generated/system/applications/flatpaks.nix

    -
    +
    +

    generated/system/applications/flatpaks.nix

    +

    This will import all packages listed in ./assets/system/apps/flatpaks.conf

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

    generated/system/core/top.nix

    -
    +
    +

    generated/system/core/top.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

    @@ -1593,9 +1593,9 @@ This is top file of this level which contains just an import statement for all r
    -
    -

    generated/system/core/fonts.nix

    -
    +
    +

    generated/system/core/fonts.nix

    +

    This file installs and configures fonts

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

    generated/system/core/eww.nix

    -
    +
    +

    generated/system/core/eww.nix

    +

    This file installs and configures eww

    @@ -1651,9 +1651,9 @@ in
    -
    -

    generated/system/core/waybar.nix

    -
    +
    +

    generated/system/core/waybar.nix

    +

    This file installs and configures waybar

    @@ -1693,9 +1693,9 @@ in
    -
    -

    generated/system/core/login-tuigreeter.nix

    -
    +
    +

    generated/system/core/login-tuigreeter.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

    @@ -1718,9 +1718,9 @@ settings = {
    -
    -

    generated/system/core/wayland.nix

    -
    +
    +

    generated/system/core/wayland.nix

    +

    This file sets up wayland

    @@ -1745,13 +1745,14 @@ This file sets up wayland
    -
    -

    generated/out_of_tree/machines/traveldroid/gtk.nix

    -
    +
    +

    generated/out_of_tree/machines/traveldroid/gtk.nix

    +

    This file configures gtk -#+BEGINSRC nix :tangle generated/outoftree/machines/traveldroid/gtk.nix :noweb tangle :mkdirp yes :eval never-html -{ pkgs, … }: +

    +
    +
    { pkgs, ... }:
 {
   gtk = {
     enable = true;
@@ -1771,13 +1772,14 @@ This file configures gtk
     };
     iconTheme.name = "Papirus-Dark";
   };
-}#+ENDSRC
-
    
+}
+
    -
    -

    generated/outoftree/machines/traveldroid/catppuccin.nix

    -
    +
    +
    +

    generated/out_of_tree/machines/traveldroid/catppuccin.nix

    +

    I use the Catppuccin almost everywhere. The nix module integrates almost automatically everywhere (except gtk). You'll notice the color values in multiple places outside this as well. @@ -1800,9 +1802,9 @@ You'll notice the color values in multiple places outside this as well.

    -
    -

    generated/system/development/top.nix

    -
    +
    +

    generated/system/development/top.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

    @@ -1822,9 +1824,9 @@ This is top file of this level which contains just an import statement for all r
    -
    -

    generated/system/system_management/top.nix

    -
    +
    +

    generated/system/system_management/top.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

    @@ -1852,9 +1854,9 @@ This is top file of this level which contains just an import statement for all r
    -
    -

    generated/system/applications/accessibility/top.nix

    -
    +
    +

    generated/system/applications/accessibility/top.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

    @@ -1870,9 +1872,9 @@ This is top file of this level which contains just an import statement for all r
    -
    -

    generated/system/applications/file_management/top.nix

    -
    +
    +

    generated/system/applications/file_management/top.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

    @@ -1887,9 +1889,9 @@ This is top file of this level which contains just an import statement for all r
    -
    -

    generated/system/applications/file_management/thunar.nix

    -
    +
    +

    generated/system/applications/file_management/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

    @@ -1950,9 +1952,9 @@ in
    -
    -

    generated/system/applications/gaming/top.nix

    -
    +
    +

    generated/system/applications/gaming/top.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

    @@ -1968,9 +1970,9 @@ This is top file of this level which contains just an import statement for all r
    -
    -

    generated/system/applications/media_playback_editing/top.nix

    -
    +
    +

    generated/system/applications/media_playback_editing/top.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

    @@ -1986,9 +1988,9 @@ This is top file of this level which contains just an import statement for all r
    -
    -

    generated/system/applications/office_productivity/top.nix

    -
    +
    +

    generated/system/applications/office_productivity/top.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

    @@ -2004,9 +2006,9 @@ This is top file of this level which contains just an import statement for all r
    -
    -

    generated/system/applications/terminal_shell/top.nix

    -
    +
    +

    generated/system/applications/terminal_shell/top.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

    @@ -2025,9 +2027,9 @@ This is top file of this level which contains just an import statement for all r
    -
    -

    generated/system/applications/terminal_shell/kitty.nix

    -
    +
    +

    generated/system/applications/terminal_shell/kitty.nix

    +

    This file sets up Kitty terminal

    @@ -2055,9 +2057,9 @@ in
    -
    -

    generated/system/applications/terminal_shell/starship.nix

    -
    +
    +

    generated/system/applications/terminal_shell/starship.nix

    +

    This file sets up starship prompt

    @@ -2082,9 +2084,9 @@ in
    -
    -

    generated/system/applications/terminal_shell/zsh.nix

    -
    +
    +

    generated/system/applications/terminal_shell/zsh.nix

    +

    This sets up the zsh terminal

    @@ -2188,9 +2190,9 @@ This sets up the zsh terminal
    -
    -

    generated/system/applications/terminal_shell/emacs.nix

    -
    +
    +

    generated/system/applications/terminal_shell/emacs.nix

    +

    This sets up the emacs terminal

    @@ -2293,9 +2295,9 @@ This sets up the emacs terminal
    -
    -

    generated/system/applications/terminal_shell/early-init.el

    -
    +
    +

    generated/system/applications/terminal_shell/early-init.el

    +

    This helps set up the emacs terminal

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

    generated/system/applications/terminal_shell/init.el

    -
    +
    +

    generated/system/applications/terminal_shell/init.el

    +

    This helps set up the emacs terminal

    @@ -2808,9 +2810,9 @@ the top of the file."
    -
    -

    generated/system/development/databases/top.nix

    -
    +
    +

    generated/system/development/databases/top.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

    @@ -2826,9 +2828,9 @@ This is top file of this level which contains just an import statement for all r
    -
    -

    generated/system/development/devops_ci_cd/top.nix

    -
    +
    +

    generated/system/development/devops_ci_cd/top.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

    @@ -2844,9 +2846,9 @@ This is top file of this level which contains just an import statement for all r
    -
    -

    generated/system/development/programming_languages/top.nix

    -
    +
    +

    generated/system/development/programming_languages/top.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

    @@ -2862,9 +2864,9 @@ This is top file of this level which contains just an import statement for all r
    -
    -

    generated/system/development/virtualization/top.nix

    -
    +
    +

    generated/system/development/virtualization/top.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

    @@ -2880,9 +2882,9 @@ This is top file of this level which contains just an import statement for all r
    -
    -

    generated/system/development/web_development/top.nix

    -
    +
    +

    generated/system/development/web_development/top.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

    @@ -2898,9 +2900,9 @@ This is top file of this level which contains just an import statement for all r
    -
    -

    generated/system/system_management/audio/top.nix

    -
    +
    +

    generated/system/system_management/audio/top.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

    @@ -2916,9 +2918,9 @@ This is top file of this level which contains just an import statement for all r
    -
    -

    generated/system/system_management/backups/top.nix

    -
    +
    +

    generated/system/system_management/backups/top.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

    @@ -2934,9 +2936,9 @@ This is top file of this level which contains just an import statement for all r
    -
    -

    generated/system/system_management/bluetooth/top.nix

    -
    +
    +

    generated/system/system_management/bluetooth/top.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

    @@ -2952,9 +2954,9 @@ This is top file of this level which contains just an import statement for all r
    -
    -

    generated/system/system_management/disk_management/top.nix

    -
    +
    +

    generated/system/system_management/disk_management/top.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

    @@ -2970,9 +2972,9 @@ This is top file of this level which contains just an import statement for all r
    -
    -

    generated/system/system_management/hardware_sensors/top.nix

    -
    +
    +

    generated/system/system_management/hardware_sensors/top.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

    @@ -2988,9 +2990,9 @@ This is top file of this level which contains just an import statement for all r
    -
    -

    generated/system/system_management/logging_monitoring/top.nix

    -
    +
    +

    generated/system/system_management/logging_monitoring/top.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

    @@ -3006,9 +3008,9 @@ This is top file of this level which contains just an import statement for all r
    -
    -

    generated/system/system_management/login_manager/top.nix

    -
    +
    +

    generated/system/system_management/login_manager/top.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

    @@ -3024,9 +3026,9 @@ This is top file of this level which contains just an import statement for all r
    -
    -

    generated/system/system_management/monitor_setup/top.nix

    -
    +
    +

    generated/system/system_management/monitor_setup/top.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

    @@ -3042,9 +3044,9 @@ This is top file of this level which contains just an import statement for all r
    -
    -

    generated/system/system_management/networking/top.nix

    -
    +
    +

    generated/system/system_management/networking/top.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

    @@ -3060,9 +3062,9 @@ This is top file of this level which contains just an import statement for all r
    -
    -

    generated/system/system_management/power_management/top.nix

    -
    +
    +

    generated/system/system_management/power_management/top.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

    @@ -3078,9 +3080,9 @@ This is top file of this level which contains just an import statement for all r
    -
    -

    generated/system/system_management/printers_scanners/top.nix

    -
    +
    +

    generated/system/system_management/printers_scanners/top.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

    @@ -3096,9 +3098,9 @@ This is top file of this level which contains just an import statement for all r
    -
    -

    generated/system/system_management/security/top.nix

    -
    +
    +

    generated/system/system_management/security/top.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

    @@ -3114,9 +3116,9 @@ This is top file of this level which contains just an import statement for all r
    -
    -

    generated/system/system_management/system_updates/top.nix

    -
    +
    +

    generated/system/system_management/system_updates/top.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

    @@ -3132,9 +3134,9 @@ This is top file of this level which contains just an import statement for all r
    -
    -

    generated/system/task_launcher/top.nix

    -
    +
    +

    generated/system/task_launcher/top.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

    @@ -3150,9 +3152,9 @@ This is top file of this level which contains just an import statement for all r
    -
    -

    generated/system/task_launcher/wofi.nix

    -
    +
    +

    generated/system/task_launcher/wofi.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

    @@ -3201,7 +3203,7 @@ in

    Author: Henro Veijer

    -

    Created: 2026-03-16 Mon 11:41

    +

    Created: 2026-03-16 Mon 11:44

    Validate

    diff --git a/Droidnix/README.org b/Droidnix/README.org index f307d6bce..be01534f5 100644 --- a/Droidnix/README.org +++ b/Droidnix/README.org @@ -1141,9 +1141,10 @@ This file configures gtk }; iconTheme.name = "Papirus-Dark"; }; -}#+END_SRC +} +#+END_SRC -** generated/out_of_tree/machines/traveldroid/catppuccin.nix +** =generated/out_of_tree/machines/traveldroid/catppuccin.nix= I use the [[https://catppuccin.com/][Catppuccin]] almost everywhere. The nix module integrates almost automatically everywhere (except gtk). You'll notice the color values in multiple places outside this as well. #+BEGIN_SRC nix :tangle generated/out_of_tree/machines/traveldroid/catppuccin.nix :noweb tangle :mkdirp yes :eval never-html diff --git a/Droidnix/generated/out_of_tree/machines/traveldroid/gtk.nix b/Droidnix/generated/out_of_tree/machines/traveldroid/gtk.nix index a45329f1f..fb7835532 100644 --- a/Droidnix/generated/out_of_tree/machines/traveldroid/gtk.nix +++ b/Droidnix/generated/out_of_tree/machines/traveldroid/gtk.nix @@ -1,14 +1,14 @@ { pkgs, ... }: - { gtk = { enable = true; - colorScheme = "dark"; + #colorScheme = "dark"; theme = { name = "Catppuccin-GTK-Grey-Dark-Compact"; package = ( pkgs.magnetic-catppuccin-gtk.override { accent = [ "blue" ]; + flavor = [ "mocha" ] icon.accent = [ "blue" ]; #shade = "dark"; tweaks = [ "black" ]; diff --git a/Droidnix/generated/out_of_tree/machines/traveldroid/theme.nix b/Droidnix/generated/out_of_tree/machines/traveldroid/theme.nix deleted file mode 100644 index 788b4fda3..000000000 --- a/Droidnix/generated/out_of_tree/machines/traveldroid/theme.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ pkgs, ...}: -{ - gtk = { - enable = true; - colorScheme = "dark"; - theme = { - name = "Catppuccin-GTK-Grey-Dark-Compact"; - package = (pkgs.magnetic-catppuccin-gtk.override { - accent = [ "grey" ]; - shade = "dark"; - tweaks = [ "black" ]; - size = "compact"; - }); - }; - - iconTheme.name = "Papirus-Dark"; - }; - - catppuccin.enable = true; - catppuccin.flavor = "mocha"; - catppuccin.accent = "blue"; - catppuccin.gtk.icon.enable = true; - catppuccin.cursors.enable = true; -} diff --git a/Droidnix/generated/system/core/gtk.nix b/Droidnix/generated/system/core/gtk.nix deleted file mode 100644 index 404160cc0..000000000 --- a/Droidnix/generated/system/core/gtk.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ pkgs, ... }: - -{ - environment.systemPackages = with pkgs; [ - catppuccin.gtk.mocha.standard.blue - papirus-icon-theme - ]; - - programs.gtk = { - enable = true; - gtk3.enable = true; - theme.name = "Catppuccin-Mocha-Standard-Blue-Dark"; - theme.variant = "dark"; - iconTheme.name = "Papirus-Dark"; - }; - - # Check session.nix for variables ! -}