commit 62a78fc36134d6ffcf279d69f213b30c93885c9e · pyrox.dev/nixpkgs

nixos/modules/module-list.nix

···

       114
       114
        
         ./programs/autojump.nix

     

       115
       115
        
         ./programs/bandwhich.nix

     

       116
       116
        
         ./programs/bash/bash.nix

     

       117
       117
       +
         ./programs/bash/bash-completion.nix

     

       118
       118
       +
         ./programs/bash/ls-colors.nix

     

       117
       119
        
         ./programs/bash-my-aws.nix

     

       118
       120
        
         ./programs/bcc.nix

     

       119
       121
        
         ./programs/browserpass.nix

+37

nixos/modules/programs/bash/bash-completion.nix

···

       1
       1
       +
       { config, lib, pkgs, ... }:

     

       2
       2
       +
       

     

       3
       3
       +
       with lib;

     

       4
       4
       +
       

     

       5
       5
       +
       let

     

       6
       6
       +
         enable = config.programs.bash.enableCompletion;

     

       7
       7
       +
       in

     

       8
       8
       +
       {

     

       9
       9
       +
         options = {

     

       10
       10
       +
           programs.bash.enableCompletion = mkEnableOption "Bash completion for all interactive bash shells" // {

     

       11
       11
       +
             default = true;

     

       12
       12
       +
           };

     

       13
       13
       +
         };

     

       14
       14
       +
       

     

       15
       15
       +
         config = mkIf enable {

     

       16
       16
       +
           programs.bash.promptPluginInit = ''

     

       17
       17
       +
             # Check whether we're running a version of Bash that has support for

     

       18
       18
       +
             # programmable completion. If we do, enable all modules installed in

     

       19
       19
       +
             # the system and user profile in obsolete /etc/bash_completion.d/

     

       20
       20
       +
             # directories. Bash loads completions in all

     

       21
       21
       +
             # $XDG_DATA_DIRS/bash-completion/completions/

     

       22
       22
       +
             # on demand, so they do not need to be sourced here.

     

       23
       23
       +
             if shopt -q progcomp &>/dev/null; then

     

       24
       24
       +
               . "${pkgs.bash-completion}/etc/profile.d/bash_completion.sh"

     

       25
       25
       +
               nullglobStatus=$(shopt -p nullglob)

     

       26
       26
       +
               shopt -s nullglob

     

       27
       27
       +
               for p in $NIX_PROFILES; do

     

       28
       28
       +
                 for m in "$p/etc/bash_completion.d/"*; do

     

       29
       29
       +
                   . $m

     

       30
       30
       +
                 done

     

       31
       31
       +
               done

     

       32
       32
       +
               eval "$nullglobStatus"

     

       33
       33
       +
               unset nullglobStatus p m

     

       34
       34
       +
             fi

     

       35
       35
       +
           '';

     

       36
       36
       +
         };

     

       37
       37
       +
       }

+6 -39

nixos/modules/programs/bash/bash.nix

