Working on looks, still

Droidnix/README.org

@@ -340,7 +340,13 @@ This is the top of the machine hierarchy
     ./networking.nix
     ./gtk.nix
     inputs.home-manager.nixosModules.home-manager
+    inputs.catppuccin.nixosModules.default
   ];
+
+    catppuccin = {
+      enable = true;
+      flavor = "mocha";
+    };
 }
 #+END_SRC
 
@@ -1118,18 +1124,11 @@ This file configures gtk
 { pkgs, inputs, ... }:
 
 {
-  # Install the GTK theme and icon theme
   environment.systemPackages = with pkgs; [
-    magnetic-catppuccin-gtk #inputs.catppuccin.gtk.mocha.standard #catppuccin-gtk # or inputs.catppuccin.packages.${pkgs.system}.catppuccin-gtk-mocha
     papirus-icon-theme
   ];
 
-  # Set environment variables to enforce the theme
-  environment.sessionVariables = {
-    GTK_THEME = "Catppuccin-Mocha-Standard-Blue-Dark";
-    GTK_ICON_THEME = "Papirus-Dark";
-    GTK_ENABLE_DARK_MODE = "1";
-  };
+  #SEE SESSIONS.NIX FOR SESSION VARIABLES
 }
 #+END_SRC
 

Droidnix/generated/out_of_tree/machines/traveldroid/gtk.nix

@@ -5,17 +5,5 @@
     papirus-icon-theme
   ];
 
-  environment.sessionVariables = {
-    GTK_THEME = "Catppuccin-Mocha-Standard-Blue-Dark";
-    GTK_ICON_THEME = "Papirus-Dark";
-    GTK_ENABLE_DARK_MODE = "1";
-  };
-
-  catppuccin = {
-    enable = true;
-    flavor = "mocha";
-    gtk = {
-      enable = true;
-    };
-  };
+  #SEE SESSIONS.NIX FOR SESSION VARIABLES
 }