feat(noctalia): mm月dd日 -> mm/dd

config/hosts/imxyy-nix-server/home.nix

@@ -7,6 +7,7 @@
     coding.misc.enable = true;
     coding.langs.lua.enable = true;
     coding.langs.rust.enable = true;
+    fonts.enable = lib.mkForce false;
     persist = {
       enable = true;
       homeDirs = [

config/hosts/imxyy-nix-x16/nixos.nix

@@ -35,40 +35,6 @@
   };
   environment.variables.NIX_REMOTE = "daemon";
 
-  fonts = {
-    enableDefaultPackages = false;
-    fontDir.enable = true;
-
-    packages = with pkgs; [
-      noto-fonts
-      noto-fonts-cjk-sans
-      noto-fonts-emoji
-
-      jetbrains-mono
-
-      nerd-fonts.symbols-only
-    ];
-
-    fontconfig.defaultFonts = {
-      serif = [
-        "Noto Serif CJK SC"
-        "Noto Serif"
-        "Symbols Nerd Font"
-      ];
-      sansSerif = [
-        "Noto Sans CJK SC"
-        "Noto Sans"
-        "Symbols Nerd Font"
-      ];
-      monospace = [
-        "JetBrains Mono"
-        "Noto Sans Mono CJK SC"
-        "Symbols Nerd Font Mono"
-      ];
-      emoji = [ "Noto Color Emoji" ];
-    };
-  };
-
   services.printing.enable = true;
 
   services.upower.enable = true;

config/hosts/imxyy-nix/nixos.nix

@@ -73,40 +73,6 @@ in
   };
   environment.variables.NIX_REMOTE = "daemon";
 
-  fonts = {
-    enableDefaultPackages = false;
-    fontDir.enable = true;
-
-    packages = with pkgs; [
-      noto-fonts
-      noto-fonts-cjk-sans
-      noto-fonts-emoji
-
-      jetbrains-mono
-
-      nerd-fonts.symbols-only
-    ];
-
-    fontconfig.defaultFonts = {
-      serif = [
-        "Noto Serif CJK SC"
-        "Noto Serif"
-        "Symbols Nerd Font"
-      ];
-      sansSerif = [
-        "Noto Sans CJK SC"
-        "Noto Sans"
-        "Symbols Nerd Font"
-      ];
-      monospace = [
-        "JetBrains Mono"
-        "Noto Sans Mono CJK SC"
-        "Symbols Nerd Font Mono"
-      ];
-      emoji = [ "Noto Color Emoji" ];
-    };
-  };
-
   services.printing.enable = true;
 
   services.keyd = {

modules/desktop/style/default.nix

@@ -47,6 +47,10 @@ lib.my.makeSwitch {
       # GTK
       gtk = {
         enable = true;
+        font = {
+          name = "Adwaita Sans";
+          package = pkgs.adwaita-fonts;
+        };
         theme = {
           package = pkgs.gnome-themes-extra;
           name = "Adwaita";

modules/desktop/wm/niri/default.nix

@@ -114,8 +114,7 @@ in
                 }
                 {
                   id = "Clock";
-                  formatHorizontal = "HH:mm MM月dd日 ddd";
+                  formatHorizontal = "HH:mm MM/dd ddd";
-                  formatVertical = "HH mm - dd MM";
                   useCustomFont = false;
                   usePrimaryColor = true;
                 }

modules/fonts.nix

@@ -0,0 +1,47 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+lib.my.makeSwitch {
+  inherit config;
+  default = true;
+  optionName = "default font settings";
+  optionPath = [ "fonts" ];
+  config' = {
+    fonts = {
+      enableDefaultPackages = false;
+      fontDir.enable = true;
+
+      packages = with pkgs; [
+        noto-fonts
+        noto-fonts-cjk-sans
+        noto-fonts-emoji
+
+        jetbrains-mono
+
+        nerd-fonts.symbols-only
+      ];
+
+      fontconfig.defaultFonts = {
+        serif = [
+          "Noto Serif CJK SC"
+          "Noto Serif"
+          "Symbols Nerd Font"
+        ];
+        sansSerif = [
+          "Noto Sans CJK SC"
+          "Noto Sans"
+          "Symbols Nerd Font"
+        ];
+        monospace = [
+          "JetBrains Mono"
+          "Noto Sans Mono CJK SC"
+          "Symbols Nerd Font Mono"
+        ];
+        emoji = [ "Noto Color Emoji" ];
+      };
+    };
+  };
+}