Still GTK looks

Droidnix/README.org

@@ -151,14 +151,14 @@ The Nix flake definition for Droidnix.
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    emacs-overlay = {
-      url = "github:nix-community/emacs-overlay";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
     catppuccin = {
       url = "github:catppuccin/nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    emacs-overlay = {
+      url = "github:nix-community/emacs-overlay";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
     zen-browser = {
       url = "github:youwen5/zen-browser-flake";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -196,7 +196,7 @@ outputs =
           # Import machine-specific configurations
           ./generated/out_of_tree/machines/traveldroid/top.nix
           # Catppuccin theme module
-          inputs.catppuccin.nixosModules.catppuccin
+          catppuccin.nixosModules.catppuccin
           # Anchoring all the other nixes
           ./generated/top.nix
           # Home Manager module
@@ -339,8 +339,8 @@ This is the top of the machine hierarchy
     ./session.nix
     ./networking.nix
     ./gtk.nix
+    ./theme.nix
     inputs.home-manager.nixosModules.home-manager
-    inputs.catppuccin.nixosModules.default
   ];
 
     catppuccin = {
@@ -1124,14 +1124,45 @@ This file configures gtk
 { pkgs, inputs, ... }:
 
 {
-  environment.systemPackages = with pkgs; [
+  # enable the catppuccin theme for everything with mocha + blue accents
-    papirus-icon-theme
+  catppuccin.enable = true;
-  ];
+  catppuccin.flavor = "mocha";
+  catppuccin.accent = "blue";
 
   #SEE SESSIONS.NIX FOR SESSION VARIABLES
 }
 #+END_SRC
 
+** Theme
+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, ...}:
+  {
+    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;
+  }
+  #+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
 #+BEGIN_SRC nix :tangle generated/system/development/top.nix :noweb tangle :mkdirp yes :eval never-html

Droidnix/flake.nix

@@ -7,14 +7,14 @@
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    emacs-overlay = {
-      url = "github:nix-community/emacs-overlay";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
     catppuccin = {
       url = "github:catppuccin/nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    emacs-overlay = {
+      url = "github:nix-community/emacs-overlay";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
     zen-browser = {
       url = "github:youwen5/zen-browser-flake";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -52,7 +52,7 @@ outputs =
           # Import machine-specific configurations
           ./generated/out_of_tree/machines/traveldroid/top.nix
           # Catppuccin theme module
-          inputs.catppuccin.nixosModules.catppuccin
+          catppuccin.nixosModules.catppuccin
           # Anchoring all the other nixes
           ./generated/top.nix
           # Home Manager module

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

@@ -1,14 +1,10 @@
 { pkgs, inputs, ... }:
 
 {
-  environment.systemPackages = with pkgs; [
+  # enable the catppuccin theme for everything with mocha + blue accents
-    catppuccin-gtk
+  catppuccin.enable = true;
-    papirus-icon-theme
+  catppuccin.flavor = "mocha";
-  ];
+  catppuccin.accent = "blue";
 
-  environment.sessionVariables = {
+  #SEE SESSIONS.NIX FOR SESSION VARIABLES
-    GTK_THEME = "Catppuccin-Mocha-Standard-Blue-Dark";
-    GTK_ICON_THEME = "Papirus-Dark";
-    GTK_ENABLE_DARK_MODE = "1";
-  };
 }

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

@@ -0,0 +1,24 @@
+{ 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;
+}

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

@@ -19,11 +19,12 @@
     ./session.nix
     ./networking.nix
     ./gtk.nix
+    ./theme.nix
     inputs.home-manager.nixosModules.home-manager
   ];
 
-  catppuccin = {
+    catppuccin = {
-    enable = true;
+      enable = true;
-    flavor = "mocha";
+      flavor = "mocha";
-  };
+    };
 }