diff options
author | Ludovic Courtès <ludo@gnu.org> | 2009-08-10 10:18:33 +0000 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2009-08-10 10:18:33 +0000 |
commit | fe51b0c6c34ffc1186056112bab488434d327d5a (patch) | |
tree | 1e1fb6aefce772532e787f9bb4ed3d446d275006 /modules/programs | |
parent | 4c848efc1aa7175a40ab4c01c1b5f843c612ae8b (diff) | |
download | nixpkgs-fe51b0c6c34ffc1186056112bab488434d327d5a.tar nixpkgs-fe51b0c6c34ffc1186056112bab488434d327d5a.tar.gz nixpkgs-fe51b0c6c34ffc1186056112bab488434d327d5a.tar.bz2 nixpkgs-fe51b0c6c34ffc1186056112bab488434d327d5a.tar.lz nixpkgs-fe51b0c6c34ffc1186056112bab488434d327d5a.tar.xz nixpkgs-fe51b0c6c34ffc1186056112bab488434d327d5a.tar.zst nixpkgs-fe51b0c6c34ffc1186056112bab488434d327d5a.zip |
bashrc: Source `${bash}/etc/bash_completion' when available.
svn path=/nixos/trunk/; revision=16641
Diffstat (limited to 'modules/programs')
-rw-r--r-- | modules/programs/bash/bash.nix | 4 | ||||
-rw-r--r-- | modules/programs/bash/bashrc.sh | 10 |
2 files changed, 13 insertions, 1 deletions
diff --git a/modules/programs/bash/bash.nix b/modules/programs/bash/bash.nix index f7ac48ccb28..38ed7c7a186 100644 --- a/modules/programs/bash/bash.nix +++ b/modules/programs/bash/bash.nix @@ -30,12 +30,14 @@ in # should go into this script. source = pkgs.substituteAll { src = ./bashrc.sh; + + bash = pkgs.bash; systemPath = config.system.path; wrapperDir = config.security.wrapperDir; modulesTree = config.system.modulesTree; shellInit = config.environment.shellInit; }; - target = "bashrc"; + target = "bashrc"; } { # Script executed when the shell starts as a login shell. diff --git a/modules/programs/bash/bashrc.sh b/modules/programs/bash/bashrc.sh index b180d352fdb..b09e3230a5d 100644 --- a/modules/programs/bash/bashrc.sh +++ b/modules/programs/bash/bashrc.sh @@ -61,3 +61,13 @@ alias ll="ls -l" alias l="ls -alh" alias which="type -p" +# Completion. +if [ -d "@bash@/etc/bash_completion.d" ] +then + export BASH_COMPLETION_DIR="@bash@/etc/bash_completion.d" +fi +if [ -f "@bash@/etc/bash_completion" ] +then + export BASH_COMPLETION="@bash@/etc/bash_completion" + source "$BASH_COMPLETION" +fi |