From 1237c68b8f772a9cb2fa951fc31570ba5540e2aa Mon Sep 17 00:00:00 2001
From: ryan4yin <xiaoyin_c@qq.com>
Date: Tue, 9 May 2023 21:37:11 +0800
Subject: [PATCH] feat: add im app: qq

---
 flake.nix                  | 12 ------------
 home/programs/common.nix   |  9 +++++++--
 home/programs/default.nix  |  1 -
 home/programs/nixos-cn.nix | 23 -----------------------
 4 files changed, 7 insertions(+), 38 deletions(-)
 delete mode 100644 home/programs/nixos-cn.nix

diff --git a/flake.nix b/flake.nix
index b7349496..26a9c0fc 100644
--- a/flake.nix
+++ b/flake.nix
@@ -19,13 +19,11 @@
     extra-substituters = [
       "https://nix-community.cachix.org"
       "https://nixpkgs-wayland.cachix.org"
-      # "https://nixos-cn.cachix.org"
     ];
     extra-trusted-public-keys = [
       "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
       "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
       "nixpkgs-wayland.cachix.org-1:3lwxaILxMRkVhehr5StQprHdEo4IrE8sRho9R9HOLYA="
-      # "nixos-cn.cachix.org-1:L0jEaL6w7kwQOPlLoCR3ADx+E3Q8SEFEcB9Jaibl0Xg="
     ];
   };
 
@@ -46,13 +44,6 @@
     hyprland.url = "github:hyprwm/Hyprland";
     # community wayland nixpkgs
     nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland";
-
-    # # nixos-cn 提供了一些国内常用的程序包，如 qq wechat dingtalk 等
-    # nixos-cn = {
-    #   url = "github:nixos-cn/flakes";
-    #   # 强制 nixos-cn 和该 flake 使用相同版本的 nixpkgs
-    #   inputs.nixpkgs.follows = "nixpkgs";
-    # };
   };
 
   # outputs 的参数都是 inputs 中定义的依赖项，可以通过它们的名称来引用。
@@ -63,7 +54,6 @@
       nixpkgs,
       nixpkgs-stable,
       home-manager,
-      # nixos-cn,
       ...
   }: {
     # 名为 nixosConfigurations 的 outputs 会在执行 `nixos-rebuild switch --flake .` 时被使用
@@ -88,7 +78,6 @@
         # nix flake 的 modules 系统可将配置模块化，提升配置的可维护性
         # 默认只能传上面这四个参数，如果需要传其他参数，必须使用 specialArgs
         specialArgs = {
-          # inherit nixos-cn;
           inherit nixpkgs-stable;
         }; 
         modules = [
@@ -121,7 +110,6 @@
         system = "x86_64-linux";
 
         specialArgs = {
-          # inherit nixos-cn;
           inherit nixpkgs-stable;
         }; 
         modules = [
diff --git a/home/programs/common.nix b/home/programs/common.nix
index 0dda6c34..3c0db0ec 100644
--- a/home/programs/common.nix
+++ b/home/programs/common.nix
@@ -85,9 +85,14 @@
     mycli
     pgcli
 
-    # desktop
-    tdesktop
+    # instant messaging
+    telegram-desktop
     discord
+    # qq & wechat are alse in the official nixpkgs
+    qq      # https://github.com/NixOS/nixpkgs/tree/master/pkgs/applications/networking/instant-messengers/qq
+
+    # music
+    musescore
 
     # system call monitoring
     strace
diff --git a/home/programs/default.nix b/home/programs/default.nix
index 96ea884d..11941d5b 100644
--- a/home/programs/default.nix
+++ b/home/programs/default.nix
@@ -8,7 +8,6 @@
     ./common.nix
     ./git.nix
     ./media.nix
-    # ./nixos-cn.nix
     ./xdg.nix
   ];
 }
\ No newline at end of file
diff --git a/home/programs/nixos-cn.nix b/home/programs/nixos-cn.nix
deleted file mode 100644
index f42ca70f..00000000
--- a/home/programs/nixos-cn.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  pkgs,
-  config,
-  nixos-cn,
-  ...
-}:
-{
-  imports = [
-    # 将 nixos-cn flake 提供的 registry 添加到全局 registry 列表中
-    # 可在`nixos-rebuild switch`之后通过`nix registry list`查看
-    nixos-cn.nixosModules.nixos-cn-registries
-
-    # 引入nixos-cn flake提供的NixOS模块
-    nixos-cn.nixosModules.nixos-cn
-  ];
-
-  # # 使用 nixos-cn flake 提供的包
-  home.packages = with nixos-cn.legacyPackages.${pkgs.system}; [
-      # qq
-      # wechat-uos           # TODO failed to install
-      netease-cloud-music  # TODO chinese font missing
-    ];
-}
\ No newline at end of file