From 1f1c1f83abbc9eb8ac402d69ec163a354a628930 Mon Sep 17 00:00:00 2001 From: albert Date: Tue, 25 Jun 2024 12:23:53 +0900 Subject: [PATCH] Update rdesktop --- nixos/common/desktops/plasma6/default.nix | 5 +---- nixos/common/modules/ssh-luks.nix | 3 ++- nixos/containers/rdesktop/default.nix | 2 ++ 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/common/desktops/plasma6/default.nix b/nixos/common/desktops/plasma6/default.nix index e248c7f4..694971c3 100644 --- a/nixos/common/desktops/plasma6/default.nix +++ b/nixos/common/desktops/plasma6/default.nix @@ -22,10 +22,7 @@ environment.systemPackages = with pkgs; [ arc-kde-theme arc-theme - papirus-icon-theme - plasma-theme-switcher - tailscale-systray - la-capitaine-icon-theme + gnome-keyring ]; services.xrdp.defaultWindowManager = "startplasma-x11"; diff --git a/nixos/common/modules/ssh-luks.nix b/nixos/common/modules/ssh-luks.nix index 5601754b..7ca7517e 100644 --- a/nixos/common/modules/ssh-luks.nix +++ b/nixos/common/modules/ssh-luks.nix @@ -1,4 +1,4 @@ -{ inputs, config, lib, pkgs, modulesPath, desktop, username, ... }: { +{ ... }: { # https://nixos.wiki/wiki/Remote_LUKS_Unlocking # Unlock command: # ssh root@ "Password" @@ -27,6 +27,7 @@ ]; hostKeys = [ # Generate new keys with: + # CAUTION: You WANT to generate a new key. This is stored plaintext in /boot # ssh-keygen -t rsa -N "" -f /boot/ssh_host_rsa_key "/boot/ssh_host_rsa_key" ]; diff --git a/nixos/containers/rdesktop/default.nix b/nixos/containers/rdesktop/default.nix index 9ba50ce9..9367b25e 100644 --- a/nixos/containers/rdesktop/default.nix +++ b/nixos/containers/rdesktop/default.nix @@ -4,6 +4,8 @@ ../../common/desktops/${desktop} ../../common/packages ../../common/modules/fonts.nix + ../../common/services/gnupg-agent.nix + ../../common/software/cli/clean-hm.nix ]; hardware.pulseaudio.enable = lib.mkDefault true;