Do things with zsh and tmux

3 files changed, 84 insertions, 14 deletions

diff --git a/install/install_debian.sh b/install/install_debian.sh
index dc1d3ec..a2b8c6a 100755
--- a/install/install_debian.sh
+++ b/install/install_debian.sh
@@ -33,12 +33,12 @@ dlgYN "> Install Oh-My-Zsh" res
 if [ $res -eq 1 ]; then
     tput sc
     sh -c "$(curl -fsSL https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh)"
-		
+
 		# Zsh-autosuggestions
     git clone https://github.com/zsh-users/zsh-autosuggestions ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-autosuggestions
 		# Zsh-syntax-highlighting
 		git clone https://github.com/zsh-users/zsh-syntax-highlighting.git ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-syntax-highlighting
-		
+
     tput rc; tput ed
 fi
 
@@ -63,7 +63,7 @@ if [ $res -eq 1 ]; then
 	CWD=$(pwd)
     tput sc
     ln -isf "$CWD/bin" ~/bin
-    ln -isf "$CWD/linux/zshrc" ~/.zshrc
+    ln -isf "$CWD/Common/zshrc" ~/.zshrc
     ln -isf "$CWD/linux/tmux.conf" ~/.tmux.conf
   	ln -isf "$CWD/Common/vimrc" ~/.vimrc
 	  ln -isf "$CWD/Common/vim" ~/.vim
diff --git a/install/install_fedora.sh b/install/install_fedora.sh
new file mode 100755
index 0000000..6b3a23a
--- /dev/null
+++ b/install/install_fedora.sh
@@ -0,0 +1,70 @@
+#!/bin/bash
+
+function dlgYN() {
+    tput sc
+    tput setaf 4
+    printf "$1 (y/n)? "
+    while :
+    do
+        read -n 1 -p "" YNQuestionAnswer
+        if [[ $YNQuestionAnswer == "y" ]]; then
+            tput rc; tput el
+            printf "$1?: \e[0;32mYes\e[0m\n"
+            tput sc
+            eval $2=1 # Set parameter 2 of input to the return value
+            break
+        elif [[ $YNQuestionAnswer == "n" ]]; then
+            tput rc; tput el
+            printf "$1?: \e[0;31mNo\e[0m\n"
+            eval $2=0 # Set parameter 2 of input to the return value
+            break
+        fi
+    done
+}
+
+dlgYN "> Install \"Highlight, atool, w3m, mediainfo, vim, git\"" res
+if [ $res -eq 1 ]; then
+    tput sc
+    sudo dnf -qy install highlight atool w3m mediainfo curl zsh vim git python3-pip zsh tmux
+    tput rc; tput ed
+fi
+
+dlgYN "> Install Oh-My-Zsh" res
+if [ $res -eq 1 ]; then
+    tput sc
+    sh -c "$(curl -fsSL https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh)"
+
+	# Zsh-autosuggestions
+    git clone https://github.com/zsh-users/zsh-autosuggestions ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-autosuggestions
+	# Zsh-syntax-highlighting
+	git clone https://github.com/zsh-users/zsh-syntax-highlighting.git ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-syntax-highlighting
+
+    tput rc; tput ed
+fi
+
+dlgYN "> Install Powerline and Powerlevel10k" res
+if [ $res -eq 1 ]; then
+    tput sc
+	pip3 install pygments
+    pip3 install powerline-status
+	git clone --depth=1 https://github.com/romkatv/powerlevel10k.git ${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}/themes/powerlevel10k
+    tput rc; tput ed
+fi
+
+dlgYN "> Create symlinks" res
+if [ $res -eq 1 ]; then
+	CWD=$(pwd)
+    tput sc
+    ln -isf "$CWD/bin" ~/bin
+    ln -isf "$CWD/linux/tmux.conf" ~/.tmux.conf
+    ln -isf "$CWD/Common/zshrc" ~/.zshrc
+  	ln -isf "$CWD/Common/vimrc" ~/.vimrc
+	ln -isf "$CWD/Common/vim" ~/.vim
+	ln -isf "$CWD/Common/p10k.zsh" ~/.p10k.zsh
+    tput rc; tput ed
+fi
+
+tput setaf 3
+echo "\nPlease install the font Roboto mono nerd, and enable it in your terminal."
+echo "\nPlease run ':PlugInstall' in vim"
+tput sgr0
diff --git a/install/install_mac.sh b/install/install_mac.sh
index 9ac4bc4..4097395 100755
--- a/install/install_mac.sh
+++ b/install/install_mac.sh
@@ -32,7 +32,7 @@ fi
 dlgYN "> Install \"Highlight, atool, w3m, mediainfo, vim\"" res
 if [ $res -eq 1 ]; then
     tput sc
-	  brew install highlight atool w3m mediainfo vim
+	brew install highlight atool w3m mediainfo vim
     tput rc; tput ed
 fi
 
@@ -40,33 +40,33 @@ dlgYN "> Install Oh-My-Zsh" res
 if [ $res -eq 1 ]; then
     tput sc
     sh -c "$(curl -fsSL https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh)"
-		
-		# Zsh-autosuggestions
+
+	# Zsh-autosuggestions
     git clone https://github.com/zsh-users/zsh-autosuggestions ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-autosuggestions
-		# Zsh-syntax-highlighting
-		git clone https://github.com/zsh-users/zsh-syntax-highlighting.git ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-syntax-highlighting
-		
+	# Zsh-syntax-highlighting
+	git clone https://github.com/zsh-users/zsh-syntax-highlighting.git ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-syntax-highlighting
+
     tput rc; tput ed
 fi
 
 dlgYN "> Install Powerline && powerlevel10k" res
 if [ $res -eq 1 ]; then
     tput sc
-	  pip3 install pygments
+	pip3 install pygments
     pip3 install powerline-status
-		brew install romkatv/powerlevel10k/powerlevel10k
+	brew install romkatv/powerlevel10k/powerlevel10k
     tput rc; tput ed
 fi
 
 dlgYN "> Create symlinks" res
 if [ $res -eq 1 ]; then
 	CWD=$(PWD)
-  tput sc
-  ln -isf "$CWD/bin" ~/bin
-  ln -isf "$CWD/mac/zshrc" ~/.zshrc
+    tput sc
+    ln -isf "$CWD/bin" ~/bin
 	ln -isf "$CWD/mac/tmux.conf" ~/.tmux.conf
 	ln -isf "$CWD/mac/Hyperterm/hyper.js" ~/.hyper.js
 	ln -isf "$CWD/mac/Hyperterm/local" ~/.hyper_plugins/local
+    ln -isf "$CWD/Common/zshrc" ~/.zshrc
 	ln -isf "$CWD/Common/vimrc" ~/.vimrc
 	ln -isf "$CWD/Common/vim" ~/.vim
 	ln -isf "$CWD/Common/p10k.zsh" ~/.p10k.zsh