diff options
author | figsoda <figsoda@pm.me> | 2021-08-22 13:44:29 -0400 |
---|---|---|
committer | figsoda <figsoda@pm.me> | 2021-08-22 13:44:29 -0400 |
commit | 7239ddf173f547e3659e2923e7a7f029d639e1df (patch) | |
tree | 197e2689494a2932770f47ea9326806904fd390c /nixos | |
parent | 002cf7d42de8b421a3f664f7625afe6ec279be75 (diff) | |
download | nixpkgs-7239ddf173f547e3659e2923e7a7f029d639e1df.tar nixpkgs-7239ddf173f547e3659e2923e7a7f029d639e1df.tar.gz nixpkgs-7239ddf173f547e3659e2923e7a7f029d639e1df.tar.bz2 nixpkgs-7239ddf173f547e3659e2923e7a7f029d639e1df.tar.lz nixpkgs-7239ddf173f547e3659e2923e7a7f029d639e1df.tar.xz nixpkgs-7239ddf173f547e3659e2923e7a7f029d639e1df.tar.zst nixpkgs-7239ddf173f547e3659e2923e7a7f029d639e1df.zip |
nixos/sx: init
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/doc/manual/from_md/release-notes/rl-2111.section.xml | 10 | ||||
-rw-r--r-- | nixos/doc/manual/release-notes/rl-2111.section.md | 2 | ||||
-rw-r--r-- | nixos/modules/module-list.nix | 1 | ||||
-rw-r--r-- | nixos/modules/services/x11/display-managers/sx.nix | 37 |
4 files changed, 49 insertions, 1 deletions
diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index a138d4c8780..b422c3cf058 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -182,7 +182,7 @@ </para> </listitem> </itemizedlist> - <itemizedlist spacing="compact"> + <itemizedlist> <listitem> <para> <link xlink:href="https://docs.fluidd.xyz/">fluidd</link>, a @@ -191,6 +191,14 @@ <link linkend="opt-services.fluidd.enable">fluidd</link>. </para> </listitem> + <listitem> + <para> + <link xlink:href="https://github.com/earnestly/sx">sx</link>, + a simple alternative to both xinit and startx for starting a + Xorg server. Available as + <link linkend="opt-services.xserver.displayManager.sx.enable">services.xserver.displayManager.sx</link> + </para> + </listitem> </itemizedlist> </section> <section xml:id="sec-release-21.11-incompatibilities"> diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index 35d65dc43cf..548008fe24b 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -58,6 +58,8 @@ subsonic-compatible api. Available as [navidrome](#opt-services.navidrome.enable - [fluidd](https://docs.fluidd.xyz/), a Klipper web interface for managing 3d printers using moonraker. Available as [fluidd](#opt-services.fluidd.enable). +- [sx](https://github.com/earnestly/sx), a simple alternative to both xinit and startx for starting a Xorg server. Available as [services.xserver.displayManager.sx](#opt-services.xserver.displayManager.sx.enable) + ## Backward Incompatibilities {#sec-release-21.11-incompatibilities} - The `paperless` module and package have been removed. All users should migrate to the diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 2473bf2f55f..2fbab4a6873 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1036,6 +1036,7 @@ ./services/x11/display-managers/sddm.nix ./services/x11/display-managers/slim.nix ./services/x11/display-managers/startx.nix + ./services/x11/display-managers/sx.nix ./services/x11/display-managers/xpra.nix ./services/x11/fractalart.nix ./services/x11/hardware/libinput.nix diff --git a/nixos/modules/services/x11/display-managers/sx.nix b/nixos/modules/services/x11/display-managers/sx.nix new file mode 100644 index 00000000000..132531c0ddc --- /dev/null +++ b/nixos/modules/services/x11/display-managers/sx.nix @@ -0,0 +1,37 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let cfg = config.services.xserver.displayManager.sx; + +in { + options = { + services.xserver.displayManager.sx = { + enable = mkEnableOption "sx pseudo-display manager" // { + description = '' + Whether to enable the "sx" pseudo-display manager, which allows users + to start manually via the "sx" command from a vt shell. The X server + runs under the user's id, not as root. The user must provide a + ~/.config/sx/sxrc file containing session startup commands, see + sx(1). This is not automatically generated from the desktopManager + and windowManager settings. sx doesn't have a way to directly set + X server flags, but it can be done by overriding its xorgserver + dependency. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = [ pkgs.sx ]; + services.xserver = { + exportConfiguration = true; + displayManager = { + job.execCmd = ""; + lightdm.enable = mkForce false; + }; + logFile = mkDefault null; + }; + systemd.services.display-manager.enable = false; + }; +} |