123

devices/laptop.nix

@@ -11,7 +11,9 @@ let
       ...
     }:
     {
-      device.type = "primary";
+      xlib.device = {
+        type = "primary";
+      };
 
       imports =
         with inputs;
@@ -28,6 +30,12 @@ let
         ]
         ++ builtins.attrValues inputs.self.nixosModules.extra.self;
 
+      home-manager = {
+        extraSpecialArgs = {
+          xlib = config.xlib;
+        };
+      };
+
       fileSystems = {
         "${config.xlib.dirs.therima-drive}" = {
           device = "/dev/disk/by-uuid/C0A2DDEFA2DDEA44";

devices/mini-laptop.nix

@@ -11,15 +11,24 @@ let
       ...
     }:
     {
-      device.type = "primary";
+      xlib.device = {
+        type = "primary";
+        hostname = "lamet";
+      };
 
       imports = with inputs; [
+        self.homeConfigurations.default.nixosModule
         self.nixosModules.default
 
         nixos-hardware.nixosModules.chuwi-minibook-x
-        home-manager.nixosModules.home-manager # home-manager module
-        self.homeConfigurations.oqyude.nixosModule # home-manager configuration module
       ];
+
+      home-manager = {
+        extraSpecialArgs = {
+          xlib = config.xlib;
+        };
+      };
+
       hardware.intel-gpu-tools.enable = true;
     };
 in

devices/mini-pc.nix

@@ -32,6 +32,12 @@ let
         # self.homeConfigurations.root.nixosModule
       ];
 
+      home-manager = {
+        extraSpecialArgs = {
+          xlib = config.xlib;
+        };
+      };
+
       sops = {
         defaultSopsFile = ./secrets/example.yaml;
         age.keyFile = "/var/lib/sops-nix/key.txt";