commit 3d963c3e8f8678fd3c86564389c80b70cbeb3fd5 · pyrox.dev/nixpkgs

+19 -4
nixos/modules/services/x11/window-managers/herbstluftwm.nix
···

       8
       8
        
       

     

       9
       9
        
       {

     

       10
       10
        
         options = {

     

       11
       11
       -
           services.xserver.windowManager.herbstluftwm.enable = mkEnableOption "herbstluftwm";

     

       11
       11
       +
           services.xserver.windowManager.herbstluftwm = {

     

       12
       12
       +
             enable = mkEnableOption "herbstluftwm";

     

       13
       13
       +
       

     

       14
       14
       +
             configFile = mkOption {

     

       15
       15
       +
               default     = null;

     

       16
       16
       +
               type        = with types; nullOr path;

     

       17
       17
       +
               description = ''

     

       18
       18
       +
                 Path to the herbstluftwm configuration file.  If left at the

     

       19
       19
       +
                 default value, $XDG_CONFIG_HOME/herbstluftwm/autostart will

     

       20
       20
       +
                 be used.

     

       21
       21
       +
               '';

     

       22
       22
       +
             };

     

       23
       23
       +
           };

     

       12
       24
        
         };

     

       13
       25
        
       

     

       14
       26
        
         config = mkIf cfg.enable {

     

       15
       27
        
           services.xserver.windowManager.session = singleton {

     

       16
       28
        
             name = "herbstluftwm";

     

       17
       17
       -
             start = "

     

       18
       18
       -
               ${pkgs.herbstluftwm}/bin/herbstluftwm

     

       19
       19
       -
             ";

     

       29
       29
       +
             start =

     

       30
       30
       +
               let configFileClause = optionalString

     

       31
       31
       +
                   (cfg.configFile != null)

     

       32
       32
       +
                   ''-c "${cfg.configFile}"''

     

       33
       33
       +
                   ;

     

       34
       34
       +
               in "${pkgs.herbstluftwm}/bin/herbstluftwm ${configFileClause}";

     

       20
       35
        
           };

     

       21
       36
        
           environment.systemPackages = [ pkgs.herbstluftwm ];

     

       22
       37
        
         };