From 5c53dc1d760ef697852650833cf087c2e337f321 Mon Sep 17 00:00:00 2001
From: Taylor Bockman <tbockman@taylorbockman.com>
Date: Sat, 5 Nov 2016 15:02:26 -0700
Subject: [PATCH] Update ubuntu

---
 dotfiles/install_dotfiles.sh |  12 ++++
 ubuntu/README.md             |  15 ++++
 ubuntu/cleanup_trash.sh      |  16 +++++
 ubuntu/desktop_display.sh    |   5 ++
 ubuntu/installer.sh          | 164 +++++++------------------------------------
 ubuntu/laptop_display.sh     |  25 +++++++
 ubuntu/pre_setup.sh          |  15 ++++
 ubuntu/shell.sh              |   6 ++
 ubuntu/software_and_fonts.sh |  81 +++++++++++++++++++++
 9 files changed, 202 insertions(+), 137 deletions(-)
 create mode 100755 dotfiles/install_dotfiles.sh
 create mode 100755 ubuntu/cleanup_trash.sh
 create mode 100755 ubuntu/desktop_display.sh
 create mode 100755 ubuntu/laptop_display.sh
 create mode 100755 ubuntu/pre_setup.sh
 create mode 100755 ubuntu/shell.sh
 create mode 100755 ubuntu/software_and_fonts.sh

