darwin: unbreak

darwin/modules/default.nix

@@ -1,6 +1,6 @@
 {...}: {
   imports = [
     ./networking/proxy.nix
-    ./services/clash.nix
+    ./services/mihomo.nix
   ];
 }

darwin/modules/services/mihomo.nix

@@ -4,13 +4,12 @@
   pkgs,
   ...
 }: let
-  cfg = config.services.clash;
+  cfg = config.services.mihomo;
 in {
-  options.services.clash = {
+  options.services.mihomo = {
-    enable = lib.mkEnableOption "Whether to enable Clash, A rule-based proxy in Go.";
+    enable = lib.mkEnableOption "Whether to enable Mihomo, A rule-based proxy in Go.";
-    package = lib.mkPackageOption pkgs "clash" {};
+    package = lib.mkPackageOption pkgs "mihomo" {};
     configFile = lib.mkOption {
-      default = null;
       type = lib.types.nullOr lib.types.path;
       description = "Configuration file to use.";
     };
@@ -20,7 +19,6 @@ in {
       description = ''
         Local web interface to use.
 
-        You can also use the following website, just in case:
         - metacubexd:
           - http://d.metacubex.one
           - https://metacubex.github.io/metacubexd
@@ -41,11 +39,11 @@ in {
   config = lib.mkIf cfg.enable {
     ### launchd service
     # TODO: not run as root user
-    launchd.daemons."clash" = {
+    launchd.daemons."mihomo" = {
       command = builtins.concatStringsSep " " [
         (lib.getExe cfg.package)
-        "-d /etc/clash"
+        "-d /etc/mihomo"
-        (lib.optionalString (cfg.configFile != null) "-f ${cfg.configFile}")
+        cfg.configFile
         (lib.optionalString (cfg.webui != null) "-ext-ui ${cfg.webui}")
         (lib.optionalString (cfg.extraOpts != null) cfg.extraOpts)
       ];

darwin/profiles/common/opt-in/gaming/default.nix

@@ -1,8 +0,0 @@
-{
-  ### home-manager
-  home-manager.users.guanranwang = import ./home;
-
-  homebrew.casks = [
-    "steam"
-  ];
-}

darwin/profiles/common/opt-in/gaming/home/default.nix

@@ -1,5 +0,0 @@
-{...}: {
-  imports = [
-    ../../../../../home/applications/prismlauncher
-  ];
-}

darwin/profiles/common/opt-in/mihomo.nix

@@ -1,12 +1,7 @@
-{
+{pkgs, ...}: {
-  pkgs,
+  services.mihomo = {
-  config,
-  ...
-}: {
-  services.clash = {
     enable = true;
-    package = pkgs.clash-meta;
+    webui = pkgs.metacubexd;
-    webui = config.nur.repos.guanran928.metacubexd;
   };
 
   ### System proxy settings

darwin/profiles/desktop/home/default.nix

@@ -6,7 +6,7 @@
 }: {
   imports = map (n: ../../../../home/applications/${n}) [
     "go"
-    "mpv"
+    # "mpv"
     "nix"
   ];
 

darwin/profiles/desktop/packages/fonts.nix

@@ -1,6 +1,5 @@
 {pkgs, ...}: {
-  fonts.fontDir.enable = true;
+  fonts.packages = with pkgs; [
-  fonts.fonts = with pkgs; [
     (nerdfonts.override {fonts = ["JetBrainsMono"];})
   ];
 }