about summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorGraham Christensen <graham@grahamc.com>2017-11-20 21:46:54 -0500
committerGitHub <noreply@github.com>2017-11-20 21:46:54 -0500
commit3c9b356e10e6e8f698af945c57e56c56733d3788 (patch)
tree751e890bacc3443c3abd561d728c963b90845535 /nixos
parent1c1455fbc5f20cb08f65e1a17e3ca039222dbf71 (diff)
parent101d56cb0cae4feda712a72e32d1a287511ba99a (diff)
Merge pull request #31860 from rycee/nixos/bash/fix/inputrc
nixos/bash: mark `inputrc` etc file as default
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/programs/bash/bash.nix5
1 files changed, 3 insertions, 2 deletions
diff --git a/nixos/modules/programs/bash/bash.nix b/nixos/modules/programs/bash/bash.nix
index e23849d350b4c..ef1acdfe66e60 100644
--- a/nixos/modules/programs/bash/bash.nix
+++ b/nixos/modules/programs/bash/bash.nix
@@ -197,8 +197,9 @@ in
         fi
       '';
 
-    # Configuration for readline in bash.
-    environment.etc."inputrc".source = ./inputrc;
+    # Configuration for readline in bash. We use "option default"
+    # priority to allow user override using both .text and .source.
+    environment.etc."inputrc".source = mkOptionDefault ./inputrc;
 
     users.defaultUserShell = mkDefault pkgs.bashInteractive;