Unverified Commit 0364c3a2 authored by Michele Guerini Rocco's avatar Michele Guerini Rocco Committed by GitHub
Browse files

Fix up PR #388789 (#389213)

parents 1e73a639 c8d0a944

nixos/doc/manual/configuration/x-windows.chapter.md

+5 −3
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ using lightdm for a user `alice`: 
## Running X without a display manager  {#sec-x11-startx}



It is possible to avoid a display manager entirely and starting the X server

manually from a virtual terminal. Add to your configuration

manually from a virtual terminal. Add to your configuration:

```nix

{

  services.xserver.displayManager.startx = {
@@ -130,7 +130,9 @@ then you can start the X server with the `startx` command. 


The second option will generate a base `xinitrc` script that will run your

window manager and set up the systemd user session.

You can extend the script using the [extraCommands](#opt-services.xserver.displayManager.startx.extraCommands) for example:

You can extend the script using the

[extraCommands](#opt-services.xserver.displayManager.startx.extraCommands)

option, for example:

```nix

{

  services.xserver.displayManager.startx = {
@@ -146,7 +148,7 @@ You can extend the script using the [extraCommands](#opt-services.xserver.displa 
or, alternatively, you can write your own from scratch in `~/.xinitrc`.



In this case, remember you're responsible for starting the window manager, for

example

example:

```shell

sxhkd &

bspwm &

nixos/doc/manual/release-notes/rl-2505.section.md

+2 −0
Original line number Diff line number Diff line
@@ -548,6 +548,8 @@ 


- `services.avahi.ipv6` now defaults to true.



- In the `services.xserver.displayManager.startx` module, two new options [generateScript](#opt-services.xserver.displayManager.startx.generateScript) and [extraCommands](#opt-services.xserver.displayManager.startx.extraCommands) have been added to to declaratively configure the .xinitrc script.



- All services that require a root certificate bundle now use the value of a new read-only option, `security.pki.caBundle`.



- hddfancontrol has been updated to major release 2. See the [migration guide](https://github.com/desbma/hddfancontrol/tree/master?tab=readme-ov-file#migrating-from-v1x), as there are breaking changes.

nixos/modules/services/x11/display-managers/startx.nix

+4 −4
Original line number Diff line number Diff line
@@ -82,8 +82,8 @@ in 
    '';



    # Add a sane system-wide xinitrc script

    environment.etc."X11/xinit/xinitrc".source = lib.mkIf cfg.generateScript (

      pkgs.writeShellScript "xinitrc" ''

    environment.etc."X11/xinit/xinitrc" = lib.mkIf cfg.generateScript {

      source = pkgs.writeShellScript "xinitrc" ''

        ${cfg.extraCommands}



        # start user services
@@ -97,8 +97,8 @@ in 
        # stop services and all subprocesses

        systemctl --user stop nixos-fake-graphical-session.target

        kill 0

      ''

    );

      '';

    };



    environment.systemPackages = with pkgs; [ xorg.xinit ];

nixos/tests/all-tests.nix

+1 −1
Original line number Diff line number Diff line
@@ -1153,7 +1153,7 @@ in { 
  systemd-userdbd = handleTest ./systemd-userdbd.nix {};

  systemd-homed = handleTest ./systemd-homed.nix {};

  systemtap = handleTest ./systemtap.nix {};

  startx = runTest ./startx.nix;

  startx = import ./startx.nix { inherit pkgs runTest; };

  taler = handleTest ./taler {};

  tandoor-recipes = handleTest ./tandoor-recipes.nix {};

  tandoor-recipes-script-name = handleTest ./tandoor-recipes-script-name.nix {};

nixos/tests/startx.nix

+180 −88
Original line number Diff line number Diff line 
{ lib, ... }:

{ pkgs, runTest }:



{



  declarative = runTest {

    name = "startx";

  meta.maintainers = with lib.maintainers; [ rnhmjoj ];

    meta.maintainers = with pkgs.lib.maintainers; [ rnhmjoj ];



    nodes.machine =

      { pkgs, ... }:
@@ -105,4 +107,94 @@ 
          machine.fail(f"{sysu} is-active urxvtd")

          machine.fail(f"{sysu} is-active xss-lock")

    '';

  };



  imperative = runTest {

    name = "startx-imperative";

    meta.maintainers = with pkgs.lib.maintainers; [ rnhmjoj ];



    nodes.machine =

      { pkgs, ... }:

      {

        services.getty.autologinUser = "root";

        programs.bash.promptInit = "PS1='# '";



        # startx+twm setup

        services.xserver = {

          enable = true;

          windowManager.twm.enable = true;

          displayManager.startx.enable = true;

          displayManager.startx.generateScript = false;

        };



        # enable some user services

        security.polkit.enable = true;

        services.urxvtd.enable = true;

        programs.xss-lock.enable = true;

      };



    testScript = ''

      import textwrap



      sysu = "env XDG_RUNTIME_DIR=/run/user/0 systemctl --user";

      prompt = "# "



      with subtest("Wait for the autologin"):

          machine.wait_until_tty_matches("1", prompt)



      with subtest("Setup dotfiles"):

          machine.execute(textwrap.dedent("""

            cat <<EOF > ~/.Xresources

            urxvt*foreground: #9b9081

            urxvt*background: #181b20

            urxvt*scrollBar:  false

            urxvt*title:      myterm

            urxvt*geometry:   20x20+40+40

            EOF

            cat <<EOF > ~/.twmrc

            "Return" = meta : all : f.exec "urxvtc"

            "Escape" = meta : all : f.quit

            EOF

            cat <<EOF > ~/.xinitrc

            xrdb -load ~/.Xresources

            xsetroot -solid '#343d46'

            xsetroot -cursor_name trek

            # start user services

            systemctl --user import-environment DISPLAY XDG_SESSION_ID

            systemctl --user start nixos-fake-graphical-session.target

            # run the window manager

            twm

            # stop services and all subprocesses

            systemctl --user stop nixos-fake-graphical-session.target

            EOF

          """))



      with subtest("Can start the X server"):

          machine.send_chars("startx\n")

          machine.wait_for_x()



      with subtest("Graphical services are running"):

          machine.succeed(f"{sysu} is-active graphical-session.target")

          machine.succeed(f"{sysu} is-active urxvtd")

          machine.succeed(f"{sysu} is-active xss-lock")



      with subtest("Can interact with the WM"):

          machine.wait_until_succeeds("pgrep twm")

          # spawn a terminal

          machine.send_key("alt-ret")

          machine.wait_for_window("myterm")

          machine.screenshot("screenshot.png")



      with subtest("Can stop the X server"):

          # kill the WM

          machine.send_key("alt-esc")

          machine.wait_until_tty_matches("1", prompt)



      with subtest("Graphical session has stopped"):

          machine.fail(f"{sysu} is-active graphical-session.target")

          machine.fail(f"{sysu} is-active urxvtd")

          machine.fail(f"{sysu} is-active xss-lock")

    '';

  };



}