diff --git a/bashrc b/bashrc
index a618c85..1318704 100644
--- a/bashrc
+++ b/bashrc
@@ -7,6 +7,7 @@
 
 PS1='[\u@\h \W]\$ '
 PATH=${PATH}:${HOME}/bin
+EDITOR=emacsclient
 
 eval $(keychain --eval --quiet)
 
diff --git a/inputrc b/inputrc
new file mode 100644
index 0000000..ac81a39
--- /dev/null
+++ b/inputrc
@@ -0,0 +1 @@
+set bell-style none
diff --git a/setup.sh b/setup.sh
index fa0fa29..360edf8 100755
--- a/setup.sh
+++ b/setup.sh
@@ -25,4 +25,5 @@ link_dir config ${HOME}/.config
 link_dir bin ${HOME}/bin
 link bash_profile ${HOME}/.bash_profile
 link bashrc ${HOME}/.bashrc
+link inputrc ${HOME}/.inputrc