From 7053c2a411b4bef03816b52ff4ebbb494867374a Mon Sep 17 00:00:00 2001
From: Daniel Flanagan <daniel@lytedev.io>
Date: Mon, 9 Jan 2017 12:02:02 -0600
Subject: [PATCH] vim config stuff

---
 editor/kakoune/autoload/colorscheme.kak | 1 +
 editor/kakoune/kakrc                    | 7 +++++++
 editor/kakoune/link.bash                | 5 +----
 editor/nvim/config/init.vim             | 3 ---
 env/sh/bashrc                           | 3 ++-
 5 files changed, 11 insertions(+), 8 deletions(-)
 create mode 100644 editor/kakoune/autoload/colorscheme.kak
 create mode 100644 editor/kakoune/kakrc

diff --git a/editor/kakoune/autoload/colorscheme.kak b/editor/kakoune/autoload/colorscheme.kak
new file mode 100644
index 0000000..c5762bc
--- /dev/null
+++ b/editor/kakoune/autoload/colorscheme.kak
@@ -0,0 +1 @@
+:colorscheme base16
diff --git a/editor/kakoune/kakrc b/editor/kakoune/kakrc
new file mode 100644
index 0000000..bc9754e
--- /dev/null
+++ b/editor/kakoune/kakrc
@@ -0,0 +1,7 @@
+colorscheme base16
+hook global BufOpen .* %{editorconfig-load}
+hook global InsertChar j %{ try %{
+  exec -draft hH <a-k>jj<ret> d
+  exec <esc>
+}}
+hook global WinCreate .* %{addhl number_lines}
diff --git a/editor/kakoune/link.bash b/editor/kakoune/link.bash
index ddf4ac5..c225469 100755
--- a/editor/kakoune/link.bash
+++ b/editor/kakoune/link.bash
@@ -3,8 +3,5 @@
 DIR=$(cd "$(dirname "${BASH_SOURCE[0]}" )/../.." && pwd)
 source "$DIR/variables.bash"
 
-rm -rf "$HOME/.config/kakoune"
+rm -rf "$HOME/.config/kak"
 ln -s "$DOTFILES_PATH/editor/kakoune" "$HOME/.config/kak"
-
-nvim +PlugInstal +qall
-
diff --git a/editor/nvim/config/init.vim b/editor/nvim/config/init.vim
index d8959d9..3eca738 100644
--- a/editor/nvim/config/init.vim
+++ b/editor/nvim/config/init.vim
@@ -119,9 +119,6 @@ let python_space_errors = 1
 " autocmd FileType vue setl tabstop=2 expandtab shiftwidth=2 softtabstop=2
 autocmd FileType php setl tabstop=4 expandtab shiftwidth=4 softtabstop=4
 
-" HAMLC
-autocmd BufRead,BufNewFile *.hamlc set ft=haml
-
 " Markdown
 autocmd BufNewFile,BufReadPost *.md setl filetype=markdown spell textwidth=0 wrapmargin=0
 
diff --git a/env/sh/bashrc b/env/sh/bashrc
index 2b4d652..7783c91 100644
--- a/env/sh/bashrc
+++ b/env/sh/bashrc
@@ -1,4 +1,5 @@
-export DOTFILES_PATH=$HOME/.dotfiles
+export DOTFILES_PATH="$HOME/.dotfiles"
+export XDG_CONFIG_HOME="$HOME/.config"
 
 # load our terminal colors
 BASE16_SHELL="$DOTFILES_PATH/colors/shell"