diff --git a/dotfiles/install_dotfiles.sh b/dotfiles/install_dotfiles.sh
new file mode 100755
index 0000000..6f071ff
--- /dev/null
+++ b/dotfiles/install_dotfiles.sh
@@ -0,0 +1,12 @@
+ln -s $(pwd)/global_gitignore ~/.global_gitignore
+ln -s $(pwd)/ocamlinit ~/.ocamlinit
+ln -s $(pwd)/tmux.conf ~/.tmux.conf
+ln -s $(pwd)/vimrc ~/.vimrc
+ln -s $(pwd)/zshrc ~/.zshrc
+
+if [[ -d "~/.config" ]]
+then
+  cp -R $(pwd)/config/* ~/.config/
+else
+  ln -s $(pwd)/config ~/.config
+fi
diff --git a/ubuntu/README.md b/ubuntu/README.md
index 717c286..fc5970a 100644
--- a/ubuntu/README.md
+++ b/ubuntu/README.md
@@ -1,5 +1,20 @@
 # Ubuntu Install
 
+## Desktop Notes
+
+Install Ubuntu on a desktop with these scripts is a little different. I currently use cinnamon instead of xmonad on my desktop.
+
+
+### Nvidia Graphics Card Issues with LUKS
+
+It seems that the Nvidia proprietary drivers screw up booting into the splash 
+screen irrepairably. This likely won't bother you much if you don't use LUKS
+but for those of us who do disabling the splash screen is the only way to 
+be able to enter your password in and continue booting. 
+
+To fix this problem change `splash` to `nosplash` 
+in your GRUB config and run `sudo update-grub` to lock in the changes.
+
 ![desktop screenshot](../current-desktop.png?raw=true "Current Desktop")
 
 By running the installer it wipes a complete install and turns it into something more minimal and less resource
diff --git a/ubuntu/cleanup_trash.sh b/ubuntu/cleanup_trash.sh
new file mode 100755
index 0000000..12bdaaa
--- /dev/null
+++ b/ubuntu/cleanup_trash.sh
@@ -0,0 +1,16 @@
+# Cleanup
+echo "Cleaning up unneccessary programs..."
+sudo apt-get -qq -y purge firefox
+sudo apt-get -qq -y purge rhythmbox
+sudo apt-get -qq -y purge cheese
+sudo apt-get -qq -y purge shotwell
+sudo apt-get -qq -y purge shotwell-common
+sudo apt-get -qq -y purge thunderbird
+sudo apt-get -qq -y purge aisleriot
+sudo apt-get -qq -y purge webbrowser-app
+sudo apt-get -qq -y purge gnome-sudoku
+sudo apt-get -qq -y purge mahjongg
+sudo apt-get -qq -y purge gnomine
+sudo apt-get -qq -y purge ace-of-penguins
+sudo apt-get -qq -y purge onboard
+sudo apt -qq -y autoremove
diff --git a/ubuntu/desktop_display.sh b/ubuntu/desktop_display.sh
new file mode 100755
index 0000000..065ae06
--- /dev/null
+++ b/ubuntu/desktop_display.sh
@@ -0,0 +1,5 @@
+sudo apt-get update
+sudo apt-get upgrade
+sudo apt-add-repository ppa:embrosyn/cinnamon
+sudo apt-get update
+sudo apt-get install cinnamon
diff --git a/ubuntu/installer.sh b/ubuntu/installer.sh
index a2069a4..857e310 100644
--- a/ubuntu/installer.sh
+++ b/ubuntu/installer.sh
@@ -12,162 +12,52 @@ if [ $online -ne 0 ]; then
 fi
 
 # Pre-setup
-echo "Running pre-setup..."
-sudo add-apt-repository ppa:neovim-ppa/unstable
-sudo apt-add-repository -y "deb http://repository.spotify.com stable non-free"
-sudo apt-add-repository -y ppa:richardgv/compton
-sudo apt-add-respository -y "http://apt.postgresql.org/pub/repos/apt/"
-sudo apt-add-repository -y ppa:webupd8team/java
-sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys D2C19886
-sudo dpkg --add-architecture i386
-sudo add-apt-repository ppa:wine/wine-builds
-sudo echo "deb http://cran.rstudio.com/bin/linux/ubuntu xenial/" | sudo tee -a /etc/apt/sources.list
-gpg --keyserver keyserver.ubuntu.com --recv-key E084DAB9
-gpg -a --export E084DAB9 | sudo apt-key add -
-sudo apt-get -qq -y update
-sudo apt-get -qq -y upgrade
-
-# Window Manager
-echo "Installing window manager..."
-sudo apt-get -qq -y install xmonad
-sudo apt-get -qq -y install compton
-sudo apt-get -qq -y install libghc-xmonad-contrib-dev
-sudo apt-get -qq -y install xorg
-sudo apt-get -qq -y install xinit
-sudo apt-get -qq -y install wmname
-sudo apt-get -qq -y install libxcb-xinerama0-dev
-sudo apt-get -qq -y install libxcb-randr0-dev
-sudo apt-get -qq -y install xbacklight
-
-# Build and install lemonbar from source
-echo "Installing lemonbar from source..."
-pushd
-cd ~
-git clone https://github.com/LemonBoy/bar.git
-cd bar/
-make
-sudo make install
-popd
-
-# Dmenu
-echo "Installing Dmenu..."
-sudo apt-get -qq -y install suckless-tools
-
-# Languages
-echo "Installing languages and tools..."
-sudo apt-get -qq -y install libssl-dev
-sudo apt-get -qq -y install libcurl4-openssl-dev
-sudo apt-get -qq -y install python-dev
-sudo apt-get -qq -y install python-pip
-sudo apt-get -qq -y install python3-dev
-sudo apt-get -qq -y install python3-pip
-sudo apt-get -qq -y install python3-setuptools
-sudo apt-get -qq -y install m4
-sudo apt-get -qq -y install ocaml
-sudo apt-get -qq -y install aspcud
-sudo apt-get -qq -y install liblapack-dev
-sudo apt-get install --install-recommends winehq-devel
-wget https://raw.github.com/ocaml/opam/master/shell/opam_installer.sh -O - | sh -s /usr/local/bin
-sudo apt-get -qq -y install r-base
-sudo apt-get -qq -y install r-base-dev
-sudo apt-get install gdebi-core
-wget https://download1.rstudio.org/rstudio-0.99.896-amd64.deb
-sudo gdebi -n rstudio-0.99.896-amd64.deb
-rm rstudio-0.99.896-amd64.deb
-sudo apt-get -qq -y install r-cran-rcpparmadillo
-sudo apt-get -qq -y install r-cran-rgl
-sudo apt-get -qq -y install libpq-dev
-
-# Editors
-echo "Installing editors..."
-sudo apt-get -qq -y install vim
-sudo apt-get -qq -y install neovim
+./pre_setup.sh
+
+# Laptop Display
+if [[ $1 == "laptop" ]]
+then
+./laptop_display.sh
+else
+./desktop_display.sh
+fi
 
-echo "Installing python tools for neovim..."
-sudo pip install neovim
+# Software
+./software_and_fonts.sh
 
-# Databases
-echo "Installing databases..."
-sudo apt-get -qq -y install mysql-server
-sudo apt-get -qq -y install libmysqlclient-dev
 # Terminals
 echo "Installing terminal..."
+if [[ $1 == "laptop" ]]
+then
 sudo apt-get -qq -y rxvt-unicode
+else
+sudo apt-get -qq -y tilda
+fi
 
 # Shell
-echo "Installing shells..."
-sudo apt-get -qq -y install zsh
+./shell.sh
 
-echo "Changing shell to zsh..."
-chsh -s $(which zsh)
 
-# Source Control
-echo "Installing source control..."
-sudo apt-get -qq -y install git
-
-# Remove Unity (This has to be done here so we can reinstall what unity removes)
+if [[ $1 == "laptop" ]]
+then
 echo "Removing Unity..."
 sudo apt-get -qq -y purge unity
+fi
 
-# Multimedia
-echo "Installing multimedia..."
-sudo apt-get -qq -y install ffmpeg
-sudo apt-get -qq -y install mplayer
-sudo apt-get -qq -y install spotify-client
-sudo apt-get -qq -y install pepperflashplugin-nonfree
 
-# Tools
-echo "Installing tools..."
-sudo apt-get -qq -y install transmission
-sudo apt-get -qq -y install htop
-sudo apt-get -qq -y install scrot
-sudo apt-get -qq -y install tmux
+if [[ $1 == "laptop"]]
+then 
 sudo apt-get -qq -y install feh
-sudo apt-get -qq -y install unclutter
-sudo apt-get -qq -y install xdotool
-sudo apt-get -qq -y install cmake
-sudo apt-get -qq -y install gsimplecal
-sudo apt-get -qq -y install xclip
-sudo apt-get -qq -y install texlive-full
-sudo apt-get -qq -y install oracle-java8-installer
-
-# Comms
-echo "Installing comms..."
-sudo apt-get -qq -y install irssi
-sudo apt-get -qq -y install skype
-
-# Browsers
-echo "Installing browsers..."
-sudo apt-get -qq -y install chromium-browser
-
-# Fonts
-echo "Installing fonts..."
-sudo apt-get -qq -y install fonts-inconsolata
-fc-cache --really-force -v
+fi
 
-# Security
-echo "Installing security..."
-sudo apt-get -qq -y install physlock
+./cleanup_trash
 
-# Cleanup
-echo "Cleaning up unneccessary programs..."
-sudo apt-get -qq -y purge firefox
-sudo apt-get -qq -y purge rhythmbox
-sudo apt-get -qq -y purge cheese
-sudo apt-get -qq -y purge shotwell
-sudo apt-get -qq -y purge shotwell-common
-sudo apt-get -qq -y purge thunderbird
-sudo apt-get -qq -y purge aisleriot
-sudo apt-get -qq -y purge webbrowser-app
-sudo apt-get -qq -y purge gnome-sudoku
-sudo apt-get -qq -y purge mahjongg
-sudo apt-get -qq -y purge gnomine
-sudo apt-get -qq -y purge ace-of-penguins
-sudo apt-get -qq -y purge onboard
+if [[$1 == "laptop"]]
+then
 sudo apt-get -qq -y purge lightdm
 sudo apt-get -qq -y purge gnome-terminal
 sudo apt-get -qq -y purge gnome-terminal-data
-sudo apt -qq -y autoremove
+fi
 
 # Right here is where the sed one-line would go to replace
 # "quiet splash" with "text" in the grub config and then call
diff --git a/ubuntu/laptop_display.sh b/ubuntu/laptop_display.sh
new file mode 100755
index 0000000..55cd2c3
--- /dev/null
+++ b/ubuntu/laptop_display.sh
@@ -0,0 +1,25 @@
+# Window Manager
+echo "Installing window manager..."
+sudo apt-get -qq -y install xmonad
+sudo apt-get -qq -y install compton
+sudo apt-get -qq -y install libghc-xmonad-contrib-dev
+sudo apt-get -qq -y install xorg
+sudo apt-get -qq -y install xinit
+sudo apt-get -qq -y install wmname
+sudo apt-get -qq -y install libxcb-xinerama0-dev
+sudo apt-get -qq -y install libxcb-randr0-dev
+sudo apt-get -qq -y install xbacklight
+
+# Build and install lemonbar from source
+echo "Installing lemonbar from source..."
+pushd
+cd ~
+git clone https://github.com/LemonBoy/bar.git
+cd bar/
+make
+sudo make install
+popd
+
+# Dmenu
+echo "Installing Dmenu..."
+sudo apt-get -qq -y install suckless-tools
diff --git a/ubuntu/pre_setup.sh b/ubuntu/pre_setup.sh
new file mode 100755
index 0000000..0c9903c
--- /dev/null
+++ b/ubuntu/pre_setup.sh
@@ -0,0 +1,15 @@
+# Pre-setup
+echo "Running pre-setup..."
+sudo apt-add-repository ppa:neovim-ppa/unstable
+sudo apt-add-repository -y "deb http://repository.spotify.com stable non-free"
+sudo apt-add-repository -y ppa:richardgv/compton
+sudo apt-add-repository -y "http://apt.postgresql.org/pub/repos/apt/"
+sudo apt-add-repository -y ppa:webupd8team/java
+sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys D2C19886
+sudo dpkg --add-architecture i386
+sudo add-apt-repository ppa:wine/wine-builds
+sudo echo "deb http://cran.rstudio.com/bin/linux/ubuntu xenial/" | sudo tee -a /etc/apt/sources.list
+gpg --keyserver keyserver.ubuntu.com --recv-key E084DAB9
+gpg -a --export E084DAB9 | sudo apt-key add -
+sudo apt-get -qq -y update
+sudo apt-get -qq -y upgrade
diff --git a/ubuntu/shell.sh b/ubuntu/shell.sh
new file mode 100755
index 0000000..60af2b2
--- /dev/null
+++ b/ubuntu/shell.sh
@@ -0,0 +1,6 @@
+# Shell
+echo "Installing shells..."
+sudo apt-get -qq -y install zsh
+
+echo "Changing shell to zsh..."
+chsh -s $(which zsh)
diff --git a/ubuntu/software_and_fonts.sh b/ubuntu/software_and_fonts.sh
new file mode 100755
index 0000000..a6c6e84
--- /dev/null
+++ b/ubuntu/software_and_fonts.sh
@@ -0,0 +1,81 @@
+# Languages
+echo "Installing languages and tools..."
+sudo apt-get -qq -y install libssl-dev
+sudo apt-get -qq -y install libcurl4-openssl-dev
+sudo apt-get -qq -y install python-dev
+sudo apt-get -qq -y install python-pip
+sudo apt-get -qq -y install python3-dev
+sudo apt-get -qq -y install python3-pip
+sudo apt-get -qq -y install python3-setuptools
+sudo apt-get -qq -y install m4
+sudo apt-get -qq -y install ocaml
+sudo apt-get -qq -y install aspcud
+sudo apt-get -qq -y install liblapack-dev
+sudo apt-get install --install-recommends winehq-devel
+wget https://raw.github.com/ocaml/opam/master/shell/opam_installer.sh -O - | sh -s /usr/local/bin
+sudo apt-get -qq -y install r-base
+sudo apt-get -qq -y install r-base-dev
+sudo apt-get install gdebi-core
+wget https://download1.rstudio.org/rstudio-0.99.896-amd64.deb
+sudo gdebi -n rstudio-0.99.896-amd64.deb
+rm rstudio-0.99.896-amd64.deb
+sudo apt-get -qq -y install r-cran-rcpparmadillo
+sudo apt-get -qq -y install r-cran-rgl
+sudo apt-get -qq -y install libpq-dev
+
+# Editors
+echo "Installing editors..."
+sudo apt-get -qq -y install vim
+sudo apt-get -qq -y install neovim
+
+echo "Installing python tools for neovim..."
+sudo pip install neovim
+
+# Databases
+echo "Installing databases..."
+sudo apt-get -qq -y install mysql-server
+sudo apt-get -qq -y install libmysqlclient-dev
+
+# Source Control
+echo "Installing source control..."
+sudo apt-get -qq -y install git
+
+# Multimedia
+echo "Installing multimedia..."
+sudo apt-get -qq -y install ffmpeg
+sudo apt-get -qq -y install mplayer
+sudo apt-get -qq -y install spotify-client
+sudo apt-get -qq -y install pepperflashplugin-nonfree
+
+# Tools
+echo "Installing tools..."
+sudo apt-get -qq -y install transmission
+sudo apt-get -qq -y install htop
+sudo apt-get -qq -y install scrot
+sudo apt-get -qq -y install tmux
+sudo apt-get -qq -y install unclutter
+sudo apt-get -qq -y install xdotool
+sudo apt-get -qq -y install cmake
+sudo apt-get -qq -y install gsimplecal
+sudo apt-get -qq -y install xclip
+sudo apt-get -qq -y install texlive-full
+sudo apt-get -qq -y install oracle-java8-installer
+
+# Comms
+echo "Installing comms..."
+sudo apt-get -qq -y install irssi
+sudo apt-get -qq -y install skype
+
+# Browsers
+echo "Installing browsers..."
+sudo apt-get -qq -y install chromium-browser
+
+# Security
+echo "Installing security..."
+sudo apt-get -qq -y install physlock
+
+# Fonts
+echo "Installing fonts..."
+sudo apt-get -qq -y install fonts-inconsolata
+fc-cache --really-force -v
+