refactor: custom packages

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

@@ -15,7 +15,6 @@
     ./vault.nix
     ./homepage.nix
     ./code.nix
-    ./yesplaymusic.nix
     ./ai.nix
     ./grafana.nix
     ./note.nix

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

@@ -302,21 +302,6 @@
           customDomains = [ "coder.imxyy.top" ];
         }
 
-        {
-          name = "music-http";
-          type = "http";
-          localIP = "127.0.0.1";
-          localPort = 80;
-          customDomains = [ "music.imxyy.top" ];
-        }
-        {
-          name = "music-https";
-          type = "https";
-          localIP = "127.0.0.1";
-          localPort = 443;
-          customDomains = [ "music.imxyy.top" ];
-        }
-
         {
           name = "ai-http";
           type = "http";
@@ -347,21 +332,6 @@
           customDomains = [ "grafana.imxyy.top" ];
         }
 
-        {
-          name = "note-http";
-          type = "http";
-          localIP = "127.0.0.1";
-          localPort = 80;
-          customDomains = [ "note.imxyy.top" ];
-        }
-        {
-          name = "note-https";
-          type = "https";
-          localIP = "127.0.0.1";
-          localPort = 443;
-          customDomains = [ "note.imxyy.top" ];
-        }
-
         {
           name = "siyuan-http";
           type = "http";
@@ -533,9 +503,10 @@
 
   systemd.services.ddns-go =
     let
-      ddns-go = pkgs.buildGoModule rec {
-        pname = "ddns-go";
       version = "6.6.7";
+      ddns-go = pkgs.buildGoModule {
+        inherit version;
+        pname = "ddns-go";
         src = pkgs.fetchFromGitHub {
           owner = "jeessy2";
           repo = "ddns-go";

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

@@ -5,26 +5,12 @@
 }:
 {
   sops.secrets = {
-    flatnote-env = {
-      sopsFile = secrets.flatnote;
-      format = "dotenv";
-    };
     siyuan-env = {
       sopsFile = secrets.siyuan;
       format = "dotenv";
     };
   };
   virtualisation.oci-containers.containers = {
-    flatnotes = {
-      image = "dullage/flatnotes:latest";
-      volumes = [
-        "/mnt/nas/flatnotes/data:/data"
-      ];
-      environmentFiles = [
-        "${config.sops.secrets.flatnote-env.path}"
-      ];
-      ports = [ "8093:8080" ];
-    };
     siyuan = {
       image = "apkdv/siyuan-unlock:v3.1.30";
       volumes = [
@@ -52,11 +38,6 @@
     };
   };
   services.caddy.virtualHosts = {
-    "note.imxyy.top" = {
-      extraConfig = ''
-        reverse_proxy :8093
-      '';
-    };
     "sy.imxyy.top" = {
       extraConfig = ''
         reverse_proxy :8095

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

@@ -1,23 +0,0 @@
-{
-  virtualisation.oci-containers.containers."YesPlayMusic" = {
-    image = "git.imxyy.top/imxyy1soope1/yesplaymusic:latest";
-    environment = {
-      "NODE_TLS_REJECT_UNAUTHORIZED" = "0";
-    };
-    volumes = [
-      "/etc/localtime:/etc/localtime:ro"
-    ];
-    ports = [
-      "8088:80/tcp"
-    ];
-    log-driver = "journald";
-  };
-
-  services.caddy.virtualHosts."music.imxyy.top" = {
-    extraConfig = ''
-      reverse_proxy :8088 {
-        header_up X-Real-IP {remote_host}
-      }
-    '';
-  };
-}

config/hosts/imxyy-nix/home.nix

@@ -156,6 +156,8 @@
         ".config/sunshine"
 
         ".gemini"
+        ".claude"
+        ".claude-code-router"
       ];
     };
   };

config/hosts/imxyy-nix/nixos.nix

@@ -138,6 +138,7 @@ in
   users.users.${username}.extraGroups = [ "wireshark" ];
 
   virtualisation.waydroid.enable = true;
+  my.persist.homeDirs = [ ".local/share/waydroid" ];
 
   services.sunshine = {
     enable = true;

modules/desktop/gaming/minecraft.nix

@@ -14,15 +14,17 @@ lib.my.makeSwitch {
   ];
   config' = {
     my.home.home.packages = [
-      pkgs.hmcl
+      (pkgs.hmcl.overrideAttrs {
+        postFixup = ''
+          substituteInPlace $out/share/applications/HMCL.desktop --replace-fail 'Exec=hmcl' 'Exec=sh -c "cd ~/.local/share/hmcl; hmcl"'
+        '';
+      })
+      pkgs.xmcl
     ];
 
     my.persist.homeDirs = [
       ".minecraft"
       ".local/share/hmcl"
     ];
-    my.persist.homeFiles = [
-      ".hmcl.json"
-    ];
   };
 }

modules/desktop/wm/niri/config.nix

@@ -32,6 +32,10 @@
             relative-to = "workspace-view";
           };
         };
+        insert-hint = {
+          enable = true;
+          display.color = "rgba(42, 44, 54, 0.5)";
+        };
         preset-column-widths = [
           { proportion = 0.33333; }
           { proportion = 0.4; }

modules/desktop/wm/niri/waybar/config.nix

@@ -1,7 +1,6 @@
 _: {
   layer = "top";
   position = "top";
-  mod = "dock";
   exclusive = true;
   passthrough = false;
   gtk-layer-shell = true;

pkgs/mono-gtk-theme.nix

@@ -12,7 +12,7 @@ stdenvNoCC.mkDerivation {
     owner = "witalihirsch";
     repo = "Mono-gtk-theme";
     rev = "89fa83a14b4e26c5b8fc4dbfa5558a7df704d5a4";
-    sha256 = "sha256-NaZgOOo5VVTlEand3qWryZ5ceNmyHaEt0aeT7j/KwvE=";
+    hash = "sha256-NaZgOOo5VVTlEand3qWryZ5ceNmyHaEt0aeT7j/KwvE=";
   };
 
   phases = [

pkgs/wps-office-fonts.nix

@@ -2,12 +2,12 @@
   stdenvNoCC,
   fetchurl,
 }:
-stdenvNoCC.mkDerivation rec {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "wps-office-fonts";
   version = "1.0";
 
   src = fetchurl {
-    url = "https://github.com/Universebenzene/wps-office-fonts/archive/refs/tags/v${version}.tar.gz";
+    url = "https://github.com/Universebenzene/wps-office-fonts/archive/refs/tags/v${finalAttrs.version}.tar.gz";
     sha256 = "db01fc07324115b181cb06f50dfe09fd17feee132c46423ee70b260830211224";
   };
 
@@ -29,4 +29,4 @@ stdenvNoCC.mkDerivation rec {
     description = "The wps-office-fonts package contains Founder Chinese fonts";
     homepage = "https://github.com/Universebenzene/wps-office-fonts";
   };
-}
+})

secrets/flatnote.env

@@ -1,15 +0,0 @@
-FLATNOTES_USERNAME=ENC[AES256_GCM,data:0PQXYoefoXiJZ0uC,iv:ZMDEJBDEz6a6p6ZMN3fHCuOV+KhBlsPB449Yd3XoP7o=,tag:uYuqobQom35xKi+GHCbmpw==,type:str]
-FLATNOTES_PASSWORD=ENC[AES256_GCM,data:jC/lVZPDGvcYzXhdnvjs,iv:0O6nNNlWjD5OWIa2ovp2wGqtjtelOLH46dFTpVH0XLg=,tag:H/fSfzI9suDaRgz8Hz8XUQ==,type:str]
-FLATNOTES_SECRET_KEY=ENC[AES256_GCM,data:I8zrSTMRnPNWn7u+KZiQW2YdpAkKOBxRKv7ov7dLLNA=,iv:I4YP4KqyMR6jfofEdYxQ+I9PQjTNQwCgnTUfHnDW55A=,tag:P7QcugaQWMCfb5+G5JdMXw==,type:str]
-PUID=ENC[AES256_GCM,data:ZA==,iv:xfnOzfWvf7gozw9YMTAw2uarfsGHRpx3rsEN5ja1k7w=,tag:yuXkWMkXAUpF7h+AaYW14g==,type:str]
-PGID=ENC[AES256_GCM,data:RA==,iv:m8CO/d9Gh0cjc4QYX6CsUx87Vu5iqtU0uVOsA3AeWgs=,tag:Ri0arOjuwRC83fz4EynVtg==,type:str]
-sops_age__list_0__map_enc=-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDltTWRrUSAyc05U\nSVFwU1hUdzZveUsxaUJKbFAvdlN3UzIvdStXcDkvUlBEaXdXNWlFCmZ4eWlKVklQ\nNHlUYlpFRUJmNmllbDNyckFQQ1crRjF2VUFNZFJqdU9wbDQKLS0tIERVNWpyTTUr\ncUhzeU9FcXZURUNnVXB2SDI0aFljQkNGcWtRb2poaTJuVmsKEHX7jAOPXij+us4Z\nAG7t2j0X4JMi1xDOEaYvfL7GZJ3FQKzDpiyx7ifDp9HUVOrnBidKGC08CZgkCvzj\nl2+42Q==\n-----END AGE ENCRYPTED FILE-----\n
-sops_age__list_0__map_recipient=ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOEFLUkyeaK8ZPPZdVNEmtx8zvoxi7xqS2Z6oxRBuUPO
-sops_age__list_1__map_enc=-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IHJNY1d1ZyBCM24z\nd1RGdnJNQ05mVHRVNDkwZnZMaVBIa3JSR2I3bzJ0NE5UMkNsRWhzClZIMXRwbHQ3\neTdIRUlYSEtaenVMa2dEMkZXblhoSE9TcWo3bGk2OXJrZG8KLS0tIGgwMjg4TnFh\nc1Bkd2FYdStZWktBd21GVHNxZ0FsdVU2aHVnZlFQelgzRUkKIzTyudaXGk1sESbn\noLXLtgjZJFBZRV5s/+bBMgZ81zk5s1O4/vm/HDgxxM4y1VVmss/toxpQUGuAR3gd\ntlvEEQ==\n-----END AGE ENCRYPTED FILE-----\n
-sops_age__list_1__map_recipient=ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB28jpN+h5euh3NtdN+A+EtqgIatC22e4i1TPTioKire
-sops_age__list_2__map_enc=-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IFhGYmtrZyBLV25m\nakVoSjQ3VFBadTk1OUJVcDg0b1huajZDVmtIK2pUb1MxS0g1RjBJCllpdjBpK3lx\nV2ZVa0dPNmFIN3dCeDRvZHpPRW1Wa2dJVlo0dkhLVllwSHMKLS0tIHRHYytINXF1\ncGZLWjdPMHZJM0s3TlRxd3g4VnhkckRUTWRjN0d5OWdUbzgKXaSeWmzdFcW6AEjZ\nIkRk/alyOFnI+18jibEBJaZNo87tAzpVHQxN7mA1mpoMNbqK/Co1Ut3/Q1J/McB7\nqeg//Q==\n-----END AGE ENCRYPTED FILE-----\n
-sops_age__list_2__map_recipient=ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMb5G/ieEYBOng66YeyttBQLThyM6W//z2POsNyq4Rw/
-sops_lastmodified=2025-03-02T03:46:13Z
-sops_mac=ENC[AES256_GCM,data:j/JqiPLHw6a21iJV/qNhAr+4kVkCnXG0uYGEJ4m5K5UerN/nXLzVafa7ciaMzBC1k6KBZwSyuKcQxJt3Q5+R733AD97VgrClSAU8w1pQhlWAUpzD959PwW5dTX8N9G+gih0xcJ5RsMALfWppeTImAAyAoKo1mtxE2MtfQZw1DU4=,iv:jYM3YfA2cbDjKVLHhQ8Rzv90Rg2R4iiY6zFL1N8knv0=,tag:8wRhD2XDZXI9v2j5XHKtqQ==,type:str]
-sops_unencrypted_suffix=_unencrypted
-sops_version=3.9.4