Updated

Makefile

@@ -1,26 +1,24 @@
 .PHONY: update bash ssh readline starship fzf
 
-install: update starship fzf bash readline
+install: update starship fzf bash
 
 update:
 	git pull
 
-bash:
-	rm -rf ~/.bashrc ~/.bash_aliases
-	stow bash
-
 ssh:
 	mkdir -p ~/.ssh
-	cat ssh/.ssh/authorized_keys >> ~/.ssh/authorized_keys
+	cat ssh/authorized_keys >> ~/.ssh/authorized_keys
 
-readline:
-	rm -rf ~/.inputrc
-	stow readline
+bash:
+	rm -rf ~/.bashrc ~/.bash_aliases
+	cp bash/bashrc ~/.bashrc
+	cp bash/bash_aliases ~/.bash_aliases
 
 starship:
 	curl -fsSL https://starship.rs/install.sh | bash -s -- -b ~/.local/bin -y
 	rm -rf ~/.config/starship.toml
-	stow starship
+	cp starship/starship.toml ~/.config/starship.toml
 
 fzf:
-	cd ~/.local && curl -fsSL https://raw.githubusercontent.com/junegunn/fzf/master/install | bash -s -- --xdg
+	git clone --depth 1 https://github.com/junegunn/fzf.git ~/.fzf
+	~/.fzf/install --xdg --key-bindings --completion --no-update-rc

bash/.bashrc → bash/bashrc

@@ -51,9 +51,6 @@ shopt -s checkwinsize
 # Allow ctrl-S for history navigation (with ctrl-R)
 stty -ixon
 
-# vi mode
-set -o vi
-
 # Ignore case on auto-completion
 # Note: bind used instead of sticking these in .inputrc
 if [[ $iatest > 0 ]]; then bind "set completion-ignore-case on"; fi
@@ -66,8 +63,7 @@ PATH="$HOME/.local/bin:$HOME/bin:$PATH"
 export PATH
 
 # enable fzf
-[ -f /usr/share/fzf/completion.zsh ] && source /usr/share/fzf/completion.zsh
-[ -f /usr/share/fzf/key-bindings.zsh ] && source /usr/share/fzf/key-bindings.zsh
+[ -f "${XDG_CONFIG_HOME:-$HOME/.config}"/fzf/fzf.bash ] && source "${XDG_CONFIG_HOME:-$HOME/.config}"/fzf/fzf.bash
 export FZF_DEFAULT_OPS="--extended"
 export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND"
 

readline/.inputrc

@@ -1,9 +0,0 @@
-# tab completion
-TAB: menu-complete
-set show-all-if-ambiguous on
-set mark-symlinked-directories on
-set colored-stats on
-
-# vi mode
-set editing-mode vi
-set keymap vi