Merge branch 'main' of ssh://github.com/ryan4yin/nix-config

Author: DataEraserC

flake.lock

@@ -70,7 +70,7 @@
     # nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
 
     # nixpkgs with some custom patches
-    nixpkgs-patched.url = "github:ryan4yin/nixpkgs/nixos-unstable-patched";
+    nixpkgs-patched.url = "github:ryan4yin/nixpkgs/nixos-unstable";
     # get some latest packages from the master branch
     nixpkgs-master.url = "github:nixos/nixpkgs/master";
 
@@ -163,7 +163,7 @@
     };
 
     nixos-apple-silicon = {
-      # asahi-6.17.7-2
+      # asahi-6.18.9
       url = "github:nix-community/nixos-apple-silicon";
       inputs.nixpkgs.follows = "nixpkgs";
     };

flake.nix

@@ -18,17 +18,15 @@ let
     aarch64-linux = {
       version = "4.1.0.13";
       src = fetchurl {
-        # url = "https://web.archive.org/web/20251209092116if_/https://dldir1v6.qq.com/weixin/Universal/Linux/WeChatLinux_arm64.AppImage";
         url = "https://dldir1v6.qq.com/weixin/Universal/Linux/WeChatLinux_arm64.AppImage";
-        hash = "sha256-/d5crM6IGd0k0fSlBSQx4TpIVX/8iib+an0VMkWMNdw=";
+        hash = "sha256-o6a7773agYqrP4dXsjzSUT2Du77gZ4wN1F2e0uvEzVc=";
       };
     };
     x86_64-linux = {
       version = "4.1.0.13";
       src = fetchurl {
-        # url = "https://web.archive.org/web/20251219062558if_/https://dldir1v6.qq.com/weixin/Universal/Linux/WeChatLinux_x86_64.AppImage";
         url = "https://dldir1v6.qq.com/weixin/Universal/Linux/WeChatLinux_x86_64.AppImage";
-        hash = "sha256-+r5Ebu40GVGG2m2lmCFQ/JkiDsN/u7XEtnLrB98602w=";
+        hash = "sha256-Pfl81lNVlMJWyPqFli1Af2q8pRLujcKCjYoILCKDx8U=";
       };
     };
   };

hardening/bwraps/wechat.nix

@@ -22,7 +22,7 @@ in
   nixpkgs.overlays = [
     (_: super: {
       nixpaks = {
-        qq = wrapper pkgs-master ./qq.nix;
+        qq = wrapper super ./qq.nix;
         telegram-desktop = wrapper super ./telegram-desktop.nix;
         firefox = wrapper super ./firefox.nix;
       };

hardening/nixpaks/default.nix

@@ -7,6 +7,7 @@
     # Changing working directory when exiting Yazi
     enableBashIntegration = true;
     enableNushellIntegration = true;
+    shellWrapperName = "yy";
     enableFishIntegration = true;
     settings = {
       mgr = {

home/base/core/yazi.nix

@@ -28,7 +28,7 @@
     kubevirt # virtctl
     pkgs-2505.kubernetes-helm
     fluxcd
-    argocd
+    # argocd
 
     ko # build go project to container image
   ];

home/base/tui/container.nix

@@ -133,14 +133,12 @@ Misc:
 Advance Techs:
 
 - Add at the end of multiple lines: `:normal A<text>`
-
   - Execublock: `:A<text>`
   - visual block mode(ctrl + v)
   - Append text at the end of each line in the selected block
   - If position exceeds line end, neovim adds spaces automatically
 
 - Delete the last char of multivle lines: `:normal $x`
-
   - Execute `$x` on each line
   - visual mode(v)
   - `$` moves cursor to the end of line

home/base/tui/editors/README.md

@@ -31,7 +31,7 @@
       # https://bailian.console.aliyun.com/?tab=doc#/doc/?type=model&url=2949529
       # $env.ANTHROPIC_BASE_URL = "https://dashscope.aliyuncs.com/apps/anthropic"
       # $env.ANTHROPIC_AUTH_TOKEN = $env.DASHSCOPE_API_KEY
-      # $env.ANTHROPIC_MODEL = "qwen-plus" # 千万别用 qwen-max, 价格
+      # $env.ANTHROPIC_MODEL = "qwen-plus" # 千万别用 qwen-max, 超级无敌贵
       # $env.ANTHROPIC_DEFAULT_HAIKU_MODEL = "qwen-turbo"
 
       # Directories in this constant are searched by the

home/base/tui/editors/neovim/nvim/lua/plugins/avante.lua

@@ -13,43 +13,12 @@ let
     # (for example gnome-keyring, kwallet5, KeepassXC)
     "--password-store=gnome-libsecret"
   ];
-
-  code-cursor = pkgs-master.code-cursor;
-  # (pkgs-master.code-cursor.override {
-  #   commandLineArgs = lib.concatStringsSep " " vscodeCliArgs;
-  # }).overrideAttrs
-  #   (oldAttrs: rec {
-  #     pname = "cursor";
-  #     version = "2.1.36";
-  #     src =
-  #       with pkgs-master;
-  #       appimageTools.extract {
-  #         inherit pname version;
-  #         src =
-  #           let
-  #             sources = {
-  #               x86_64-linux = fetchurl {
-  #                 # curl -s https://api2.cursor.sh/updates/api/download/stable/linux-x64/cursor | jq
-  #                 url = "https://downloads.cursor.com/production/9cd7c8b6cebcbccc1242df211dee45a4b6fe15e4/linux/x64/Cursor-2.1.36-x86_64.AppImage";
-  #                 hash = "sha256-aaprRB2BAaUCHj7m5aGacCBHisjN2pVZ+Ca3u1ifxBA=";
-  #               };
-  #               aarch64-linux = fetchurl {
-  #                 # curl -s https://api2.cursor.sh/updates/api/download/stable/linux-arm64/cursor | jq
-  #                 url = "https://downloads.cursor.com/production/9cd7c8b6cebcbccc1242df211dee45a4b6fe15e4/linux/arm64/Cursor-2.1.36-aarch64.AppImage";
-  #                 hash = "sha256-S2vFYBI6m0zjBJEDbk7gc6/zFiKWyhM73OUm1xsNx6Q=";
-  #               };
-  #             };
-  #           in
-  #           sources.${stdenv.hostPlatform.system};
-  #       };
-  #     sourceRoot = "${pname}-${version}-extracted/usr/share/cursor";
-  #   });
 in
 {
   home.packages = [
-    pkgs-stable.zed-editor
     pkgs-master.code-cursor
-    pkgs-master.antigravity-fhs
+    pkgs-master.zed-editor
+    # pkgs-master.antigravity-fhs
   ];
 
   programs.vscode = {