commit 0849e0fe7a9cd89f05b3fd700086844f9fa6d1dc · pyrox.dev/nixpkgs

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

···

       18
       18
        
       

     

       19
       19
        
       - NixOS now has support for *automatic boot assessment* (see [here](https://systemd.io/AUTOMATIC_BOOT_ASSESSMENT/)) for detailed description of the feature) for `systemd-boot` users. Available as [boot.loader.systemd-boot.bootCounting](#opt-boot.loader.systemd-boot.bootCounting.enable).

     

       20
       20
        
       

     

       21
       21
       +
       - A new display-manager `services.displayManager.ly` was added.

     

       22
       22
       +
         It is a tui based replacement of sddm and lightdm for window manager users.

     

       23
       23
       +
         Users can use it by `services.displayManager.ly.enable` and config it by

     

       24
       24
       +
         `services.displayManager.ly.settings` to generate `/etc/ly/config.ini`

     

       25
       25
       +
       

     

       21
       26
        
       ## New Services {#sec-release-24.11-new-services}

     

       22
       27
        
       

     

       23
       28
        
       - [FlareSolverr](https://github.com/FlareSolverr/FlareSolverr), proxy server to bypass Cloudflare protection. Available as [services.flaresolverr](#opt-services.flaresolverr.enable) service.

nixos/modules/module-list.nix

···

       542
       542
        
         ./services/display-managers/default.nix

     

       543
       543
        
         ./services/display-managers/greetd.nix

     

       544
       544
        
         ./services/display-managers/sddm.nix

     

       545
       545
       +
         ./services/display-managers/ly.nix

     

       545
       546
        
         ./services/editors/emacs.nix

     

       546
       547
        
         ./services/editors/haste.nix

     

       547
       548
        
         ./services/editors/infinoted.nix

+2 -1

nixos/modules/services/display-managers/default.nix

···

       204
       204
        
                 noDmUsed = !(dmConf.gdm.enable

     

       205
       205
        
                           || cfg.sddm.enable

     

       206
       206
        
                           || dmConf.xpra.enable

     

       207
       207
       -
                           || dmConf.lightdm.enable);

     

       207
       207
       +
                           || dmConf.lightdm.enable

     

       208
       208
       +
                           || cfg.ly.enable);

     

       208
       209
        
             in lib.mkIf noDmUsed (lib.mkDefault false);

     

       209
       210
        
       

     

       210
       211
        
           systemd.services.display-manager = {

+147

nixos/modules/services/display-managers/ly.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         config,

     

       3
       3
       +
         lib,

     

       4
       4
       +
         pkgs,

     

       5
       5
       +
         ...

     

       6
       6
       +
       }:

     

       7
       7
       +
       

     

       8
       8
       +
       let

     

       9
       9
       +
         dmcfg = config.services.displayManager;

     

       10
       10
       +
         xcfg = config.services.xserver;

     

       11
       11
       +
         xdmcfg = xcfg.displayManager;

     

       12
       12
       +
         cfg = config.services.displayManager.ly;

     

       13
       13
       +
         xEnv = config.systemd.services.display-manager.environment;

     

       14
       14
       +
       

     

       15
       15
       +
         ly = cfg.package;

     

       16
       16
       +
       

     

       17
       17
       +
         iniFmt = pkgs.formats.iniWithGlobalSection { };

     

       18
       18
       +
       

     

       19
       19
       +
         inherit (lib)

     

       20
       20
       +
           concatMapStrings

     

       21
       21
       +
           attrNames

     

       22
       22
       +
           getAttr

     

       23
       23
       +
           mkIf

     

       24
       24
       +
           mkOption

     

       25
       25
       +
           mkEnableOption

     

       26
       26
       +
           mkPackageOption

     

       27
       27
       +
           ;

     

       28
       28
       +
       

     

       29
       29
       +
         xserverWrapper = pkgs.writeShellScript "xserver-wrapper" ''

     

       30
       30
       +
           ${concatMapStrings (n: ''

     

       31
       31
       +
             export ${n}="${getAttr n xEnv}"

     

       32
       32
       +
           '') (attrNames xEnv)}

     

       33
       33
       +
           exec systemd-cat -t xserver-wrapper ${xdmcfg.xserverBin} ${toString xdmcfg.xserverArgs} "$@"

     

       34
       34
       +
         '';

     

       35
       35
       +
       

     

       36
       36
       +
         defaultConfig = {

     

       37
       37
       +
           shutdown_cmd = "/run/current-system/systemd/bin/systemctl poweroff";

     

       38
       38
       +
           restart_cmd = "/run/current-system/systemd/bin/systemctl reboot";

     

       39
       39
       +
           tty = 2;

     

       40
       40
       +
           service_name = "ly";

     

       41
       41
       +
           path = "/run/current-system/sw/bin";

     

       42
       42
       +
           term_reset_cmd = "${pkgs.ncurses}/bin/tput reset";

     

       43
       43
       +
           term_restore_cursor_cmd = "${pkgs.ncurses}/bin/tput cnorm";

     

       44
       44
       +
           mcookie_cmd = "/run/current-system/sw/bin/mcookie";

     

       45
       45
       +
           waylandsessions = "${dmcfg.sessionData.desktops}/share/wayland-sessions";

     

       46
       46
       +
           wayland_cmd = dmcfg.sessionData.wrapper;

     

       47
       47
       +
           xsessions = "${dmcfg.sessionData.desktops}/share/xsessions";

     

       48
       48
       +
           xauth_cmd = lib.optionalString xcfg.enable "${pkgs.xorg.xauth}/bin/xauth";

     

       49
       49
       +
           x_cmd = lib.optionalString xcfg.enable xserverWrapper;

     

       50
       50
       +
           x_cmd_setup = dmcfg.sessionData.wrapper;

     

       51
       51
       +
         };

     

       52
       52
       +
       

     

       53
       53
       +
         finalConfig = defaultConfig // cfg.settings;

     

       54
       54
       +
       

     

       55
       55
       +
         cfgFile = iniFmt.generate "config.ini" { globalSection = finalConfig; };

     

       56
       56
       +
       

     

       57
       57
       +
       in

     

       58
       58
       +
       {

     

       59
       59
       +
         options = {

     

       60
       60
       +
           services.displayManager.ly = {

     

       61
       61
       +
             enable = mkEnableOption "ly as the display manager";

     

       62
       62
       +
       

     

       63
       63
       +
             package = mkPackageOption pkgs [ "ly" ] { };

     

       64
       64
       +
       

     

       65
       65
       +
             settings = mkOption {

     

       66
       66
       +
               type =

     

       67
       67
       +
                 with lib.types;

     

       68
       68
       +
                 attrsOf (oneOf [

     

       69
       69
       +
                   str

     

       70
       70
       +
                   int

     

       71
       71
       +
                   bool

     

       72
       72
       +
                 ]);

     

       73
       73
       +
               default = { };

     

       74
       74
       +
               example = {

     

       75
       75
       +
                 load = false;

     

       76
       76
       +
                 save = false;

     

       77
       77
       +
               };

     

       78
       78
       +
               description = ''

     

       79
       79
       +
                 Extra settings merged in and overwriting defaults in config.ini.

     

       80
       80
       +
               '';

     

       81
       81
       +
             };

     

       82
       82
       +
           };

     

       83
       83
       +
         };

     

       84
       84
       +
       

     

       85
       85
       +
         config = mkIf cfg.enable {

     

       86
       86
       +
       

     

       87
       87
       +
           assertions = [

     

       88
       88
       +
             {

     

       89
       89
       +
               assertion = !dmcfg.autoLogin.enable;

     

       90
       90
       +
               message = ''

     

       91
       91
       +
                 ly doesn't support auto login.

     

       92
       92
       +
               '';

     

       93
       93
       +
             }

     

       94
       94
       +
           ];

     

       95
       95
       +
       

     

       96
       96
       +
           security.pam.services.ly = {

     

       97
       97
       +
             startSession = true;

     

       98
       98
       +
             unixAuth = true;

     

       99
       99
       +
           };

     

       100
       100
       +
       

     

       101
       101
       +
           environment = {

     

       102
       102
       +
             etc."ly/config.ini".source = cfgFile;

     

       103
       103
       +
             systemPackages = [ ly ];

     

       104
       104
       +
       

     

       105
       105
       +
             pathsToLink = [ "/share/ly" ];

     

       106
       106
       +
           };

     

       107
       107
       +
       

     

       108
       108
       +
           services = {

     

       109
       109
       +
             dbus.packages = [ ly ];

     

       110
       110
       +
       

     

       111
       111
       +
             displayManager = {

     

       112
       112
       +
               enable = true;

     

       113
       113
       +
               execCmd = "exec /run/current-system/sw/bin/ly";

     

       114
       114
       +
             };

     

       115
       115
       +
       

     

       116
       116
       +
             xserver = {

     

       117
       117
       +
               # To enable user switching, allow ly to allocate TTYs/displays dynamically.

     

       118
       118
       +
               tty = null;

     

       119
       119
       +
               display = null;

     

       120
       120
       +
             };

     

       121
       121
       +
           };

     

       122
       122
       +
       

     

       123
       123
       +
           systemd = {

     

       124
       124
       +
             # We're not using the upstream unit, so copy these:

     

       125
       125
       +
             # https://github.com/fairyglade/ly/blob/master/res/ly.service

     

       126
       126
       +
             services.display-manager = {

     

       127
       127
       +
               after = [

     

       128
       128
       +
                 "systemd-user-sessions.service"

     

       129
       129
       +
                 "plymouth-quit-wait.service"

     

       130
       130
       +
                 "getty@tty${toString finalConfig.tty}.service"

     

       131
       131
       +
               ];

     

       132
       132
       +
       

     

       133
       133
       +
               conflicts = [ "getty@tty7.service" ];

     

       134
       134
       +
       

     

       135
       135
       +
               serviceConfig = {

     

       136
       136
       +
                 Type = "idle";

     

       137
       137
       +
                 StandardInput = "tty";

     

       138
       138
       +
                 TTYPath = "/dev/tty${toString finalConfig.tty}";

     

       139
       139
       +
                 TTYReset = "yes";

     

       140
       140
       +
                 TTYVHangup = "yes";

     

       141
       141
       +
               };

     

       142
       142
       +
             };

     

       143
       143
       +
           };

     

       144
       144
       +
         };

     

       145
       145
       +
       

     

       146
       146
       +
         meta.maintainers = with lib.maintainers; [ vonfry ];

     

       147
       147
       +
       }

+2 -1

nixos/modules/services/x11/xserver.nix

···

       648
       648
        
                           || dmConf.xpra.enable

     

       649
       649
        
                           || dmConf.sx.enable

     

       650
       650
        
                           || dmConf.startx.enable

     

       651
       651
       -
                           || config.services.greetd.enable);

     

       651
       651
       +
                           || config.services.greetd.enable

     

       652
       652
       +
                           || config.services.displayManager.ly.enable);

     

       652
       653
        
             in mkIf (default) (mkDefault true);

     

       653
       654
        
       

     

       654
       655
        
           services.xserver.videoDrivers = mkIf (cfg.videoDriver != null) [ cfg.videoDriver ];

