From 63cd974f58275d0346dc468e151432fd026da23f Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Fri, 12 Sep 2025 09:38:41 +0200 Subject: [PATCH 1/2] chore(flakes): update nixpkgs lockfile - Updated `nixpkgs_2` and `unstable` lockfile entries with new revisions. - Reflects the latest upstream changes for improved package support. --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 08f582b..0a82b5a 100644 --- a/flake.lock +++ b/flake.lock @@ -585,11 +585,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1757244434, - "narHash": "sha256-AeqTqY0Y95K1Fgs6wuT1LafBNcmKxcOkWnm4alD9pqM=", + "lastModified": 1757408970, + "narHash": "sha256-aSgK4BLNFFGvDTNKPeB28lVXYqVn8RdyXDNAvgGq+k0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "092c565d333be1e17b4779ac22104338941d913f", + "rev": "d179d77c139e0a3f5c416477f7747e9d6b7ec315", "type": "github" }, "original": { @@ -801,11 +801,11 @@ }, "unstable": { "locked": { - "lastModified": 1757068644, - "narHash": "sha256-NOrUtIhTkIIumj1E/Rsv1J37Yi3xGStISEo8tZm3KW4=", + "lastModified": 1757487488, + "narHash": "sha256-zwE/e7CuPJUWKdvvTCB7iunV4E/+G0lKfv4kk/5Izdg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8eb28adfa3dc4de28e792e3bf49fcf9007ca8ac9", + "rev": "ab0f3607a6c7486ea22229b92ed2d355f1482ee0", "type": "github" }, "original": { From d316ef4c2d162bb9379fbfe836e6791d09c3ea95 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Fri, 12 Sep 2025 09:38:53 +0200 Subject: [PATCH 2/2] refactor(gui): replace GNOME remote desktop with XRDP - Switched from GNOME remote desktop to XRDP for remote access services across configurations. - Removed GNOME-specific settings and added XRDP service settings in GUI and system modules. - Enhances flexibility and aligns remote desktop service configuration. --- modules/nixos/services/gui/default.nix | 9 ++++----- systems/aarch64-linux/m4nix/default.nix | 4 ---- systems/aarch64-linux/rnix/default.nix | 4 ---- 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/modules/nixos/services/gui/default.nix b/modules/nixos/services/gui/default.nix index 5b7c66b..a552e63 100644 --- a/modules/nixos/services/gui/default.nix +++ b/modules/nixos/services/gui/default.nix @@ -167,6 +167,7 @@ in yubikey-personalization zellij jetbrains-toolbox + gnome-remote-desktop ] ++ lib.optionals pkgs.stdenv.targetPlatform.isx86_64 ( with pkgs; @@ -206,10 +207,8 @@ in }; # remote desktop - networking.firewall.allowedTCPPorts = [ 3389 ]; - services.gnome.gnome-remote-desktop.enable = true; - systemd.services.gnome-remote-desktop = { - wantedBy = [ "graphical.target" ]; - }; + services.xrdp.enable = true; + services.xrdp.defaultWindowManager = "${pkgs.gnome-session}/bin/gnome-session"; + services.xrdp.openFirewall = true; }; } diff --git a/systems/aarch64-linux/m4nix/default.nix b/systems/aarch64-linux/m4nix/default.nix index e0fc1e7..d8cd570 100644 --- a/systems/aarch64-linux/m4nix/default.nix +++ b/systems/aarch64-linux/m4nix/default.nix @@ -34,10 +34,6 @@ with lib.metacfg; ]; }; - services.xrdp.enable = true; - services.xrdp.defaultWindowManager = "${pkgs.gnome-session}/bin/gnome-session"; - services.xrdp.openFirewall = true; - # Disable the GNOME3/GDM auto-suspend feature that cannot be disabled in GUI! # If no user is logged in, the machine will power down after 20 minutes. systemd.targets.sleep.enable = false; diff --git a/systems/aarch64-linux/rnix/default.nix b/systems/aarch64-linux/rnix/default.nix index e0fc1e7..d8cd570 100644 --- a/systems/aarch64-linux/rnix/default.nix +++ b/systems/aarch64-linux/rnix/default.nix @@ -34,10 +34,6 @@ with lib.metacfg; ]; }; - services.xrdp.enable = true; - services.xrdp.defaultWindowManager = "${pkgs.gnome-session}/bin/gnome-session"; - services.xrdp.openFirewall = true; - # Disable the GNOME3/GDM auto-suspend feature that cannot be disabled in GUI! # If no user is logged in, the machine will power down after 20 minutes. systemd.targets.sleep.enable = false;