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

Author: DataEraserC

flake.lock

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, pkgs-latest, ... }:
 {
   home.packages = with pkgs; [
     # nix related
@@ -91,6 +91,7 @@
   # Additionally, it provides optional and fully encrypted
   # synchronisation of your history between machines, via an Atuin server.
   programs.atuin = {
+    # package = pkgs-latest.atuin;
     enable = true;
     enableBashIntegration = true;
     enableZshIntegration = true;

home/base/core/core.nix

@@ -3,7 +3,7 @@
   # make `npm install -g <pkg>` happey
   #
   # mainly used to install npm packages that updates frequently
-  # such as gemini-cli, claude-code, etc.
+  # such as opencode, codex, etc.
   home.file.".npmrc".text = ''
     prefix=${config.home.homeDirectory}/.npm
   '';

home/base/core/npm.nix

@@ -11,6 +11,6 @@
     pkgs.aichat # A ai cli interface
     # LaphaeL-aicmd.packages.${pkgs.system}.laphael_aicmd
 
-    pkgs.opencode
+    # pkgs.opencode # now we install this using npm
   ];
 }

home/base/tui/custom/ai/onlineai.nix

@@ -36,6 +36,8 @@
 
     # ai related
     python313Packages.huggingface-hub # huggingface-cli
+    python313Packages.modelscope
+    yt-dlp # youtube/bilibili/soundcloud/... video/music downloader
 
     # misc
     devbox

home/base/tui/dev-tools.nix

@@ -96,15 +96,15 @@
           vscode-extensions.vadimcn.vscode-lldb.adapter # codelldb - debugger
 
           #-- python
+          uv # python project package manager
+          pipx # Install and Run Python Applications in Isolated Environments
           (python313.withPackages (
             ps: with ps; [
               # python language server
               pyright
               ruff
 
-              pipx # Install and Run Python Applications in Isolated Environments
               black # python formatter
-              uv # python project package manager
 
               # my commonly used python packages
               jupyter

home/base/tui/editors/packages.nix

@@ -12,28 +12,6 @@
     extraConfig = ''
       source /etc/agenix/alias-for-work.nushell
 
-      $env.CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC = "1"
-      # using claude-code with kimi k2
-      # https://platform.moonshot.cn/docs/guide/agent-support
-      # $env.ANTHROPIC_BASE_URL = "https://api.moonshot.cn/anthropic/"
-      # $env.ANTHROPIC_AUTH_TOKEN = $env.MOONSHOT_API_KEY
-      # $env.ANTHROPIC_MODEL = "kimi-k2-thinking"
-      # $env.ANTHROPIC_DEFAULT_HAIKU_MODEL = "kimi-k2-thinking-turbo"
-
-      # using claude-code with glm llm
-      # https://docs.bigmodel.cn/cn/coding-plan/tool/claude
-      $env.ANTHROPIC_BASE_URL = "https://open.bigmodel.cn/api/anthropic"
-      $env.ANTHROPIC_AUTH_TOKEN = $env.ZAI_API_KEY
-      $env.ANTHROPIC_MODEL = "glm-4.7"
-      $env.ANTHROPIC_DEFAULT_HAIKU_MODEL = "glm-4.5-air"
-
-      # using claude-code with qwen llm
-      # 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_DEFAULT_HAIKU_MODEL = "qwen-turbo"
-
       # Directories in this constant are searched by the
       # `use` and `source` commands.
       const NU_LIB_DIRS = $NU_LIB_DIRS ++ ['${nu_scripts}']

home/base/tui/shell/default.nix

@@ -1,7 +1,7 @@
-{ lib, ... }:
+{ config, lib, ... }:
 let
   envExtra = ''
-    export PATH="$PATH:/opt/homebrew/bin:/usr/local/bin"
+    export PATH="/opt/homebrew/bin:/usr/local/bin:$PATH"
   '';
   # copied from the content generated by `conda init bash`
   initContent = ''
@@ -34,6 +34,7 @@ in
   };
   programs.zsh = {
     enable = true;
+    dotDir = "${config.xdg.configHome}/zsh";
     inherit envExtra initContent;
   };
 }

home/darwin/shell.nix

@@ -17,8 +17,6 @@ in
 {
   home.packages = [
     pkgs-master.code-cursor
-    pkgs-master.zed-editor
-    # pkgs-master.antigravity-fhs
   ];
 
   programs.vscode = {

home/linux/gui/base/editors.nix

@@ -28,7 +28,7 @@
       enable = true;
       createDirectories = true;
       extraConfig = {
-        XDG_SCREENSHOTS_DIR = "${config.xdg.userDirs.pictures}/Screenshots";
+        SCREENSHOTS = "${config.xdg.userDirs.pictures}/Screenshots";
       };
     };
   };