Fixed vim +GoInstallBinaries

 - prevent clobbering terminal
 - add $HOME/go/bin to PATH if not set .zshrc

CHANGELOG.md

@@ -1,16 +1,20 @@
 # Changelog
 
-## [v1.5.2](https://github.com/mr-pmillz/pimp-my-shell/tree/v1.5.2) (2021-10-17)
+## [v1.5.3](https://github.com/mr-pmillz/pimp-my-shell/tree/v1.5.3) (2021-10-17)
 
-[Full Changelog](https://github.com/mr-pmillz/pimp-my-shell/compare/v1.4.5...v1.5.2)
+[Full Changelog](https://github.com/mr-pmillz/pimp-my-shell/compare/v1.5.2...v1.5.3)
 
-## [v1.4.5](https://github.com/mr-pmillz/pimp-my-shell/tree/v1.4.5) (2021-10-16)
+## [v1.5.2](https://github.com/mr-pmillz/pimp-my-shell/tree/v1.5.2) (2021-10-17)
 
-[Full Changelog](https://github.com/mr-pmillz/pimp-my-shell/compare/v1.5.1...v1.4.5)
+[Full Changelog](https://github.com/mr-pmillz/pimp-my-shell/compare/v1.5.1...v1.5.2)
 
 ## [v1.5.1](https://github.com/mr-pmillz/pimp-my-shell/tree/v1.5.1) (2021-10-16)
 
-[Full Changelog](https://github.com/mr-pmillz/pimp-my-shell/compare/v1.5.0...v1.5.1)
+[Full Changelog](https://github.com/mr-pmillz/pimp-my-shell/compare/v1.4.5...v1.5.1)
+
+## [v1.4.5](https://github.com/mr-pmillz/pimp-my-shell/tree/v1.4.5) (2021-10-16)
+
+[Full Changelog](https://github.com/mr-pmillz/pimp-my-shell/compare/v1.5.0...v1.4.5)
 
 ## [v1.5.0](https://github.com/mr-pmillz/pimp-my-shell/tree/v1.5.0) (2021-10-16)
 

extra/extra.go

@@ -114,7 +114,6 @@ func InstallExtraPackages(osType string, dirs *localio.Directories, packages *lo
 			}
 		}
 
-
 		// install fzf configuration
 		if exists, err := localio.Exists(fmt.Sprintf("%s/.fzf", dirs.HomeDir)); err == nil && !exists {
 			installString := fmt.Sprintf("git clone --depth 1 https://github.com/junegunn/fzf.git %s/.fzf && %s/.fzf/install --all", dirs.HomeDir, dirs.HomeDir)

vim/vim.go

@@ -99,7 +99,8 @@ func InstallVimPlugins(osType string, dirs *localio.Directories) error {
 		return err
 	}
 
-	if err := localio.RunCommandPipeOutput("vim -c \"GoInstallBinaries\" -c \"qa\""); err != nil {
+	fmt.Println("[+] Installing vim binaries via +GoInstallBinaries")
+	if err := localio.RunCommandPipeOutput("vim -es -c \"GoInstallBinaries\" -c \"qa\" || true"); err != nil {
 		return err
 	}
 

zsh/templates/.zshrc_extra.zsh → zsh/templates/darwin/.zshrc_extra.zsh

@@ -1,3 +1,6 @@
+# Add ~/go/bin to path
+[[ ":$PATH:" != *":$HOME/go/bin:"* ]] && export PATH="${PATH}:$HOME/go/bin"
+
 # Set CTRL+U to only delete backwards to the left of the cursor.
 bindkey \^U backward-kill-line
 

zsh/templates/linux/.zshrc_extra.zsh

@@ -0,0 +1,11 @@
+# Add ~/go/bin to path
+[[ ":$PATH:" != *":$HOME/go/bin:"* ]] && export PATH="${PATH}:$HOME/go/bin"
+# For linux add ~/.local/bin to path
+[[ ":$PATH:" != *":$HOME/.locaal/bin:"* ]] && export PATH="${PATH}:$HOME/.local/bin"
+
+# Set CTRL+U to only delete backwards to the left of the cursor.
+bindkey \^U backward-kill-line
+
+# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
+[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh
+POWERLEVEL9K_INSTANT_PROMPT=quiet

zsh/zsh.go

@@ -148,10 +148,12 @@ func InstallOhMyZsh(osType string, dirs *localio.Directories) error {
 			return err
 		}
 
-		zshExtraConfig, err := zshConfigs.ReadFile("templates/.zshrc_extra.zsh")
+		zshExtraConfigTemplate := fmt.Sprintf("templates/%s/.zshrc_extra.zsh", osType)
+		zshExtraConfig, err := zshConfigs.ReadFile(zshExtraConfigTemplate)
 		if err != nil {
 			return err
 		}
+
 		if err := localio.EmbedFileStringAppendToDest(zshExtraConfig, "~/.zshrc"); err != nil {
 			return err
 		}