26 changed files with 40 additions and 390 deletions
--- a/.sops.yaml
+++ b/.sops.yaml
@ -9,9 +9,3 @@ creation_rules:
          - *master
          - *machine_Akun
          - *machine_Cape
-  - path_regex: secrets/dummy_fonts/[^/]+\.(ttf|otf)$
-    key_groups:
-      - age:
-          - *master
-          - *machine_Akun
-          - *machine_Cape
--- a/home/david/configurations/Tytonidae/default.nix
+++ b/home/david/configurations/Tytonidae/default.nix
@ -56,7 +56,6 @@
      helix.enable = true;
      nvchad.enable = true;
      # spacemacs.enable = true;
-      radicle.enable = true;
    };
  };

--- a/home/david/modules/programs/ghostty.nix
+++ b/home/david/modules/programs/ghostty.nix
@ -11,18 +11,20 @@
  config = let
    cfg = config.david.programs.ghostty;
  in (lib.mkIf cfg.enable {
-    stylix.targets.ghostty.enable = false;
    programs.ghostty = lib.mkMerge [
      {
        enable = true;
        settings = {
-          font-family = [
-            "MonoLisa"
-            "Source Han Sans"
+          # font-family = "Maple Mono NF CN";
+          font-feature = [
+            "calt"
+            "zero"
+            "cv03"
+            "ss08"
          ];
          font-size = lib.mkForce 17;
-          theme = "Atom One Dark";
-          background-opacity = 0.8;
+          theme = lib.mkForce "Atom One Dark";
+          background-opacity = lib.mkForce 0.8;
          confirm-close-surface = "false";
        };
      }
--- a/home/david/modules/programs/noctalia/default.nix
+++ b/home/david/modules/programs/noctalia/default.nix
@ -63,7 +63,7 @@ in {
    programs.noctalia-shell = {
      enable = true;
      systemd.enable = true;
-      plugins = builtins.fromJSON (builtins.readFile ./plugins.json);
+      plugins = toString ./plugins.json;
      settings =
        lib.recursiveUpdate
        (builtins.fromJSON (builtins.readFile ./settings.json))
--- a/home/david/modules/programs/noctalia/settings.json
+++ b/home/david/modules/programs/noctalia/settings.json
@ -81,9 +81,6 @@
        }
      ],
      "right": [
-        {
-          "id": "plugin:timer"
-        },
        {
          "displayMode": "onhover",
          "id": "Brightness"
@ -147,7 +144,7 @@
  },
  "ui": {
    "fontDefault": "Source Han Serif SC",
-    "fontFixed": "MonoLisa",
+    "fontFixed": "Maple Mono NF CN",
    "fontDefaultScale": 1,
    "fontFixedScale": 1,
    "tooltipsEnabled": true,
--- a/home/david/modules/programs/radicle.nix
+++ b/home/david/modules/programs/radicle.nix
@ -1,26 +0,0 @@
-{
-  lib,
-  config,
-  ...
-}: let
-  cfg = config.david.programs.radicle;
-in {
-  options = {
-    david.programs.radicle = {
-      enable = lib.mkEnableOption "radicle";
-    };
-  };
-  config = lib.mkIf cfg.enable {
-    youthlic.programs.radicle.enable = true;
-    programs.radicle.uri = {
-      rad.browser = {
-        enable = true;
-        preferredNode = "iris.radicle.xyz";
-      };
-      web-rad = {
-        browser = "zen-twilight.desktop";
-        enable = true;
-      };
-    };
-  };
-}
--- a/home/david/modules/programs/zed.nix
+++ b/home/david/modules/programs/zed.nix
@ -109,10 +109,13 @@ in {
        "format_on_save" = "off";
        ui_font_size = 20;
        buffer_font_size = 20;
-        buffer_font_family = "MonoLisa";
-        buffer_font_fallback = [
-          "Source Han Sans"
-        ];
+        buffer_font_family = "Maple Mono NF CN";
+        buffer_font_features = {
+          "calt" = true;
+          "zero" = true;
+          "cv03" = true;
+          "ss08" = true;
+        };
        ui_font_family = "Source Han Sans";
        theme = "Catppuccin Latte";
        helix_mode = true;
--- a/home/modules/programs/radicle.nix
+++ b/home/modules/programs/radicle.nix
@ -1,69 +0,0 @@
-{
-  lib,
-  config,
-  ...
-}: let
-  cfg = config.youthlic.programs.radicle;
-in {
-  options = {
-    youthlic.programs.radicle = {
-      enable = lib.mkEnableOption "radicle";
-    };
-  };
-  config = lib.mkIf cfg.enable {
-    programs.radicle = {
-      enable = true;
-      settings = {
-        publicExplorer = "https://app.radicle.xyz/nodes/$host/$rid$path";
-        preferredSeeds = [
-          "z6Mkmqogy2qEM2ummccUthFEaaHvyYmYBYh3dbe9W4ebScxo@rosa.radicle.xyz:8776"
-          "z6MksmpU5b1dS7oaqF2bHXhQi1DWy2hB7Mh9CuN7y1DN6QSz@seed.radicle.xyz:8776"
-          "z6MkrLMMsiPWUcNPHcRajuMi9mDfYckSoJyPwwnknocNYPm7@iris.radicle.xyz:8776"
-        ];
-        cli = {
-          hints = true;
-        };
-        node = {
-          alias = "youthlic";
-          peers = {
-            type = "dynamic";
-          };
-          network = "main";
-          log = "INFO";
-          relay = "auto";
-          limits = {
-            routingMaxSize = 1000;
-            routingMaxAge = 604800;
-            gossipMaxAge = 1209600;
-            fetchConcurrency = 1;
-            maxOpenFiles = 4096;
-            rate = {
-              inbound = {
-                fillRate = 5;
-                capacity = 1024;
-              };
-              outbound = {
-                fillRate = 10;
-                capacity = 2048;
-              };
-            };
-            connection = {
-              inbound = 128;
-              outbound = 16;
-            };
-          };
-          workers = 8;
-          seedingPolicy = {
-            default = "block";
-          };
-        };
-      };
-    };
-    sops.secrets."radicle/Tytonidae" = {};
-    services.radicle.node = {
-      enable = true;
-      args = "--log-logger systemd";
-    };
-    systemd.user.services."radicle-node".Service.EnvironmentFile = [config.sops.secrets."radicle/Tytonidae".path];
-  };
-}
--- a/nixos/configurations/Akun/stylix.nix
+++ b/nixos/configurations/Akun/stylix.nix
@ -24,7 +24,7 @@
      };
      monospace = {
        package = pkgs.maple-mono.NF-CN;
-        name = "MonoLisa";
+        name = "Maple Mono NF CN";
      };
      emoji = {
        package = pkgs.noto-fonts-color-emoji;
--- a/nixos/configurations/Tytonidae/default.nix
+++ b/nixos/configurations/Tytonidae/default.nix
@ -67,7 +67,6 @@

  environment.systemPackages = with pkgs; [
    radicle-node
-    radicle-desktop
    nix-output-monitor
    wget
    git
--- a/nixos/configurations/Tytonidae/stylix.nix
+++ b/nixos/configurations/Tytonidae/stylix.nix
@ -24,7 +24,7 @@
      };
      monospace = {
        package = pkgs.maple-mono.NF-CN;
-        name = "MonoLisa";
+        name = "Maple Mono NF CN";
      };
      emoji = {
        package = pkgs.noto-fonts-color-emoji;
--- a/nixos/modules/gui/default.nix
+++ b/nixos/modules/gui/default.nix
@ -2,7 +2,6 @@
  config,
  lib,
  pkgs,
-  rootPath,
  ...
 }: let
  cfg = config.youthlic.gui;
@ -32,19 +31,6 @@ in {
      package = pkgs.firefox-beta;
    };

-    sops.secrets = with lib;
-    with builtins;
-      pipe (rootPath + "/secrets/dummy_font") [
-        readDir
-        attrNames
-        (flip genAttrs (name: {
-          sopsFile = rootPath + "/secrets/dummy_font/${name}";
-          format = "binary";
-          path = "/run/fonts/${name}";
-          mode = "0444";
-        }))
-      ];
-
    fonts = {
      enableDefaultPackages = false;
      packages = with pkgs; [
@ -58,35 +44,23 @@ in {
        noto-fonts-cjk-serif
        noto-fonts
      ];
-      fontconfig = {
-        localConf =
-          #xml
-          ''
-            <?xml version="1.0"?>
-            <!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">
-            <fontconfig>
-            <dir>/run/fonts</dir>
-            </fontconfig>
-          '';
-        defaultFonts = {
-          serif = [
-            "Libertinus Serif"
-            "Source Han Serif"
-            "Noto Serif CJK SC"
-          ];
-          sansSerif = [
-            "Source Han Sans"
-            "Noto Sans CJK SC"
-          ];
-          monospace = [
-            "MonoLisa"
-            "Maple Mono NF CN"
-            "Noto Sans Mono SC"
-          ];
-          emoji = [
-            "Noto Color Emoji"
-          ];
-        };
+      fontconfig.defaultFonts = {
+        serif = [
+          "Libertinus Serif"
+          "Source Han Serif"
+          "Noto Serif CJK SC"
+        ];
+        sansSerif = [
+          "Source Han Sans"
+          "Noto Sans CJK SC"
+        ];
+        monospace = [
+          "Maple Mono NF CN"
+          "Noto Sans Mono SC"
+        ];
+        emoji = [
+          "Noto Color Emoji"
+        ];
      };
    };

--- a/nixos/modules/i18n.nix
+++ b/nixos/modules/i18n.nix
@ -14,7 +14,6 @@ in {
  config = lib.mkIf cfg.enable {
    i18n = {
      defaultLocale = "C.UTF-8";
-      extraLocales = ["zh_CN.UTF-8/UTF-8"];
      extraLocaleSettings = {
        LC_ADDRESS = "zh_CN.UTF-8";
        LC_IDENTIFICATION = "zh_CN.UTF-8";
--- a/pkgs/doom-emacs/config/config.el
+++ b/pkgs/doom-emacs/config/config.el
@ -10,7 +10,7 @@
                fish-exe))

 (setq doom-font (font-spec
-                 :family "MonoLisa"
+                 :family "Maple Mono NF CN"
                 :size 20))
 (setq doom-theme 'doom-one-light)
 ;;; Fix failure to locate 'Symbols Nerd Font Mono' font
--- a/pkgs/nixvim/neovide.nix
+++ b/pkgs/nixvim/neovide.nix
@ -3,7 +3,7 @@
    #lua
    ''
      if vim.g.neovide then
-        vim.o.guifont = [[MonoLisa,Source Han Sans,Noto Color Emoji:h16]]
+        vim.o.guifont = [[Maple Mono NF CN,Noto Color Emoji:h16]]
        vim.g.neovide_opacity = 0.9
        vim.g.linespace = 0.2
        vim.g.neovide_text_gamma = 0.8
--- a/secrets/dummy_font/dummy-Bold.ttf
+++ b/secrets/dummy_font/dummy-Bold.ttf
--- a/secrets/dummy_font/dummy-BoldItalic.ttf
+++ b/secrets/dummy_font/dummy-BoldItalic.ttf
--- a/secrets/dummy_font/dummy-Light.ttf
+++ b/secrets/dummy_font/dummy-Light.ttf
--- a/secrets/dummy_font/dummy-LightItalic.ttf
+++ b/secrets/dummy_font/dummy-LightItalic.ttf
--- a/secrets/dummy_font/dummy-Medium.ttf
+++ b/secrets/dummy_font/dummy-Medium.ttf
--- a/secrets/dummy_font/dummy-MediumItalic.ttf
+++ b/secrets/dummy_font/dummy-MediumItalic.ttf
--- a/secrets/dummy_font/dummy-Regular.ttf
+++ b/secrets/dummy_font/dummy-Regular.ttf
--- a/secrets/dummy_font/dummy-RegularItalic.ttf
+++ b/secrets/dummy_font/dummy-RegularItalic.ttf
--- a/secrets/dummy_font/dummy-SemiBold.ttf
+++ b/secrets/dummy_font/dummy-SemiBold.ttf
--- a/secrets/dummy_font/dummy-SemiBoldItalic.ttf
+++ b/secrets/dummy_font/dummy-SemiBoldItalic.ttf
--- a/secrets/general.yaml
+++ b/secrets/general.yaml
@ -1,5 +1,3 @@
-radicle:
-    Tytonidae: ENC[AES256_GCM,data:3Xe6FCLqV2i4/OpoyaHarF8HxN/uiSpiOSxsY7d0fo8AAQ==,iv:D4PZ/o2SM4pIDHx+K9EAbbN15SWfZjg7XjRzvUcrXqk=,tag:CPO2reXjRLnFzafL0a7aCQ==,type:str]
 awscli: ENC[AES256_GCM,data:YoeIPrKEMvjMrF/obs08hqnsVIPO1ojBKQpb+XapH20Rzo1Cw1ytIMf+MMcDLuZqvI8SeEqs0EtjBqqzqA0RvDVOGHWurQlC67MInkDdpN/p5xwTbAQgtv/dV6fKYySQgqG2LaKh6hEPKqNeT0TTW7e7Dd5TbA6em5YppPrKtmJK/8KDyTbCrrBo68bUZUV+WBiu055qXTm3ZA==,iv:d5c1imjlZGRWjrxJS1ibNucwZxoW7nHIXFnlEP51aOo=,tag:OQN5cKd7AqXk+lBqJ6eF+g==,type:str]
 garage: ENC[AES256_GCM,data:KEcOZUNa8aBKpp/m1xUZeNdZ4WABC0FnhN3x9hlof3sI0mj8Hm1NZabUgDpiYZPaCuvFwAN+P1cNXkT6DMtEyLeLDfNjuVpFMENAsPSVrBAiRvGhqpuYWjyPboDV/qHc1EnIPO73z7O6tbDfTGze42dIIlROGUtwlr78DCSWZZIR82dDQkcQkik7lc3soAnsYKdEd/93bs8EJPLlOdmmBfV79binI+8VchT/pYhypnaMqxHCK1FOfIo31Fn7Ym6Oqp9T0w+uA4Lkh03RlhWo0oAUbbY=,iv:NtaAeX3td8tEIDoLybjtB8azsHj6JsTw4WPD5jQHaHs=,tag:XqGDWf5+RkCseExHPiszNw==,type:str]
 minio: ENC[AES256_GCM,data:rJRE7HAI3t3CFn08mVe3t9slBGJMH2Jzzsrlbs2jkj+5fn3412NqVB8JheVy3+zrTd+09M1uJFZpeWcOkUw=,iv:x+JUOhYkXqLwNOuT5ZZ8JaX+spM/h0zszwun5kF0U3o=,tag:SyscCkZc78PsLAHIyLQ3QQ==,type:str]
@ -58,7 +56,7 @@ sops:
            a1Y1NU9CK2h1SS83VW42bzBMa01yMXMKI1DBtgNlkNCrxUQvnD6a45mQKNfg5gM4
            Zb5buo9Jofj4dn/HFwng3T3gxKTrP2Dh74CAH4L0M5yrF9fzk5TCcQ==
            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2026-01-20T10:48:54Z"
-    mac: ENC[AES256_GCM,data:V2yELzjqVDmsOynY4esySxqJcvdluwJcimQ/fP+QjoyUp6gE01+uwHZqRfLwVxqtFKkG37dAmfiDQlmmw1Xg4A1navZFwY1wsJtHknH3gJJFrjvSD808nAcIERqmXhkoG/MyuTnFuQjFxe2S+2bGiGTY39nQTz5Ou5YqE7oeiuM=,iv:YSu5iMl5wpDXnWMI9pfAe/4bTtlzWQoiOVmBe+SkkcY=,tag:EoNZG7i/EIE/T7bKogjWAg==,type:str]
+    lastmodified: "2025-10-26T10:48:06Z"
+    mac: ENC[AES256_GCM,data:tdD/wHe3bY+YakN4hRgCf+TLWVSiKM06jkAZnu0XBMrECwXa6Zsr9aGr2uYTFMpzcKgWarFkCFL+Ok6tDtkN2bcq3h+uV3Jxyb7oMr0sn5eb3bCu3UJ5cZ7sIaqnzHPL1j3bLBvb6WxSAm+OKJ2yIrJ8eCGAikaoExi2iNWSz9E=,iv:L2cFb0LE3erGRl61evj7Y4FgMHCQnGHygdzBCMZVOzs=,tag:OHgf5MWkQkQKJWuEGaZaAg==,type:str]
    unencrypted_suffix: _unencrypted
    version: 3.11.0