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,62 +23,63 @@
     hyprland.url = "github:hyprwm/Hyprland";
   };
 
-outputs =
-  inputs@{
-    self,
-    nixpkgs,
-    home-manager,
-    emacs-overlay,
-    catppuccin,
-    zen-browser,
-    hyprland,
-    ...
-  }:
-  let
-    lib = nixpkgs.lib;
-    system = "x86_64-linux";
-    user = import ./generated/out_of_tree/users/henrov.nix;
-    machines = [
-      "traveldroid"
-      "maindroid"
-    ];
-    flakeRoot = ./.; # Define flakeRoot here
-  in
-  {
-    nixosConfigurations = lib.genAttrs machines (
-      machine:
-      lib.nixosSystem {
-        inherit system;
-        modules = [
-          # Import machine-specific configurations
-          ./generated/out_of_tree/machines/traveldroid/top.nix
-          # Catppuccin theme module
-          inputs.catppuccin.nixosModules.catppuccin
-          # Anchoring all the other nixes
-          ./generated/top.nix
-          # Home Manager module
-          inputs.home-manager.nixosModules.home-manager
-          {
-            home-manager.useGlobalPkgs = true;
-            home-manager.useUserPackages = true;
-            home-manager.extraSpecialArgs = { inherit user inputs flakeRoot; };
-          }
-        ];
-        specialArgs = { inherit user inputs flakeRoot; };
-      }
-    );
+  outputs =
+    inputs@{
+      self,
+      nixpkgs,
+      home-manager,
+      emacs-overlay,
+      catppuccin,
+      zen-browser,
+      hyprland,
+      ...
+    }:
+    let
+      lib = nixpkgs.lib;
+      system = "x86_64-linux";
+      user = import ./generated/out_of_tree/users/henrov.nix;
+      machines = [
+        "traveldroid"
+        "maindroid"
+      ];
+      flakeRoot = ./.; # Define flakeRoot here
+    in
+    {
+      nixosConfigurations = lib.genAttrs machines (
+        machine:
+        lib.nixosSystem {
+          inherit system;
+          modules = [
+            # Import machine-specific configurations
+            ./generated/out_of_tree/machines/traveldroid/top.nix
+            # Catppuccin theme module
+            inputs.catppuccin.nixosModules.default
 
-    homeConfigurations = lib.genAttrs (map (machine: "${user.username}@${machine}") machines) (
-      userMachine:
-      home-manager.lib.homeManagerConfiguration {
-        inherit system;
-        configuration = import ./user.nix { inherit inputs user flakeRoot; };
-        extraSpecialArgs = { inherit user inputs flakeRoot; };
-      }
-    );
+            # Anchoring all the other nixes
+            ./generated/top.nix
+            # Home Manager module
+            inputs.home-manager.nixosModules.home-manager
+            {
+              home-manager.useGlobalPkgs = true;
+              home-manager.useUserPackages = true;
+              home-manager.extraSpecialArgs = { inherit user inputs flakeRoot; };
+            }
+          ];
+          specialArgs = { inherit user inputs flakeRoot; };
+        }
+      );
 
-    devShells.${system}.default = import ./generated/out_of_tree/terminal_shell/devshell.nix {
-      inherit (nixpkgs.legacyPackages.${system}) mkShell;
+      homeConfigurations = lib.genAttrs (map (machine: "${user.username}@${machine}") machines) (
+        userMachine:
+        home-manager.lib.homeManagerConfiguration {
+          inherit system;
+          configuration = import ./user.nix { inherit inputs user flakeRoot; };
+          extraSpecialArgs = { inherit user inputs flakeRoot; };
+        }
+      );
+
+      devShells.${system}.default = import ./generated/out_of_tree/terminal_shell/devshell.nix {
+        inherit (nixpkgs.legacyPackages.${system}) mkShell;
+      };
     };
-  };
 }

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
 }