From 004875f664f75fdab62bae2b071925d3da50ecae Mon Sep 17 00:00:00 2001
From: Joe Groocock <frebib@gmail.com>
Date: Thu, 23 Nov 2017 19:15:43 +0000
Subject: [PATCH] Move .vim{,rc} to .config

---
 .config/imgur-screenshot/settings.conf               |  4 +++-
 .config/vim/.gitignore                               |  6 ++++++
 {.vim => .config/vim}/ftplugin/javascript/config.vim |  0
 {.vim => .config/vim}/ftplugin/ocaml/config.vim      |  0
 {.vim => .config/vim}/ftplugin/ocaml/keybinds.vim    |  0
 .vimrc => .config/vim/vimrc                          | 11 +++++++++--
 .profile                                             |  9 +++++++--
 aliases                                              |  2 +-
 8 files changed, 26 insertions(+), 6 deletions(-)
 create mode 100644 .config/vim/.gitignore
 rename {.vim => .config/vim}/ftplugin/javascript/config.vim (100%)
 rename {.vim => .config/vim}/ftplugin/ocaml/config.vim (100%)
 rename {.vim => .config/vim}/ftplugin/ocaml/keybinds.vim (100%)
 rename .vimrc => .config/vim/vimrc (93%)

diff --git a/.config/imgur-screenshot/settings.conf b/.config/imgur-screenshot/settings.conf
index e0821a9..1eeddc4 100644
--- a/.config/imgur-screenshot/settings.conf
+++ b/.config/imgur-screenshot/settings.conf
@@ -1,5 +1,7 @@
 imgur_icon_path="$HOME/.config/imgur-screenshot/imgur.ico"
-login="true"
+imgur_acct_key=""
+imgur_secret=""
+login="false"
 log_file="$HOME/.config/imgur-screenshot/imgur-screenshot.log"
 credentials_file="$HOME/.config/imgur-screenshot/credentials.conf"
 file_name_format="scrot-%Y-%m-%d--%H:%M:%S.png" # when using scrot, must end with .png!
diff --git a/.config/vim/.gitignore b/.config/vim/.gitignore
new file mode 100644
index 0000000..1a49755
--- /dev/null
+++ b/.config/vim/.gitignore
@@ -0,0 +1,6 @@
+/bundle/
+/spell/
+/swapfiles/
+/viminfo
+/vim-latex
+/.netrwhist
diff --git a/.vim/ftplugin/javascript/config.vim b/.config/vim/ftplugin/javascript/config.vim
similarity index 100%
rename from .vim/ftplugin/javascript/config.vim
rename to .config/vim/ftplugin/javascript/config.vim
diff --git a/.vim/ftplugin/ocaml/config.vim b/.config/vim/ftplugin/ocaml/config.vim
similarity index 100%
rename from .vim/ftplugin/ocaml/config.vim
rename to .config/vim/ftplugin/ocaml/config.vim
diff --git a/.vim/ftplugin/ocaml/keybinds.vim b/.config/vim/ftplugin/ocaml/keybinds.vim
similarity index 100%
rename from .vim/ftplugin/ocaml/keybinds.vim
rename to .config/vim/ftplugin/ocaml/keybinds.vim
diff --git a/.vimrc b/.config/vim/vimrc
similarity index 93%
rename from .vimrc
rename to .config/vim/vimrc
index 02001a7..32030e4 100644
--- a/.vimrc
+++ b/.config/vim/vimrc
@@ -1,5 +1,10 @@
 set nocompatible              " be iMproved, required
 
+" Reconfigure Vim to be clean!
+set rtp+=~/.config/vim
+set directory=.,~/.config/vim
+set viminfo+=n~/.config/vim/viminfo
+
 syntax enable
 filetype plugin on
 set tabstop=4
@@ -15,7 +20,8 @@ set laststatus=2
 set mouse=nicr
 set encoding=utf-8
 set background=dark
-set directory=$HOME/.vim/swapfiles//
+set directory=$HOME/.config/vim/swapfiles//
+set omnifunc=syntaxcomplete#Complete
 
 set title
 set clipboard=unnamed
@@ -46,8 +52,9 @@ set list
 set listchars=eol:$,space:.,tab:>-,trail:~,extends:>,precedes:<
 
 " set the runtime path to include Vundle and initialize
-set rtp+=~/.vim/bundle/Vundle.vim
+set rtp+=~/.config/vim/bundle/Vundle.vim
 call vundle#begin()
+call vundle#rc('~/.config/vim/bundle')
 
 Plugin 'VundleVim/Vundle.vim'
 Plugin 'Valloric/YouCompleteMe'
diff --git a/.profile b/.profile
index a830baa..ad4fa9a 100644
--- a/.profile
+++ b/.profile
@@ -2,11 +2,16 @@ export LC_ALL=en_GB.UTF-8
 export LANG=en_GB.UTF-8
 export LC_NUMERIC=en_GB
 
-export CONFIG_DIR="${XDG_CONFIG_HOME:-$HOME/.config}"
-export DOTFILES=$CONFIG_DIR/dotfiles
+export CONFIG_DIR="$HOME/.config"
+export XDG_CONFIG_HOME="$CONFIG_DIR"
+export DOTFILES="$CONFIG_DIR/dotfiles"
 export PATH="${PATH}:$DOTFILES/scripts"
 export XDG_CURRENT_DESKTOP="GNOME" # Fixes xdg-open
 
+# Allow Vim to load from ~/.config/vim
+export MYVIMRC="$CONFIG_DIR/vim/vimrc"
+export VIMINIT=":so $MYVIMRC"
+
 export EDITOR="vim"
 export VISUAL="vim"
 export LESS="-RNI"
diff --git a/aliases b/aliases
index 8fe3a99..6ce29c2 100644
--- a/aliases
+++ b/aliases
@@ -247,7 +247,7 @@ alias zp=zpool
 # General Aliases
 alias ssha='eval `ssh-agent` ; ssh-add'
 alias aliases="$EDITOR $DOTFILES/aliases ; exec zsh"
-alias vimrc="$EDITOR ~/.vimrc"
+alias vimrc="$EDITOR $MYVIMRC"
 alias zshrc="$EDITOR ~/.zshrc ; exec zsh"
 alias xinitrc="$EDITOR ~/.xinitrc"
 alias xresources="$EDITOR ~/.Xresources ; xrdb merge ~/.Xresources"