From 3c503febbe2f1a2372dcf17013cf61fad1f011fd Mon Sep 17 00:00:00 2001
From: Aney <aney.login@gmail.com>
Date: Sat, 28 Nov 2020 17:25:13 +0000
Subject: [PATCH] Fixed issues including asking for password preventing a
 complete run

---
 installs/install.sh | 42 ++++++++++++++++++++++++++----------------
 1 file changed, 26 insertions(+), 16 deletions(-)

diff --git a/installs/install.sh b/installs/install.sh
index 4a08c3f..c8d9586 100755
--- a/installs/install.sh
+++ b/installs/install.sh
@@ -21,8 +21,12 @@ apt install git zsh tmux vim neofetch wget curl -y
 # Music player, rss feed
 apt install cmus mpd mpc ncmpcpp newsboat  -y
 
-# Video player and youtube-dl 
-apt install mpv youtube-dl -y
+# Video player 
+apt install mpv -y
+
+# Youtube-dl
+curl -L https://yt-dl.org/downloads/latest/youtube-dl -o /usr/local/bin/youtube-dl
+chmod a+rx /usr/local/bin/youtube-dl
 
 # Screencap and screenshots 
 apt install ffmpeg scrot -y
@@ -30,9 +34,12 @@ apt install ffmpeg scrot -y
 # Image viewer, PDF Reader (GUI)
 apt install feh zathura -y
 
+# Text tools
+apt install groff -y
+
 # Network Tools
 #apt install net-tools wicd -y
-#apt install network-manager -y
+apt install network-manager -y
 
 # Audio
 apt install alsa-utils alsa-oss pulseaudio -y
@@ -48,10 +55,7 @@ apt install libx11-dev libxft-dev libxinerama-dev -y
 apt install libx11-xcb-dev libxcb-res0-dev -y
 
 # Torrenting 
-#apt install transmission-daemon transmission-cli transmission-remote-cli -y
-
-# VPN
-apt install openvpn
+apt install transmission-daemon transmission-cli transmission-remote-cli -y
 
 #systemctl stop transmission-daemon.service
 #/lib/systemd/system/tranmission-daemon.service # Change debian-transmission to $USER
@@ -61,6 +65,9 @@ apt install openvpn
 
 # Setup the user for transmission-daemon
 
+# VPN
+apt install openvpn -y
+
 # Virtualisation
 #apt install qemu-kvm libvirt-clients libvirt-daemon-system virt-manager -y
 # Add to virtualisation groups
@@ -82,7 +89,7 @@ apt install brave-browser -y
 
 # Fake user installs
 userdo() {
-	sudo -H -u nathan bash -c '$1'
+	sudo -H -u nathan bash -c "$1"
 }
 
 # User
@@ -99,9 +106,11 @@ mkdir2() {
 }
 
 # Create directories
-#mkdir2 ~/downloads/ ~/pictures/ ~/video/ ~/recordings/ ~/documents/ ~/music/
-#touch ~/recordings/.recording_status
+sudo -H -u nathan bash -c "cd ~"
+mkdir2 downloads/ pictures/ video/ recordings/ documents/ music/
+touch recordings/.recording_status
 
+# Temp, so startx works
 echo "exec dwm" > $HOME/.xinitrc
 
 # Set location to download source code and other repos
@@ -140,7 +149,7 @@ export PATH=\$HOME/.local/bin/:$PATH
 export PATH=\$HOME/.local/bin/dmenu:$PATH
 
 # Muh scripties
-sudo -H -u nathan bash -c "git clone https://github.com/aney/scripts $HOME/agit/ascripts/"
+sudo -H -u nathan bash -c "git clone https://github.com/aney/scripts $REPO/ascripts/"
 # create a sym link. Will change to cp if others start using my install.sh
 ln -s $REPO/ascripts/dmenu/ $HOME/.local/bin/
 ln -s $REPO/ascripts/config/ $HOME/.local/bin/
@@ -148,17 +157,18 @@ ln -s $REPO/ascripts/backup/ $HOME/.local/bin/
 
 # lf file manager
 # Download a pre-built binary
-sudo -H -u nathan bash -c "curl -L
-https://github.com/gokcehan/lf/releases/latest/download/lf-linux-amd64.tar.gz | tar xzC ~/.local/bin"
+sudo -H -u nathan bash -c "curl -LO https://github.com/gokcehan/lf/releases/latest/download/lf-linux-amd64.tar.gz | tar xzC $HOME/.local/bin"
 
 # Change default shell to zsh
-sudo -H -u nathan bash -c "chsh -s /bin/zsh"
+chsh nathan -s /bin/zsh
 
 # dotfiles
 # This will overwrite existing dotfiles...
 sudo -H -u nathan bash -c "git clone https://github.com/aney/dotfiles $REPO/adotfiles/"
-cp -r $REPO/adotfiles/* $HOME/.
+cp -r $REPO/adotfiles/ $HOME/.
 
 # Oh my Zsh
-sudo -H -u nathan bash -c "sh -c '$(curl -fsSL https://raw.github.com/ohmyzsh/ohmyzsh/master/tools/install.sh)'"
+sudo -H -u nathan bash -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" "" --unattended
+
 # Extras. Bg image, icons, etc. 
+sudo -H -u nathan bash -c "$(curl 'https://pixabay.com/get/57e8d7414c51aa14f6d1867dda3536781539dbe35552754b_1920.jpg' $HOME/pictures/wallpapers/background.jpg)"