diff --git a/lib/default.nix b/lib/default.nix index 4da30f62..18825796 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -57,17 +57,13 @@ restartIfChanged = true; enableTun = true; specialArgs = { inherit pkgs-unstable hostname username desktop theme system repo unfree ip deployment_type host inputs outputs; }; - config = { hostname, username, desktop, theme, system, host, ... }: { + config = { }: { nixpkgs.pkgs = pkgs; imports = [ ../nixos/containers inputs.sops-nix.nixosModules.sops inputs.home-manager.nixosModules.home-manager ]; - home-manager = { - extraSpecialArgs = { inherit inputs outputs desktop hostname username system theme host; }; - users."${username}" = import ../home-manager; - }; }; }; diff --git a/nixos/containers/rdesktop/default.nix b/nixos/containers/rdesktop/default.nix index de0343dc..bd3e266a 100644 --- a/nixos/containers/rdesktop/default.nix +++ b/nixos/containers/rdesktop/default.nix @@ -20,6 +20,9 @@ "f /home/albert/.config/dconf/user.UMZ112 0644 albert users -" ]; + # Import home-manager + home-manager.users."${username}" = import ../../../home-manager/; + services.xrdp = { enable = true; openFirewall = true;