Reset from 11afc51

Author: DataEraserC

.gitignore

@@ -1,3 +1,7 @@
 result
 result/
+secrets/
+!secrets/README.md
+!secrets/darwin.nix
+!secrets/nixos.nix
 .DS_Store

Makefile

@@ -11,16 +11,16 @@
 ############################################################################
 
 i3: 
-	nixos-rebuild switch --flake .#ai_i3 --use-remote-sudo
+	nixos-rebuild switch --flake .#y9000k2021h_i3 --use-remote-sudo
 
 hypr:
-	nixos-rebuild switch --flake .#ai_hyprland --use-remote-sudo
+	nixos-rebuild switch --flake .#y9000k2021h_hyprland --use-remote-sudo
 
 i3-debug:
-	nixos-rebuild switch --flake .#ai_i3 --use-remote-sudo --show-trace --verbose
+	nixos-rebuild switch --flake .#y9000k2021h_i3 --use-remote-sudo --show-trace --verbose
 
 hypr-debug:
-	nixos-rebuild switch --flake .#ai_hyprland --use-remote-sudo --show-trace --verbose
+	nixos-rebuild switch --flake .#y9000k2021h_hyprland --use-remote-sudo --show-trace --verbose
 
 up:
 	nix flake update

flake.lock

@@ -15,6 +15,7 @@
   # The `@` syntax here is used to alias the attribute set of the inputs's parameter, making it convenient to use inside the function.
   outputs = inputs @ {
     self,
+    nur,
     nixpkgs,
     nixpkgs-unstable,
     nix-darwin,
@@ -24,9 +25,9 @@
     nixos-rk3588,
     ...
   }: let
-    username = "ryan";
-    userfullname = "Ryan Yin";
-    useremail = "xiaoyin_c@qq.com";
+    username = "nixos";
+    userfullname = "DataEraserC";
+    useremail = "102341238+DataEraserC@users.noreply.github.com";
 
     x64_system = "x86_64-linux";
     x64_darwin = "x86_64-darwin";
@@ -38,6 +39,24 @@
     macosSystem = import ./lib/macosSystem.nix;
     colmenaSystem = import ./lib/colmenaSystem.nix;
 
