Still GTK looks

Droidnix/README.org

@@ -339,7 +339,7 @@ This is the top of the machine hierarchy
     ./session.nix
     ./networking.nix
     ./gtk.nix
-    ./theme.nix
+    ./catppuccin.nix
     inputs.home-manager.nixosModules.home-manager
   ];
 
@@ -1121,47 +1121,45 @@ This file sets up wayland
 ** =generated/out_of_tree/machines/traveldroid/gtk.nix=
 This file configures gtk
 #+BEGIN_SRC nix :tangle generated/out_of_tree/machines/traveldroid/gtk.nix :noweb tangle :mkdirp yes :eval never-html
-{ pkgs, inputs, ... }:
+{ pkgs, ... }:
 
 {
-  # enable the catppuccin theme for everything with mocha + blue accents
-  catppuccin.enable = true;
-  catppuccin.flavor = "mocha";
-  catppuccin.accent = "blue";
-
-  #SEE SESSIONS.NIX FOR SESSION VARIABLES
+  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";
+  };
 }
+
 #+END_SRC
 
-** Theme
+** 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/theme.nix :noweb tangle :mkdirp yes :eval never-html
-  { pkgs, ...}:
-  {
+#+BEGIN_SRC nix :tangle generated/out_of_tree/machines/traveldroid/catppuccin.nix :noweb tangle :mkdirp yes :eval never-html
+{ ... }:
+
+{
+  catppuccin = {
+    enable = true;
+    flavor = "mocha";
+    accent = "blue";
     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";
+      icon.enable = true;
     };
-
-    catppuccin.enable = true;
-    catppuccin.flavor = "mocha";
-    catppuccin.accent = "blue";
-    catppuccin.gtk.icon.enable = true;
-    catppuccin.cursors.enable = true;
-  }
-  #+END_SRC
+    cursors.enable = true;
+  };
+}
+#+END_SRC
 
 ** =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