commit 65a759f7b46441ec2735950e476ed3a3c68a512f · pyrox.dev/nixpkgs

+1 -1

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

···

       10
       10
        
       

     

       11
       11
        
       <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

     

       12
       12
        
       

     

       13
       13
       -
       - Create the first release note entry in this section!

     

       13
       13
       +
       - [gtklock](https://github.com/jovanlanik/gtklock), a GTK-based lockscreen for Wayland. Available as [programs.gtklock](#opt-programs.gtklock.enable).

     

       14
       14
        
       

     

       15
       15
        
       ## Backward Incompatibilities {#sec-release-25.11-incompatibilities}

     

       16
       16

nixos/modules/module-list.nix

···

       331
       331
        
         ./programs/vivid.nix

     

       332
       332
        
         ./programs/wavemon.nix

     

       333
       333
        
         ./programs/wayland/cardboard.nix

     

       334
       334
       +
         ./programs/wayland/gtklock.nix

     

       334
       335
        
         ./programs/wayland/hyprland.nix

     

       335
       336
        
         ./programs/wayland/hyprlock.nix

     

       336
       337
        
         ./programs/wayland/labwc.nix

+78

nixos/modules/programs/wayland/gtklock.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         config,

     

       3
       3
       +
         lib,

     

       4
       4
       +
         pkgs,

     

       5
       5
       +
         ...

     

       6
       6
       +
       }:

     

       7
       7
       +
       let

     

       8
       8
       +
         cfg = config.programs.gtklock;

     

       9
       9
       +
         configFormat = pkgs.formats.ini {

     

       10
       10
       +
           listToValue = builtins.concatStringsSep ";";

     

       11
       11
       +
         };

     

       12
       12
       +
       

     

       13
       13
       +
         inherit (lib)

     

       14
       14
       +
           types

     

       15
       15
       +
           mkOption

     

       16
       16
       +
           mkEnableOption

     

       17
       17
       +
           mkPackageOption

     

       18
       18
       +
           ;

     

       19
       19
       +
       in

     

       20
       20
       +
       {

     

       21
       21
       +
         options.programs.gtklock = {

     

       22
       22
       +
           enable = mkEnableOption "gtklock, a GTK-based lockscreen for Wayland";

     

       23
       23
       +
       

     

       24
       24
       +
           package = mkPackageOption pkgs "gtklock" { };

     

       25
       25
       +
       

     

       26
       26
       +
           config = mkOption {

     

       27
       27
       +
             type = configFormat.type;

     

       28
       28
       +
             example = lib.literalExpression ''

     

       29
       29
       +
               {

     

       30
       30
       +
                 main = {

     

       31
       31
       +
                   idle-hide = true;

     

       32
       32
       +
                   idle-timeout = 10;

     

       33
       33
       +
                 };

     

       34
       34
       +
               }'';

     

       35
       35
       +
             description = ''

     

       36
       36
       +
               Configuration for gtklock.

     

       37
       37
       +
               See [`gtklock(1)`](https://github.com/jovanlanik/gtklock/blob/master/man/gtklock.1.scd) man page for details.

     

       38
       38
       +
             '';

     

       39
       39
       +
           };

     

       40
       40
       +
       

     

       41
       41
       +
           style = mkOption {

     

       42
       42
       +
             type = with types; nullOr str;

     

       43
       43
       +
             default = null;

     

       44
       44
       +
             description = ''

     

       45
       45
       +
               CSS Stylesheet for gtklock.

     

       46
       46
       +
               See [gtklock's wiki](https://github.com/jovanlanik/gtklock/wiki#Styling) for details.

     

       47
       47
       +
             '';

     

       48
       48
       +
           };

     

       49
       49
       +
       

     

       50
       50
       +
           modules = mkOption {

     

       51
       51
       +
             type = with types; listOf package;

     

       52
       52
       +
             default = [ ];

     

       53
       53
       +
             example = lib.literalExpression ''

     

       54
       54
       +
               with pkgs; [

     

       55
       55
       +
                 gtklock-playerctl-module

     

       56
       56
       +
                 gtklock-powerbar-module

     

       57
       57
       +
                 gtklock-userinfo-module

     

       58
       58
       +
               ]'';

     

       59
       59
       +
             description = "gtklock modules to load.";

     

       60
       60
       +
           };

     

       61
       61
       +
         };

     

       62
       62
       +
       

     

       63
       63
       +
         config = lib.mkIf cfg.enable {

     

       64
       64
       +
           programs.gtklock.config.main = {

     

       65
       65
       +
             style = lib.mkIf (cfg.style != null) "${pkgs.writeText "style.css" cfg.style}";

     

       66
       66
       +
       

     

       67
       67
       +
             modules = lib.mkIf (cfg.modules != [ ]) (

     

       68
       68
       +
               map (pkg: "${pkg}/lib/gtklock/${lib.removePrefix "gtklock-" pkg.pname}.so") cfg.modules

     

       69
       69
       +
             );

     

       70
       70
       +
           };

     

       71
       71
       +
       

     

       72
       72
       +
           environment.etc."xdg/gtklock/config.ini".source = configFormat.generate "config.ini" cfg.config;

     

       73
       73
       +
       

     

       74
       74
       +
           environment.systemPackages = [ cfg.package ];

     

       75
       75
       +
       

     

       76
       76
       +
           security.pam.services.gtklock = { };

     

       77
       77
       +
         };

     

       78
       78
       +
       }