Move font confit to flake.nix, add to stylix

Change fonts to all use Fira family, Fira Sans for UI Fira Sans Mono for
monospace and FiraCode still for Emacs

flake.nix

@@ -118,9 +118,57 @@
               image = ./wallpapers/waves/cat-waves.png;
               base16Scheme =
                 "${inputs.catppuccin-base16}/base16/macchiato.yaml";
+              fonts = {
+                emoji = {
+                  name = "Noto Color Emoji";
+                  package = pkgs.noto-fonts-emoji;
+                };
+                monospace = {
+                  name = "Fira Sans Mono";
+                  package = pkgs.fira-mono;
+                };
+                sansSerif = {
+                  name = "Fira Sans";
+                  package = pkgs.fira;
+                };
+                serif = {
+                  name = "Fira Sans";
+                  package = pkgs.fira;
+                };
+              };
+              homeManagerIntegration.followSystem = true;
               targets = {
+                chromium.enable = true;
                 console.enable = true;
-                grub.enable = true;
+                grub = {
+                  enable = true;
+                  useImage = true;
+                };
+              };
+            };
+            fonts = {
+              packages = with pkgs; [
+                fira
+                fira-mono
+                fira-code
+                (nerdfonts.override { fonts = [ "FiraCode" ]; })
+                dejavu_fonts
+                noto-fonts-emoji
+                font-awesome
+                material-symbols
+                emacs-all-the-icons-fonts
+                material-design-icons
+                weather-icons
+                vscode-extensions.file-icons.file-icons
+              ];
+              fontconfig = {
+                enable = true;
+                defaultFonts = {
+                  serif = [ "Fira Sans" "DejaVu Sans" ];
+                  sansSerif = [ "Fira Sans" "DejaVu Sans" ];
+                  monospace = [ "Fira Mono" "DejaVu Sans Mono" ];
+                  emoji = [ "Noto Color Emoji" ];
+                };
               };
             };
             nix = {

home/hyprland/anyrun.nix

@@ -26,7 +26,7 @@
     extraCss = ''
       * {
         all: unset;
-        font-family: FiraCode Nerd Font;
+        font-family: "Fira Sans";
         font-size: 1.3rem;
       }
 

home/hyprland/swaync/default.nix

@@ -1,9 +1,6 @@
 { pkgs, ... }:
 
 {
-  home.packages = [
+  home.packages = [ pkgs.swaynotificationcenter ];
-    pkgs.swaynotificationcenter
-    (pkgs.nerdfonts.override { fonts = [ "FiraCode" ]; })
-  ];
   xdg.configFile."swaync/style.css".source = ./style.css;
 }

home/hyprland/swaync/style.css

@@ -1,7 +1,7 @@
 * {
   all: unset;
   font-size: 14px;
-  font-family: "FiraCode Nerd Font";
+  font-family: "Fira Sans";
   transition: 200ms;
 }
 

home/hyprland/waybar/style.css

@@ -35,7 +35,7 @@
     margin: 0px;
     background: transparent;
     color: @text;
-    font-family: "FiraCode Nerd Font";
+    font-family: "Fira Sans";
     font-size: 18px;
 }
 

home/hyprland/waybar/styles/colourful_bubbles.css

@@ -32,7 +32,7 @@
 * {
     border: none;
     border-radius: 10px;
-    font-family: "FiraCode Nerd Font";
+    font-family: "Fira Sans";
     font-size: 18px;
 }
 

home/hyprland/wlogout/default.nix

@@ -28,6 +28,10 @@
       rebootIcon = ./icons/reboot.png;
       logoutIcon = ./icons/logout.png;
     in ''
+      * {
+        font-family: "Fira Sans";
+      }
+
       window {
         background: transparent;
       }

home/tmux.nix

@@ -1,6 +1,7 @@
 { pkgs, ... }:
 
 {
+  stylix.targets.tmux.enable = true;
   programs.tmux = {
     enable = true;
     baseIndex = 1;

system/hyprland.nix

@@ -32,35 +32,6 @@
     tumbler.enable = true;
     xserver.displayManager.defaultSession = "hyprland";
   };
-  fonts = {
-    packages = with pkgs; [
-      # normal fonts
-      noto-fonts
-      noto-fonts-cjk
-      noto-fonts-emoji
-      font-awesome
-      # nerdfonts
-      (nerdfonts.override { fonts = [ "FiraCode" ]; })
-      # icon fonts
-      material-symbols
-      emacs-all-the-icons-fonts
-      material-design-icons
-      weather-icons
-      vscode-extensions.file-icons.file-icons
-    ];
-    fontconfig = {
-      enable = true;
-      # user defined fonts
-      # the reason there's Noto Color Emoji everywhere is to override DejaVu's
-      # B&W emojis that would sometimes show instead of some Color emojis
-      defaultFonts = {
-        serif = [ "Noto Serif" "Noto Color Emoji" ];
-        sansSerif = [ "Noto Sans" "Noto Color Emoji" ];
-        monospace = [ "FiraCode Nerd Font" "Noto Sans" "Noto Color Emoji" ];
-        emoji = [ "Noto Color Emoji" ];
-      };
-    };
-  };
   xdg.portal = {
     enable = true;
     extraPortals = with pkgs; [ xdg-desktop-portal-gtk ];