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
 
@@ -1115,21 +1121,14 @@ 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, ... }:
+{ pkgs, inputs, ... }:
 
 {
-  # Install the GTK theme and icon theme
   environment.systemPackages = with pkgs; [
-    catppuccin-gtk-mocha # 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/flake.nix

@@ -15,6 +15,7 @@
       url = "github:catppuccin/nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
     zen-browser = {
       url = "github:youwen5/zen-browser-flake";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -22,7 +23,7 @@
     hyprland.url = "github:hyprwm/Hyprland";
   };
 
-outputs =
+  outputs =
     inputs@{
       self,
       nixpkgs,
@@ -52,7 +53,8 @@ outputs =
             # Import machine-specific configurations
             ./generated/out_of_tree/machines/traveldroid/top.nix
             # Catppuccin theme module
-          inputs.catppuccin.nixosModules.catppuccin
+            inputs.catppuccin.nixosModules.default
+
             # Anchoring all the other nixes
             ./generated/top.nix
             # Home Manager module

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

@@ -1,16 +1,9 @@
-{ pkgs, ... }:
+{ pkgs, inputs, ... }:
 
 {
-  # Install the GTK theme and icon theme
   environment.systemPackages = with pkgs; [
-    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
 }