Reset from 838c34a

.gitignore

@@ -1,3 +1,4 @@
 result
 result/
+secrets/
 .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.nix

@@ -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;
     colemnaSystem = 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;
     };
 

home/base/desktop/development.nix

@@ -44,6 +44,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/linux/desktop/creative.nix

@@ -14,6 +14,34 @@
 
   programs = {
     # live streaming
-    obs-studio.enable = true;
+    obs-studio = {
+      enable = true;
+      plugins = with pkgs; [
+        # screen capture
+        obs-studio-plugins.wlrobs
+        # obs-studio-plugins.obs-ndi
+        obs-studio-plugins.obs-vaapi
+        obs-studio-plugins.obs-nvfbc
+        obs-studio-plugins.obs-teleport
+        # obs-studio-plugins.obs-hyperion
+        obs-studio-plugins.droidcam-obs
+        obs-studio-plugins.obs-vkcapture
+        obs-studio-plugins.obs-gstreamer
+        obs-studio-plugins.obs-3d-effect
+        obs-studio-plugins.input-overlay
+        obs-studio-plugins.obs-multi-rtmp
+        obs-studio-plugins.obs-source-clone
+        obs-studio-plugins.obs-shaderfilter
+        obs-studio-plugins.obs-source-record
+        obs-studio-plugins.obs-livesplit-one
+        obs-studio-plugins.looking-glass-obs
+        obs-studio-plugins.obs-vintage-filter
+        obs-studio-plugins.obs-command-source
+        obs-studio-plugins.obs-move-transition
+        obs-studio-plugins.obs-backgroundremoval
+        obs-studio-plugins.advanced-scene-switcher
+        obs-studio-plugins.obs-pipewire-audio-capture
+      ];
+    };
   };
 }