commit 22b87b1b7ee220bc0abad0b29e5ee1c8b995960a · pyrox.dev/nixpkgs

+2 -1

doc/manpage-urls.json

···

       322
        
         "nix-shell(1)": "https://nixos.org/manual/nix/stable/command-ref/nix-shell.html",

     

       323
        
         "mksquashfs(1)": "https://man.archlinux.org/man/extra/squashfs-tools/mksquashfs.1.en",

     

       324
        
         "curl(1)": "https://curl.se/docs/manpage.html",

     

       325
       -
         "netrc(5)": "https://man.cx/netrc"

     

       0
        
       
     

       326
        
       }

···

       322
        
         "nix-shell(1)": "https://nixos.org/manual/nix/stable/command-ref/nix-shell.html",

     

       323
        
         "mksquashfs(1)": "https://man.archlinux.org/man/extra/squashfs-tools/mksquashfs.1.en",

     

       324
        
         "curl(1)": "https://curl.se/docs/manpage.html",

     

       325
       +
         "netrc(5)": "https://man.cx/netrc",

     

       326
       +
         "cat(1)": "https://www.gnu.org/software/coreutils/manual/html_node/cat-invocation.html"

     

       327
        
       }

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

···

       24
        
       

     

       25
        
       - [Amazon CloudWatch Agent](https://github.com/aws/amazon-cloudwatch-agent), the official telemetry collector for AWS CloudWatch and AWS X-Ray. Available as [services.amazon-cloudwatch-agent](options.html#opt-services.amazon-cloudwatch-agent.enable).

     

       26
        
       

     

       0
        
       
     

       0
        
       
     

       27
        
       - [agorakit](https://github.com/agorakit/agorakit), an organization tool for citizens' collectives. Available with [services.agorakit](options.html#opt-services.agorakit.enable).

     

       28
        
       

     

       29
        
       - [mqtt-exporter](https://github.com/kpetremann/mqtt-exporter/), a Prometheus exporter for exposing messages from MQTT. Available as [services.prometheus.exporters.mqtt](#opt-services.prometheus.exporters.mqtt.enable).

···

       24
        
       

     

       25
        
       - [Amazon CloudWatch Agent](https://github.com/aws/amazon-cloudwatch-agent), the official telemetry collector for AWS CloudWatch and AWS X-Ray. Available as [services.amazon-cloudwatch-agent](options.html#opt-services.amazon-cloudwatch-agent.enable).

     

       26
        
       

     

       27
       +
       - [Bat](https://github.com/sharkdp/bat), a {manpage}`cat(1)` clone with wings. Available as [programs.bat](options.html#opt-programs.bat).

     

       28
       +
       

     

       29
        
       - [agorakit](https://github.com/agorakit/agorakit), an organization tool for citizens' collectives. Available with [services.agorakit](options.html#opt-services.agorakit.enable).

     

       30
        
       

     

       31
        
       - [mqtt-exporter](https://github.com/kpetremann/mqtt-exporter/), a Prometheus exporter for exposing messages from MQTT. Available as [services.prometheus.exporters.mqtt](#opt-services.prometheus.exporters.mqtt.enable).

nixos/modules/module-list.nix

···

       161
        
         ./programs/bash/ls-colors.nix

     

       162
        
         ./programs/bash/undistract-me.nix

     

       163
        
         ./programs/bazecor.nix

     

       0
        
       
     

       164
        
         ./programs/bcc.nix

     

       165
        
         ./programs/benchexec.nix

     

       166
        
         ./programs/browserpass.nix

···

       161
        
         ./programs/bash/ls-colors.nix

     

       162
        
         ./programs/bash/undistract-me.nix

     

       163
        
         ./programs/bazecor.nix

     

       164
       +
         ./programs/bat.nix

     

       165
        
         ./programs/bcc.nix

     

       166
        
         ./programs/benchexec.nix

     

       167
        
         ./programs/browserpass.nix

+122

nixos/modules/programs/bat.nix

···

       1
       +
       {

     

       2
       +
         pkgs,

     

       3
       +
         config,

     

       4
       +
         lib,

     

       5
       +
         ...

     

       6
       +
       }:

     

       7
       +
       let

     

       8
       +
         inherit (builtins) isList elem;

     

       9
       +
         inherit (lib)

     

       10
       +
           getExe

     

       11
       +
           literalExpression

     

       12
       +
           maintainers

     

       13
       +
           mapAttrs'

     

       14
       +
           mkEnableOption

     

       15
       +
           mkIf

     

       16
       +
           mkOption

     

       17
       +
           mkPackageOption

     

       18
       +
           nameValuePair

     

       19
       +
           optionalString

     

       20
       +
           types

     

       21
       +
           ;

     

       22
       +
         inherit (types) listOf package;

     

       23
       +
       

     

       24
       +
         cfg = config.programs.bat;

     

       25
       +
       

     

       26
       +
         settingsFormat = pkgs.formats.keyValue { listsAsDuplicateKeys = true; };

     

       27
       +
         inherit (settingsFormat) generate type;

     

       28
       +
       

     

       29
       +
         initScript =

     

       30
       +
           {

     

       31
       +
             program,

     

       32
       +
             shell,

     

       33
       +
             flags ? [ ],

     

       34
       +
           }:

     

       35
       +
           if (shell != "fish") then

     

       36
       +
             ''

     

       37
       +
               eval "$(${getExe program} ${toString flags})"

     

       38
       +
             ''

     

       39
       +
           else

     

       40
       +
             ''

     

       41
       +
               ${getExe program} ${toString flags} | source

     

       42
       +
             '';

     

       43
       +
       

     

       44
       +
         shellInit =

     

       45
       +
           shell:

     

       46
       +
           optionalString (elem pkgs.bat-extras.batpipe cfg.extraPackages) (initScript {

     

       47
       +
             program = pkgs.bat-extras.batpipe;

     

       48
       +
             inherit shell;

     

       49
       +
           })

     

       50
       +
           + optionalString (elem pkgs.bat-extras.batman cfg.extraPackages) (initScript {

     

       51
       +
             program = pkgs.bat-extras.batman;

     

       52
       +
             inherit shell;

     

       53
       +
             flags = [ "--export-env" ];

     

       54
       +
           });

     

       55
       +
       in

     

       56
       +
       {

     

       57
       +
         options.programs.bat = {

     

       58
       +
           enable = mkEnableOption "`bat`, a {manpage}`cat(1)` clone with wings";

     

       59
       +
       

     

       60
       +
           package = mkPackageOption pkgs "bat" { };

     

       61
       +
       

     

       62
       +
           extraPackages = mkOption {

     

       63
       +
             default = [ ];

     

       64
       +
             example = literalExpression ''

     

       65
       +
               with pkgs.bat-extras; [

     

       66
       +
                 batdiff

     

       67
       +
                 batman

     

       68
       +
                 prettybat

     

       69
       +
               ];

     

       70
       +
             '';

     

       71
       +
             description = ''

     

       72
       +
               Extra `bat` scripts to be added to the system configuration.

     

       73
       +
             '';

     

       74
       +
             type = listOf package;

     

       75
       +
           };

     

       76
       +
       

     

       77
       +
           settings = mkOption {

     

       78
       +
             default = { };

     

       79
       +
             example = {

     

       80
       +
               theme = "TwoDark";

     

       81
       +
               italic-text = "always";

     

       82
       +
               paging = "never";

     

       83
       +
               pager = "less --RAW-CONTROL-CHARS --quit-if-one-screen --mouse";

     

       84
       +
               map-syntax = [

     

       85
       +
                 "*.ino:C++"

     

       86
       +
                 ".ignore:Git Ignore"

     

       87
       +
               ];

     

       88
       +
             };

     

       89
       +
             description = ''

     

       90
       +
               Parameters to be written to the system-wide `bat` configuration file.

     

       91
       +
             '';

     

       92
       +
             inherit type;

     

       93
       +
           };

     

       94
       +
         };

     

       95
       +
       

     

       96
       +
         config = mkIf cfg.enable {

     

       97
       +
           environment = {

     

       98
       +
             systemPackages = [ cfg.package ] ++ cfg.extraPackages;

     

       99
       +
             etc."bat/config".source = generate "bat-config" (

     

       100
       +
               mapAttrs' (

     

       101
       +
                 name: value:

     

       102
       +
                 nameValuePair ("--" + name) (

     

       103
       +
                   if (isList value) then map (str: "\"${str}\"") value else "\"${value}\""

     

       104
       +
                 )

     

       105
       +
               ) cfg.settings

     

       106
       +
             );

     

       107
       +
           };

     

       108
       +
       

     

       109
       +
           programs = {

     

       110
       +
             bash = mkIf (!config.programs.fish.enable) {

     

       111
       +
               interactiveShellInit = shellInit "bash";

     

       112
       +
             };

     

       113
       +
             fish = mkIf config.programs.fish.enable {

     

       114
       +
               interactiveShellInit = shellInit "fish";

     

       115
       +
             };

     

       116
       +
             zsh = mkIf (!config.programs.fish.enable && config.programs.zsh.enable) {

     

       117
       +
               interactiveShellInit = shellInit "zsh";

     

       118
       +
             };

     

       119
       +
           };

     

       120
       +
         };

     

       121
       +
         meta.maintainers = with maintainers; [ sigmasquadron ];

     

       122
       +
       }