Spring Cleaning

1 files changed, 6 insertions, 39 deletions

diff --git a/Dockerfile b/Dockerfile
index 9284a23..366d215 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -30,7 +30,9 @@ RUN apt-get update && apt-get install -y \
       # For python crypto libraries
       libssl-dev \
       libffi-dev \
-      locales
+      locales \
+      # For Youcompleteme
+      cmake
 
 # Generally a good idea to have these, extensions sometimes need them
 RUN locale-gen en_US.UTF-8
@@ -38,38 +40,13 @@ ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US:en
 ENV LC_ALL en_US.UTF-8
 
-# Install PHP 5.6/Neovim
-RUN add-apt-repository ppa:ondrej/php
+# Install Neovim
 RUN add-apt-repository ppa:neovim-ppa/stable
-
-# Install custom packages
 RUN apt-get update && apt-get install -y \
-      php5.6 \
-      php5.6-zip \
-      php5.6-xml \
       neovim
 
 
 ########################################
-# PHP
-########################################
-
-# Download composer and move it to new location
-RUN curl -sS https://getcomposer.org/installer | php
-RUN mv composer.phar /usr/local/bin/composer
-# Update the path to include composer bins
-ENV PATH "$PATH:/root/.composer/vendor/bin"
-# Composer install Code Sniff
-RUN composer global require "squizlabs/php_codesniffer=*"
-# Install Symfony 2 coding standard
-RUN composer global require --dev escapestudios/symfony2-coding-standard:~2.0
-# Add Symfony 2 coding standard to the phpcs paths
-RUN phpcs --config-set installed_paths /root/.composer/vendor/escapestudios/symfony2-coding-standard
-# Install custom linting
-ADD PEARish.xml /root/PEARish.xml
-
-
-########################################
 # Python
 ########################################
 
@@ -82,16 +59,6 @@ RUN pip3 install flake8-commas flake8-comprehensions
 
 
 ########################################
-# Dasht Documentation
-########################################
-ADD dasht/bin/* /usr/local/bin/
-ENV DASHT_DOCSETS_DIR /root/.local/share/dasht/docsets
-RUN mkdir -p /root/.local/share/dasht/docsets
-RUN dasht-docsets-install --force django
-RUN dasht-docsets-install --force python_3
-
-
-########################################
 # Personalizations
 ########################################
 # Add some aliases
@@ -107,9 +74,9 @@ RUN tic /tmp/$TERM.ti
 CMD ["/bin/bash"]
 # Add nvim config. Put this last since it changes often
 ADD nvim /root/.config/nvim
-# Install neovim Modules
+# Install neovim plugins
 RUN nvim -i NONE -c PlugInstall -c quitall > /dev/null 2>&1
-RUN nvim -i NONE -c UpdateRemotePlugins -c quitall > /dev/null 2>&1
+RUN cd /root/.config/nvim/plugged/YouCompleteMe && python3 install.py
 # Add flake8 config, don't trigger a long build process
 ADD flake8 /root/.flake8
 # Add local vim-options, can override the one inside