commit e82c7e5b8350bb36e56091477541a1d89763f46b · pyrox.dev/nixpkgs

pyrox.dev / nixpkgs

lol

nixos/i3: fix i3lock default enable-ing

Prior to this commit, i3lock was enabled by default in a way that doesn't work as of https://github.com/NixOS/nixpkgs/commit/317c972e8af2092c95e1f30028f8b7366b4ab4b9#diff-aef862f6fd2c25092a3f17f974d8757285bf7baff6b80822cd142b7de1903ccfR451-R454
Users attempting to use i3lock with this default setup would get locked out of their system.

This fixes it by enabling i3lock via its `programs` option instead of specifying the package directly.

Discussion over at https://github.com/NixOS/nixpkgs/issues/401891#issuecomment-2963378189

Thomas BESSOU 6 months ago e82c7e5b 128d3fc5

options

unified split

Changed files

+1 -2

nixos

modules

services

x11

window-managers

i3.nix

+1 -2

nixos/modules/services/x11/window-managers/i3.nix

···

       52
       52
        
             default = with pkgs; [

     

       53
       53
        
               dmenu

     

       54
       54
        
               i3status

     

       55
       55
       -
               i3lock

     

       56
       55
        
             ];

     

       57
       56
        
             defaultText = literalExpression ''

     

       58
       57
        
               with pkgs; [

     

       59
       58
        
                 dmenu

     

       60
       59
        
                 i3status

     

       61
       61
       -
                 i3lock

     

       62
       60
        
               ]

     

       63
       61
        
             '';

     

       64
       62
        
             description = ''

     
···

       81
       79
        
               '';

     

       82
       80
        
             }

     

       83
       81
        
           ];

     

       82
       82
       +
           programs.i3lock.enable = mkDefault true;

     

       84
       83
        
           environment.systemPackages = [ cfg.package ] ++ cfg.extraPackages;

     

       85
       84
        
           environment.etc."i3/config" = mkIf (cfg.configFile != null) {

     

       86
       85
        
             source = cfg.configFile;