···

       11
       11
        
       

     

       12
       12
        
         cfg = config.programs.bash;

     

       13
       13
        
       

     

       14
       14
       -
         bashCompletion = optionalString cfg.enableCompletion ''

     

       15
       15
       -
           # Check whether we're running a version of Bash that has support for

     

       16
       16
       -
           # programmable completion. If we do, enable all modules installed in

     

       17
       17
       -
           # the system and user profile in obsolete /etc/bash_completion.d/

     

       18
       18
       -
           # directories. Bash loads completions in all

     

       19
       19
       -
           # $XDG_DATA_DIRS/bash-completion/completions/

     

       20
       20
       -
           # on demand, so they do not need to be sourced here.

     

       21
       21
       -
           if shopt -q progcomp &>/dev/null; then

     

       22
       22
       -
             . "${pkgs.bash-completion}/etc/profile.d/bash_completion.sh"

     

       23
       23
       -
             nullglobStatus=$(shopt -p nullglob)

     

       24
       24
       -
             shopt -s nullglob

     

       25
       25
       -
             for p in $NIX_PROFILES; do

     

       26
       26
       -
               for m in "$p/etc/bash_completion.d/"*; do

     

       27
       27
       -
                 . $m

     

       28
       28
       -
               done

     

       29
       29
       -
             done

     

       30
       30
       -
             eval "$nullglobStatus"

     

       31
       31
       -
             unset nullglobStatus p m

     

       32
       32
       -
           fi

     

       33
       33
       -
         '';

     

       34
       34
       -
       

     

       35
       35
       -
         lsColors = optionalString cfg.enableLsColors ''

     

       36
       36
       -
           eval "$(${pkgs.coreutils}/bin/dircolors -b)"

     

       37
       37
       -
         '';

     

       38
       38
       -
       

     

       39
       14
        
         bashAliases = concatStringsSep "\n" (

     

       40
       15
        
           mapAttrsFlatten (k: v: "alias ${k}=${escapeShellArg v}")

     

       41
       16
        
             (filterAttrs (k: v: v != null) cfg.shellAliases)

     
···

       123
       98
        
               type = types.lines;

     

       124
       99
        
             };

     

       125
       100
        
       

     

       126
       126
       -
             enableCompletion = mkOption {

     

       127
       127
       -
               default = true;

     

       101
       101
       +
             promptPluginInit = mkOption {

     

       102
       102
       +
               default = "";

     

       128
       103
        
               description = ''

     

       129
       129
       -
                 Enable Bash completion for all interactive bash shells.

     

       104
       104
       +
                 Shell script code used to initialise bash prompt plugins.

     

       130
       105
        
               '';

     

       131
       131
       -
               type = types.bool;

     

       132
       132
       -
             };

     

       133
       133
       -
       

     

       134
       134
       -
             enableLsColors = mkOption {

     

       135
       135
       -
               default = true;

     

       136
       136
       -
               description = ''

     

       137
       137
       -
                 Enable extra colors in directory listings.

     

       138
       138
       -
               '';

     

       139
       139
       -
               type = types.bool;

     

       106
       106
       +
               type = types.lines;

     

       107
       107
       +
               internal = true;

     

       140
       108
        
             };

     

       141
       109
        
       

     

       142
       110
        
           };

     
···

       167
       135
        
               set +h

     

       168
       136
        
       

     

       169
       137
        
               ${cfg.promptInit}

     

       170
       170
       -
               ${bashCompletion}

     

       171
       171
       -
               ${lsColors}

     

       138
       138
       +
               ${cfg.promptPluginInit}

     

       172
       139
        
               ${bashAliases}

     

       173
       140
        
       

     

       174
       141
        
               ${cfge.interactiveShellInit}

+20

nixos/modules/programs/bash/ls-colors.nix

···

       1
       1
       +
       { config, lib, pkgs, ... }:

     

       2
       2
       +
       

     

       3
       3
       +
       with lib;

     

       4
       4
       +
       

     

       5
       5
       +
       let

     

       6
       6
       +
         enable = config.programs.bash.enableLsColors;

     

       7
       7
       +
       in

     

       8
       8
       +
       {

     

       9
       9
       +
         options = {

     

       10
       10
       +
           programs.bash.enableLsColors = mkEnableOption "extra colors in directory listings" // {

     

       11
       11
       +
             default = true;

     

       12
       12
       +
           };

     

       13
       13
       +
         };

     

       14
       14
       +
       

     

       15
       15
       +
         config = mkIf enable {

     

       16
       16
       +
           programs.bash.promptPluginInit = ''

     

       17
       17
       +
             eval "$(${pkgs.coreutils}/bin/dircolors -b)"

     

       18
       18
       +
           '';

     

       19
       19
       +
         };

     

       20
       20
       +
       }