From 6e5ef7ddf597dc7ebf8edfb1fd4334ea707c72d3 Mon Sep 17 00:00:00 2001 From: albert Date: Wed, 20 Mar 2024 17:26:47 +0900 Subject: [PATCH] Test --- lib/default.nix | 5 ++--- nixos/hosts/framework-server/containers.nix | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/default.nix b/lib/default.nix index 27747578..3c01edd5 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -73,7 +73,7 @@ type ? "default", repo ? "nixpkgs", unfree ? false - }:inputs.${repo}.lib.nixosSystem { + }: inputs.${repo}.lib.nixosSystem { specialArgs = { inherit inputs outputs desktop hostname username hmStateVersion stateVersion gpu system theme self; # Choose whether to pull from stable or unstable pkgs = import inputs.${repo} { @@ -132,8 +132,7 @@ gpu ? null, theme ? "stylix", format - }: - inputs.nixos-generators.nixosGenerate { + }: inputs.nixos-generators.nixosGenerate { specialArgs = { inherit inputs outputs desktop hostname username stateVersion hmStateVersion gpu system theme format; }; system = system; format = format; diff --git a/nixos/hosts/framework-server/containers.nix b/nixos/hosts/framework-server/containers.nix index 675f7224..509774d4 100644 --- a/nixos/hosts/framework-server/containers.nix +++ b/nixos/hosts/framework-server/containers.nix @@ -3,6 +3,6 @@ let libx = import ../../../lib {inherit self inputs outputs stateVersion hmStateVersion; }; in { containers = { - rdesktop = libx.mkContainer { container = "rdesktop"; }; + rdesktop = libx.mkContainer { container = "rdesktop"; desktop = "xfce";}; }; }