commit a2a0a58f7c6c3d6f1174524333c078052916841f · pyrox.dev/nixpkgs

+5 -1

nixos/modules/programs/environment.nix

···

       18
       18
        
       

     

       19
       19
        
           environment.variables =

     

       20
       20
        
             { NIXPKGS_CONFIG = "/etc/nix/nixpkgs-config.nix";

     

       21
       21
       +
               # note: many programs exec() this directly, so default options for less must not

     

       22
       22
       +
               # be specified here; do so in the default value of programs.less.envVariables instead

     

       21
       23
        
               PAGER = mkDefault "less";

     

       22
       22
       -
               LESS = mkDefault "-R";

     

       23
       24
        
               EDITOR = mkDefault "nano";

     

       24
       25
        
               XDG_CONFIG_DIRS = [ "/etc/xdg" ]; # needs to be before profile-relative paths to allow changes through environment.etc

     

       25
       26
        
             };

     

       27
       27
       +
       

     

       28
       28
       +
           # since we set PAGER to this above, make sure it's installed

     

       29
       29
       +
           programs.less.enable = true;

     

       26
       30
        
       

     

       27
       31
        
           environment.profiles = mkAfter

     

       28
       32
        
             [ "/nix/var/nix/profiles/default"

+7 -5

nixos/modules/programs/less.nix

···

       24
       24
        
           }

     

       25
       25
        
         '';

     

       26
       26
        
       

     

       27
       27
       -
         lessKey = pkgs.runCommand "lesskey"

     

       28
       28
       -
                   { src = pkgs.writeText "lessconfig" configText; preferLocalBuild = true; }

     

       29
       29
       -
                   "${pkgs.less}/bin/lesskey -o $out $src";

     

       27
       27
       +
         lessKey = pkgs.writeText "lessconfig" configText;

     

       30
       28
        
       

     

       31
       29
        
       in

     

       32
       30
        
       

     
···

       35
       33
        
       

     

       36
       34
        
           programs.less = {

     

       37
       35
        
       

     

       36
       36
       +
             # note that environment.nix sets PAGER=less, and

     

       37
       37
       +
             # therefore also enables this module

     

       38
       38
        
             enable = mkEnableOption "less";

     

       39
       39
        
       

     

       40
       40
        
             configFile = mkOption {

     
···

       81
       81
        
       

     

       82
       82
        
             envVariables = mkOption {

     

       83
       83
        
               type = types.attrsOf types.str;

     

       84
       84
       -
               default = {};

     

       84
       84
       +
               default = {

     

       85
       85
       +
                 LESS = "-R";

     

       86
       86
       +
               };

     

       85
       87
        
               example = {

     

       86
       88
        
                 LESS = "--quit-if-one-screen";

     

       87
       89
        
               };

     
···

       112
       114
        
           environment.systemPackages = [ pkgs.less ];

     

       113
       115
        
       

     

       114
       116
        
           environment.variables = {

     

       115
       115
       -
             LESSKEY_SYSTEM = toString lessKey;

     

       117
       117
       +
             LESSKEYIN_SYSTEM = toString lessKey;

     

       116
       118
        
           } // optionalAttrs (cfg.lessopen != null) {

     

       117
       119
        
             LESSOPEN = cfg.lessopen;

     

       118
       120
        
           } // optionalAttrs (cfg.lessclose != null) {