From d8a4bde3570b31f2131538dc0bb26a0039d23bbd Mon Sep 17 00:00:00 2001
From: ryan4yin <xiaoyin_c@qq.com>
Date: Sun, 14 May 2023 17:21:13 +0800
Subject: [PATCH] feat: replace vscode by code-server temporarily, adjust
 flake.nix

---
 flake.nix                     | 37 ++---------------------------------
 hosts/msi-rtx4090/default.nix | 17 +++++++++++++++-
 hosts/nixos-test/default.nix  | 16 ++++++++++++++-
 3 files changed, 33 insertions(+), 37 deletions(-)

diff --git a/flake.nix b/flake.nix
index e2bf918f..d5dc52e9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -59,18 +59,14 @@
   outputs = inputs@{
       self,
       nixpkgs,
-      nixpkgs-stable,
       home-manager,
-      nur,
       ...
   }: {
     nixosConfigurations = {
       msi-rtx4090 = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
 
-        specialArgs = {
-          inherit nixpkgs-stable;
-        }; 
+        specialArgs = inputs; 
         modules = [
           ./hosts/msi-rtx4090
 
@@ -85,29 +81,13 @@
             home-manager.extraSpecialArgs = inputs;
             home-manager.users.ryan = import ./home;
           }
-
-          ({pkgs, config, ... }: {
-            config = {
-              # use it as an overlay
-              nixpkgs.overlays = [ 
-                inputs.nixpkgs-wayland.overlay
-              ];
-            };
-          })
-
-          # This adds a nur configuration option.
-          # Use `config.nur.repos.<user>.<package-name>` in NixOS Module for packages from the NUR.
-          nur.nixosModules.nur
-          
         ];
       };
 
 
       nixos-test = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
-        specialArgs = {
-          inherit nixpkgs-stable;
-        }; 
+        specialArgs = inputs; 
         modules = [
           ./hosts/nixos-test
 
@@ -122,19 +102,6 @@
             home-manager.extraSpecialArgs = inputs;
             home-manager.users.ryan = import ./home;
           }
-
-          ({pkgs, config, ... }: {
-            config = {
-              # use it as an overlay
-              nixpkgs.overlays = [ 
-                inputs.nixpkgs-wayland.overlay
-              ];
-            };
-          })
-
-          # This adds a nur configuration option.
-          # Use `config.nur.repos.<user>.<package-name>` in NixOS Module for packages from the NUR.
-          nur.nixosModules.nur
         ];
       };
 
diff --git a/hosts/msi-rtx4090/default.nix b/hosts/msi-rtx4090/default.nix
index 8d8c8766..056457c9 100644
--- a/hosts/msi-rtx4090/default.nix
+++ b/hosts/msi-rtx4090/default.nix
@@ -2,11 +2,26 @@
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
 
-{ config, pkgs, ... }:
+
+{ config, pkgs, home-manager, nur, ... } @ args:
 
 {
   imports =
     [
+      ({pkgs, config, ... }: {
+        config = {
+          # use it as an overlay
+          nixpkgs.overlays = [ 
+            args.nixpkgs-wayland.overlay
+          ];
+        };
+      })
+
+      # This adds a nur configuration option.
+      # Use `config.nur.repos.<user>.<package-name>` in NixOS Module for packages from the NUR.
+      nur.nixosModules.nur
+
+
       ./cifs-mount.nix
       ../../modules/system.nix
       ../../modules/hyprland.nix
diff --git a/hosts/nixos-test/default.nix b/hosts/nixos-test/default.nix
index c6c28552..4a3351d8 100644
--- a/hosts/nixos-test/default.nix
+++ b/hosts/nixos-test/default.nix
@@ -2,11 +2,25 @@
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
 
-{ config, pkgs, ... }:
+{ config, pkgs, home-manager, nur, ... } @args:
 
 {
   imports =
     [
+      ({pkgs, config, ... }: {
+        config = {
+          # use it as an overlay
+          nixpkgs.overlays = [ 
+            args.nixpkgs-wayland.overlay
+          ];
+        };
+      })
+
+      # This adds a nur configuration option.
+      # Use `config.nur.repos.<user>.<package-name>` in NixOS Module for packages from the NUR.
+      nur.nixosModules.nur
+
+
       ../../modules/system.nix
       ../../modules/hyprland.nix
       ../../modules/fcitx5