From ab466e313270898561ae7ed973c25d03813ee6ab Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Mon, 24 Apr 2017 00:26:33 -0400
Subject: [PATCH] Merge shell/{fasd,fzf} into shell/zsh

---
 shell/fasd/env.zsh |  1 -
 shell/fasd/install | 20 --------------------
 shell/fzf/install  | 12 ------------
 shell/zsh/.zshrc   |  2 ++
 shell/zsh/install  |  8 +++++---
 5 files changed, 7 insertions(+), 36 deletions(-)
 delete mode 100644 shell/fasd/env.zsh
 delete mode 100755 shell/fasd/install
 delete mode 100755 shell/fzf/install

diff --git a/shell/fasd/env.zsh b/shell/fasd/env.zsh
deleted file mode 100644
index c7e194d8..00000000
--- a/shell/fasd/env.zsh
+++ /dev/null
@@ -1 +0,0 @@
-cache fasd --init posix-alias zsh-hook zsh-ccomp zsh-ccomp-install zsh-wcomp zsh-wcomp-install
diff --git a/shell/fasd/install b/shell/fasd/install
deleted file mode 100755
index d15fa8b6..00000000
--- a/shell/fasd/install
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-if [[ -z $FORCE ]]; then
-    command -v fasd >/dev/null && exit
-fi
-
-case "$OSTYPE" in
-    darwin*)
-        brew install fasd
-        ;;
-    linux*)
-        if [[ -f /etc/arch-release ]]; then
-            pacaur --needed --noconfirm -S fasd
-        elif [[ -f /etc/debian_version ]]; then
-            sudo add-apt-repository ppa:aacebedo/fasd
-            sudo apt update
-            sudo apt install -y fasd
-        fi
-        ;;
-esac
diff --git a/shell/fzf/install b/shell/fzf/install
deleted file mode 100755
index f869e7a2..00000000
--- a/shell/fzf/install
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env bash
-
-case "$OSTYPE" in
-    darwin*)
-        brew install fzf
-        ;;
-    linux*)
-        if [[ -f /etc/arch-release ]]; then
-            sudo pacman --needed --noconfirm -S fzf
-        fi
-        ;;
-esac
diff --git a/shell/zsh/.zshrc b/shell/zsh/.zshrc
index 6ed289a3..123897af 100644
--- a/shell/zsh/.zshrc
+++ b/shell/zsh/.zshrc
@@ -23,6 +23,8 @@ if is-interactive; then
     load shell/zsh/completion.zsh
     load shell/zsh/keybinds.zsh
     load shell/zsh/prompt.zsh
+
+    cache fasd --init posix-alias zsh-hook zsh-ccomp zsh-ccomp-install zsh-wcomp zsh-wcomp-install
 fi
 loadall aliases.zsh
 
diff --git a/shell/zsh/install b/shell/zsh/install
index a1c4e132..fbc93ad8 100755
--- a/shell/zsh/install
+++ b/shell/zsh/install
@@ -3,7 +3,7 @@
 if [[ "$SHELL" != *zsh ]]; then
     case "$OSTYPE" in
         darwin*)
-            brew install zsh
+            brew install zsh fzf fasd
 
             # Add homebrewed zsh to /etc/shells
             if ! grep '/usr/local/bin/zsh' /etc/shells >/dev/null; then
@@ -12,9 +12,11 @@ if [[ "$SHELL" != *zsh ]]; then
             ;;
         linux*)
             if [[ -f /etc/arch-release ]]; then
-                sudo pacman --needed --noconfirm -S zsh
+                sudo pacman --needed --noconfirm -S zsh fzf fasd
             elif [[ -f /etc/debian_version ]]; then
-                sudo apt-get install -y zsh
+                sudo add-apt-repository ppa:aacebedo/fasd
+                sudo apt-get update
+                sudo apt-get install -y zsh fasd fzf
             fi
             ;;
     esac