nixos/tests/all-tests.nix

···

       544
       544
        
         lomiri-filemanager-app = runTest ./lomiri-filemanager-app.nix;

     

       545
       545
        
         lomiri-system-settings = handleTest ./lomiri-system-settings.nix {};

     

       546
       546
        
         lorri = handleTest ./lorri/default.nix {};

     

       547
       547
       +
         ly = handleTest ./ly.nix {};

     

       547
       548
        
         maddy = discoverTests (import ./maddy { inherit handleTest; });

     

       548
       549
        
         maestral = handleTest ./maestral.nix {};

     

       549
       550
        
         magic-wormhole-mailbox-server = handleTest ./magic-wormhole-mailbox-server.nix {};

+44

nixos/tests/ly.nix

···

       1
       1
       +
       import ./make-test-python.nix (

     

       2
       2
       +
         { ... }:

     

       3
       3
       +
       

     

       4
       4
       +
         {

     

       5
       5
       +
           name = "ly";

     

       6
       6
       +
       

     

       7
       7
       +
           nodes.machine =

     

       8
       8
       +
             { ... }:

     

       9
       9
       +
             {

     

       10
       10
       +
               imports = [ ./common/user-account.nix ];

     

       11
       11
       +
               services.displayManager.ly = {

     

       12
       12
       +
                 enable = true;

     

       13
       13
       +
                 settings = {

     

       14
       14
       +
                   load = false;

     

       15
       15
       +
                   save = false;

     

       16
       16
       +
                 };

     

       17
       17
       +
               };

     

       18
       18
       +
               services.xserver.enable = true;

     

       19
       19
       +
               services.displayManager.defaultSession = "none+icewm";

     

       20
       20
       +
               services.xserver.windowManager.icewm.enable = true;

     

       21
       21
       +
             };

     

       22
       22
       +
       

     

       23
       23
       +
           testScript =

     

       24
       24
       +
             { nodes, ... }:

     

       25
       25
       +
             let

     

       26
       26
       +
               user = nodes.machine.users.users.alice;

     

       27
       27
       +
             in

     

       28
       28
       +
             ''

     

       29
       29
       +
               start_all()

     

       30
       30
       +
               machine.wait_until_tty_matches("2", "password:")

     

       31
       31
       +
               machine.send_key("ctrl-alt-f2")

     

       32
       32
       +
               machine.sleep(1)

     

       33
       33
       +
               machine.screenshot("ly")

     

       34
       34
       +
               machine.send_chars("alice")

     

       35
       35
       +
               machine.send_key("tab")

     

       36
       36
       +
               machine.send_chars("${user.password}")

     

       37
       37
       +
               machine.send_key("ret")

     

       38
       38
       +
               machine.wait_for_file("/run/user/${toString user.uid}/lyxauth")

     

       39
       39
       +
               machine.succeed("xauth merge /run/user/${toString user.uid}/lyxauth")

     

       40
       40
       +
               machine.wait_for_window("^IceWM ")

     

       41
       41
       +
               machine.screenshot("icewm")

     

       42
       42
       +
             '';

     

       43
       43
       +
         }

     

       44
       44
       +
       )