+      # y9000k2021h
+    idol_y9000k2021h_modules_i3 = {
+      nixos-modules = [
+        ./hosts/idols/y9000k2021h
+        ./modules/nixos/i3.nix
+        inputs.nur.nixosModules.nur
+      ];
+      home-module = import ./home/linux/desktop-i3.nix;
+    };
+    idol_y9000k2021h_modules_hyprland = {
+      nixos-modules = [
+        ./hosts/idols/y9000k2021h
+        ./modules/nixos/hyprland.nix
+        inputs.nur.nixosModules.nur
+      ];
+      home-module = import ./home/linux/desktop-hyprland.nix;
+    };
+
     # 星野 アイ, Hoshino Ai
     idol_ai_modules_i3 = {
       nixos-modules = [
@@ -127,7 +146,14 @@
         system = x64_system;
         specialArgs = x64_specialArgs;
       };
+      stable_args = base_args // {inherit nixpkgs nur;};
+      unstable_args = base_args // {nixpkgs = nixpkgs-unstable;inherit nur;};
     in {
+      # y9000k2021h with i3 window manager
+      y9000k2021h_i3 = nixosSystem (idol_y9000k2021h_modules_i3 // stable_args);
+      # y9000k2021h with hyprland compositor
+      y9000k2021h_hyprland = nixosSystem (idol_y9000k2021h_modules_hyprland // stable_args);
+
       # ai with i3 window manager
       ai_i3 = nixosSystem (idol_ai_modules_i3 // base_args);
       # ai with hyprland compositor
@@ -218,6 +244,8 @@
     packages."${x64_system}" =
       # genAttrs returns an attribute set with the given keys and values(host => image).
       nixpkgs.lib.genAttrs [
+        "y9000k2021h_i3"
+        "y9000k2021h_hyprland"
         "ai_i3"
         "ai_hyprland"
       ] (
@@ -280,6 +308,9 @@
     nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05";
     nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
 
+    # NUR package source
+    nur.url = "github:nix-community/NUR";
+
     # for macos
     nixpkgs-darwin.url = "github:nixos/nixpkgs/nixpkgs-23.05-darwin";
     nix-darwin = {
@@ -334,13 +365,14 @@
     # my private secrets, it's a private repository, you need to replace it with your own.
     # use ssh protocol to authenticate via ssh-agent/ssh-key, and shallow clone to save time
     mysecrets = {
-      url = "git+ssh://git@github.com/ryan4yin/nix-secrets.git?shallow=1";
+      url = "git+ssh://git@github.com/DataEraserC/nix-secrets.git?shallow=1";
       flake = false;
     };
 
     # my wallpapers
     wallpapers = {
-      url = "github:ryan4yin/wallpapers";
+      url = "github:Program-Learning/wallpapers";
+      # url = "git+file:////home/nixos/Documents/code/wallpapers?shallow=1";
       flake = false;
     };
 
@@ -349,6 +381,11 @@
       # inputs.nixpkgs.follows = "nixpkgs";
     };
 
+    nur-program-learning = {
+      url = "github:Program-Learning/nur-packages";
+      # inputs.nixpkgs.follows = "nixpkgs";
+    };
+
     # riscv64 SBCs
     nixos-licheepi4a.url = "github:ryan4yin/nixos-licheepi4a";
     # nixos-jh7110.url = "github:ryan4yin/nixos-jh7110";
@@ -408,6 +445,7 @@
     substituters = [
       # my own cache server
       "https://ryan4yin.cachix.org"
+      "https://program-learning.cachix.org"
       # replace official cache with a mirror located in China
       "https://mirrors.ustc.edu.cn/nix-channels/store"
       "https://cache.nixos.org"
@@ -423,6 +461,7 @@
     extra-trusted-public-keys = [
       "ryan4yin.cachix.org-1:Gbk27ZU5AYpGS9i3ssoLlwdvMIh0NxG0w8it/cv9kbU="
       "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
+      "program-learning.cachix.org-1:Pfl2r+J5L9wJqpDnop6iQbrR3/Ts4AUyotu89INRlSU="
       "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
       "nixpkgs-wayland.cachix.org-1:3lwxaILxMRkVhehr5StQprHdEo4IrE8sRho9R9HOLYA="
       "anyrun.cachix.org-1:pqBobmOjI7nKlsUMV25u9QHa9btJK65/C8vnO3p346s="

flake.nix

@@ -26,6 +26,13 @@
     # python
     (python311.withPackages (ps:
       with ps; [
+        ipykernel jupyterlab 
+        matplotlib numpy seaborn
+        networkx
+        beautifulsoup4
+        selenium
+        urllib3
+
         ipython
         pandas
         requests
@@ -47,6 +54,7 @@
     bfg-repo-cleaner  # remove large files from git history
     k6 # load testing tool
     mitmproxy # http/https proxy tool
+    tcpdump
     protobuf # protocol buffer compiler
   ];
 

home/base/desktop/development.nix

@@ -26,6 +26,7 @@ return {
     { import = "astrocommunity.scrolling.nvim-scrollbar" },
     { import = "astrocommunity.editing-support.auto-save-nvim" },
     { import = "astrocommunity.editing-support.todo-comments-nvim" },
+    { import = "astrocommunity.editing-support.suda-vim" },
     -- Language Support
     ---- Frontend & NodeJS
     { import = "astrocommunity.pack.typescript-all-in-one" },
@@ -73,6 +74,14 @@ return {
       end,
     },
 
+    {
+      "skyfireitdiy/codegeex-vim"
+    },
+
+    {
+      "neoclide/coc.nvim"
+    },
+
     -- markdown preview
     {
       '0x00-ketsu/markdown-preview.nvim',