commit 5a5db609e5bd83bc589f36eef394f3ad172d6648 · pyrox.dev/nixpkgs

+55 -38

nixos/modules/programs/command-not-found/command-not-found.nix

···

       8
       8
        
       with lib;

     

       9
       9
        
       

     

       10
       10
        
       let

     

       11
       11
       -
       

     

       11
       11
       +
         cfg = config.programs.command-not-found;

     

       12
       12
        
         commandNotFound = pkgs.substituteAll {

     

       13
       13
        
           name = "command-not-found";

     

       14
       14
        
           dir = "bin";

     

       15
       15
        
           src = ./command-not-found.pl;

     

       16
       16
        
           isExecutable = true;

     

       17
       17
        
           inherit (pkgs) perl;

     

       18
       18
       +
           inherit (cfg) dbPath;

     

       18
       19
        
           perlFlags = concatStrings (map (path: "-I ${path}/lib/perl5/site_perl ")

     

       19
       20
        
             [ pkgs.perlPackages.DBI pkgs.perlPackages.DBDSQLite pkgs.perlPackages.StringShellQuote ]);

     

       20
       21
        
         };

     
···

       22
       23
        
       in

     

       23
       24
        
       

     

       24
       25
        
       {

     

       26
       26
       +
         options.programs.command-not-found = {

     

       27
       27
       +
       

     

       28
       28
       +
           enable = mkEnableOption "command-not-found hook for interactive shell";

     

       25
       29
        
       

     

       26
       26
       -
         programs.bash.interactiveShellInit =

     

       27
       27
       -
           ''

     

       28
       28
       -
             # This function is called whenever a command is not found.

     

       29
       29
       -
             command_not_found_handle() {

     

       30
       30
       -
               local p=/run/current-system/sw/bin/command-not-found

     

       31
       31
       -
               if [ -x $p -a -f /nix/var/nix/profiles/per-user/root/channels/nixos/programs.sqlite ]; then

     

       32
       32
       -
                 # Run the helper program.

     

       33
       33
       -
                 $p "$@"

     

       34
       34
       -
                 # Retry the command if we just installed it.

     

       35
       35
       -
                 if [ $? = 126 ]; then

     

       36
       36
       -
                   "$@"

     

       30
       30
       +
           dbPath = mkOption {

     

       31
       31
       +
             default = "/nix/var/nix/profiles/per-user/root/channels/nixos/programs.sqlite" ;

     

       32
       32
       +
             description = ''

     

       33
       33
       +
               Absolute path to programs.sqlite.

     

       34
       34
       +
       

     

       35
       35
       +
               By default this file will be provided by your channel

     

       36
       36
       +
               (nixexprs.tar.xz).

     

       37
       37
       +
             '';

     

       38
       38
       +
             type = types.path;

     

       39
       39
       +
           };

     

       40
       40
       +
         };

     

       41
       41
       +
       

     

       42
       42
       +
         config = mkIf cfg.enable {

     

       43
       43
       +
           programs.bash.interactiveShellInit =

     

       44
       44
       +
             ''

     

       45
       45
       +
               # This function is called whenever a command is not found.

     

       46
       46
       +
               command_not_found_handle() {

     

       47
       47
       +
                 local p=${commandNotFound}

     

       48
       48
       +
                 if [ -x $p -a -f ${cfg.dbPath} ]; then

     

       49
       49
       +
                   # Run the helper program.

     

       50
       50
       +
                   $p "$@"

     

       51
       51
       +
                   # Retry the command if we just installed it.

     

       52
       52
       +
                   if [ $? = 126 ]; then

     

       53
       53
       +
                     "$@"

     

       54
       54
       +
                   else

     

       55
       55
       +
                     return 127

     

       56
       56
       +
                   fi

     

       37
       57
        
                 else

     

       58
       58
       +
                   echo "$1: command not found" >&2

     

       38
       59
        
                   return 127

     

       39
       60
        
                 fi

     

       40
       40
       -
               else

     

       41
       41
       -
                 echo "$1: command not found" >&2

     

       42
       42
       -
                 return 127

     

       43
       43
       -
               fi

     

       44
       44
       -
             }

     

       45
       45
       -
           '';

     

       61
       61
       +
               }

     

       62
       62
       +
             '';

     

       46
       63
        
       

     

       47
       47
       -
         programs.zsh.interactiveShellInit =

     

       48
       48
       -
           ''

     

       49
       49
       -
             # This function is called whenever a command is not found.

     

       50
       50
       -
             command_not_found_handler() {

     

       51
       51
       -
               local p=/run/current-system/sw/bin/command-not-found

     

       52
       52
       -
               if [ -x $p -a -f /nix/var/nix/profiles/per-user/root/channels/nixos/programs.sqlite ]; then

     

       53
       53
       -
                 # Run the helper program.

     

       54
       54
       -
                 $p "$@"

     

       64
       64
       +
           programs.zsh.interactiveShellInit =

     

       65
       65
       +
             ''

     

       66
       66
       +
               # This function is called whenever a command is not found.

     

       67
       67
       +
               command_not_found_handler() {

     

       68
       68
       +
                 local p=${commandNotFound}

     

       69
       69
       +
                 if [ -x $p -a -f ${cfg.dbPath} ]; then

     

       70
       70
       +
                   # Run the helper program.

     

       71
       71
       +
                   $p "$@"

     

       55
       72
        
       

     

       56
       56
       -
                 # Retry the command if we just installed it.

     

       57
       57
       -
                 if [ $? = 126 ]; then

     

       58
       58
       -
                   "$@"

     

       73
       73
       +
                   # Retry the command if we just installed it.

     

       74
       74
       +
                   if [ $? = 126 ]; then

     

       75
       75
       +
                     "$@"

     

       76
       76
       +
                   fi

     

       77
       77
       +
                 else

     

       78
       78
       +
                   # Indicate than there was an error so ZSH falls back to its default handler

     

       79
       79
       +
                   echo "$1: command not found" >&2

     

       80
       80
       +
                   return 127

     

       59
       81
        
                 fi

     

       60
       60
       -
               else

     

       61
       61
       -
                 # Indicate than there was an error so ZSH falls back to its default handler

     

       62
       62
       -
                 return 127

     

       63
       63
       -
               fi

     

       64
       64
       -
             }

     

       65
       65
       -
           '';

     

       82
       82
       +
               }

     

       83
       83
       +
             '';

     

       66
       84
        
       

     

       67
       67
       -
         environment.systemPackages = [ commandNotFound ];

     

       68
       68
       -
       

     

       69
       69
       -
         # TODO: tab completion for uninstalled commands! :-)

     

       85
       85
       +
           environment.systemPackages = [ commandNotFound ];

     

       86
       86
       +
         };

     

       70
       87
        
       

     

       71
       88
        
       }

+1 -1

nixos/modules/programs/command-not-found/command-not-found.pl

···

       8
       8
        
       

     

       9
       9
        
       my $program = $ARGV[0];

     

       10
       10
        
       

     

       11
       11
       -
       my $dbPath = "/nix/var/nix/profiles/per-user/root/channels/nixos/programs.sqlite";

     

       11
       11
       +
       my $dbPath = "@dbPath@";

     

       12
       12
        
       

     

       13
       13
        
       my $dbh = DBI->connect("dbi:SQLite:dbname=$dbPath", "", "")

     

       14
       14
        
           or die "cannot open database `$dbPath'";