Significant progress on font customization

users/jan.nix

@@ -1,6 +1,6 @@
 # How Jan likes his linux to be configured
 
-{ ... }:
+{ config, ... }:
 
 {
   imports = [
@@ -11,11 +11,15 @@
     # State version
     home.stateVersion = "24.05";
 
+    # Enabled modules
     modules = {
       # Window manager
       river.enable = true;
       waylock.enable = true;
 
+      # Theming
+      theming.enable = true;
+
       # Programs
       feishin.enable = true;
       firefox.enable = true;
@@ -29,15 +33,21 @@
       unfree.enable = true;
     };
 
-    theming.themes.gruvbox = {
-      enable = false;
-      darkMode = false;
-      contrast = "hard";
-    };
+    # Theme configuration
+    theming = let fontpkgs = config.theming.fonts.pkgs; in {
+      # Fonts
+      fonts.serif = fontpkgs."DejaVu Serif";
+      fonts.sansSerif = fontpkgs."DejaVu Sans";
+      fonts.monospace = fontpkgs."Dina";
+      fonts.emoji = fontpkgs."Dina";
+      fonts.extraFonts = [
+      ];
 
-    theming.themes.catppuccin = {
-      enable = true;
-      flavor = "latte";
+      # Color scheme
+      themes.catppuccin = {
+        enable = true;
+        flavor = "latte";
+      };
     };
   };
 }

users/janMerged.nix

@@ -57,10 +57,10 @@ in {
 
     # base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-hard.yaml";
     fonts = {
-      monospace = {
-        package = pkgs.dina-font;
-        name = "Dina";
-      };
+      # monospace = {
+      #   package = pkgs.dina-font;
+      #   name = "Dina";
+      # };
 
       sizes = {
         terminal = 9;