From 466530d1d357a9f99763b13f0d647e0085909c86 Mon Sep 17 00:00:00 2001 From: r-vdp Date: Wed, 3 Jun 2026 18:50:00 +0300 Subject: [PATCH] nixos/calamares-plasma6: replace activation script with tmpfiles Part of #475305. --- ...llation-cd-graphical-calamares-plasma6.nix | 29 +++++++++---------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma6.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma6.nix index 6d2c7112bc08..74a75758dfa8 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma6.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma6.nix @@ -36,25 +36,22 @@ # Avoid bundling an entire MariaDB installation on the ISO. programs.kde-pim.enable = false; - system.activationScripts.installerDesktop = + systemd.tmpfiles.settings."10-installer-desktop" = let - # Comes from documentation.nix when xserver and nixos.enable are true. manualDesktopFile = "/run/current-system/sw/share/applications/nixos-manual.desktop"; - - homeDir = "/home/nixos/"; - desktopDir = homeDir + "Desktop/"; - in - '' - mkdir -p ${desktopDir} - chown nixos ${homeDir} ${desktopDir} - - ln -sfT ${manualDesktopFile} ${desktopDir + "nixos-manual.desktop"} - ln -sfT ${pkgs.gparted}/share/applications/gparted.desktop ${desktopDir + "gparted.desktop"} - ln -sfT ${pkgs.calamares-nixos}/share/applications/calamares.desktop ${ - desktopDir + "calamares.desktop" - } - ''; + { + "/home/nixos/Desktop".d = { + user = "nixos"; + group = "users"; + mode = "0755"; + }; + "/home/nixos/Desktop/nixos-manual.desktop"."L+".argument = manualDesktopFile; + "/home/nixos/Desktop/gparted.desktop"."L+".argument = + "${pkgs.gparted}/share/applications/gparted.desktop"; + "/home/nixos/Desktop/calamares.desktop"."L+".argument = + "${pkgs.calamares-nixos}/share/applications/calamares.desktop"; + }; }