Going to bed.

This commit is contained in:
albert 2024-03-20 22:59:42 +09:00
parent cfc020613e
commit 5d1fded15c
No known key found for this signature in database
GPG key ID: 64F6C4EB46C4543A
4 changed files with 20 additions and 10 deletions

View file

@ -75,6 +75,8 @@
"albert@backups-rpi4" = libx.mkHome { hostname = "backups-rpi4"; system = "aarch64-linux"; type = "small"; };
"albert@piaware-rpi4" = libx.mkHome { hostname = "piaware-rpi4"; system = "aarch64-linux"; type = "small"; };
"albert@quitman-rpi4" = libx.mkHome { hostname = "quitman-rpi4"; system = "aarch64-linux"; type = "small"; };
# Containers
"albert@nixos-rdesktop" = libx.mkHome { hostname = "nixos-rdesktop"; };
};
deploy.nodes = {
osaka-linode-01 = libx.deploy { hostname = "osaka-linode-01"; };

View file

@ -47,8 +47,9 @@
}: {
autoStart = true;
privateNetwork = false;
specialArgs = { inherit pkgs pkgs-unstable container username desktop theme system repo unfree; };
config = { lib, config, pkgs, pkgs-unstable, container, username, desktop, theme, system, repo, ... }: {
specialArgs = { inherit pkgs pkgs-unstable container username desktop theme system repo unfree stateVersion; };
config = { lib, config, pkgs, pkgs-unstable, container, username, desktop, theme, system, repo, stateVersion, ... }: {
system.stateVersion = stateVersion;
imports = [ ../nixos/containers/${container} ];
};
};

View file

@ -7,7 +7,7 @@
};
useDHCP = lib.mkDefault true;
enableIPv6 = false;
enableIPv6 = lib.mkForce false;
firewall = {
enable = true;
allowedTCPPorts = [ ];

View file

@ -1,18 +1,25 @@
{ pkgs, username, stateVersion, desktop, ... }: {
imports = [
../../common/desktops/${desktop}
# ../../common/desktops/${desktop}
../../users/${username}
../../common/modules/nixos.nix
../../common/modules/networking.nix
];
networking.firewall = {
networking.firewall.allowedTCPPorts = [ 3389 ];
services.xserver = {
enable = true;
allowedTCPPorts = [ 3390 ];
desktopManager = {
xterm.enable = false;
xfce.enable = true;
};
displayManager.defaultSession = "xfce";
};
services.xrdp = {
enable = true;
openFirewall = true;
port = 3390;
defaultWindowManager = "${pkgs.xfce.xfce4-session}/bin/xfce4-session";
defaultWindowManager = "xfce4-session";
};
}