From 49e538439a94c64a04e410f71fbf403c16863e6a Mon Sep 17 00:00:00 2001 From: albert Date: Wed, 20 Mar 2024 14:16:31 +0900 Subject: [PATCH] test --- nixos/common/desktops/xfce/default.nix | 8 +------- nixos/containers/rdesktop.nix | 11 +++++------ 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/nixos/common/desktops/xfce/default.nix b/nixos/common/desktops/xfce/default.nix index 94bf6d28..2b1225b6 100644 --- a/nixos/common/desktops/xfce/default.nix +++ b/nixos/common/desktops/xfce/default.nix @@ -19,11 +19,5 @@ desktopManager.xfce.enable = true; }; - environment.systemPackages = with pkgs; [ - arc-kde-theme - arc-theme - papirus-icon-theme - plasma-theme-switcher - tailscale-systray - ]; + # environment.systemPackages = with pkgs; [ ]; } diff --git a/nixos/containers/rdesktop.nix b/nixos/containers/rdesktop.nix index 1aa64daa..372fc56d 100644 --- a/nixos/containers/rdesktop.nix +++ b/nixos/containers/rdesktop.nix @@ -1,22 +1,21 @@ -{ username, stateVersion, ... }: { +{ ... }: { networking.firewall.allowedTCPPorts = [ 3390 ]; - containers.desktop = { + containers.rdesktop = { autoStart = true; privateNetwork = false; - config = { config, pkgs, lib, ... }: { + config = { config, pkgs, lib, username, stateVersion, ... }: { networking.hostName = "nixos-rdesktop"; system.stateVersion = stateVersion; imports = [ - ../common/desktops/xfce - ../users/${username} + ../../common/desktops/xfce ]; networking.firewall = { enable = true; allowedTCPPorts = [ 3390 ]; - }; + }; services.xrdp = { enable = true;