📦 Moved more configs to common files, and refactored code with common

modules/fonts.nix

@@ -5,15 +5,19 @@
     font-awesome # Icons
   ];
 
-  fonts = {
-    fontconfig.enable = true;
-    packages = with pkgs; [
-      (nerdfonts.override { fonts = [ "JetBrainsMono" ]; })
-      jetbrains-mono
-      # The line below will replace the lines above in 25.05
-      # nerd-fonts.jetbrains-mono
-      font-awesome
-    ];
-  };
+  fonts =
+    let
+      theme = import ../theme.nix;
+    in
+    {
+      fontconfig.enable = true;
+      packages = with pkgs; [
+        (nerdfonts.override { fonts = [ theme.nerdFont ]; })
+        jetbrains-mono
+        # The line below will replace the lines above in 25.05
+        # nerd-fonts.jetbrains-mono
+        font-awesome
+      ];
+    };
 
 }

modules/locale.nix

@@ -1,5 +1,3 @@
-{ ... }:
-
 # TODO move locale config for hyprland here
 let
   utf-8 = "UTF-8";

modules/sddm.nix

@@ -7,7 +7,7 @@ in
   environment.systemPackages = with pkgs; [
     (catppuccin-sddm.override {
       flavor = flavor;
-      font = "JetBrainsMono";
+      font = theme.nerdFont;
       fontSize = "9";
       background = "${../catppuccin_high.png}";
       loginBackground = true;