diff --git a/config/kitty/kitty.conf b/config/kitty/kitty.conf
new file mode 100644
index 0000000..9f1accc
--- /dev/null
+++ b/config/kitty/kitty.conf
@@ -0,0 +1,25 @@
+font_size 12.0
+background #000000
+foreground #D3D3D3
+selection_background #2f3333
+selection_foreground none
+cursor #c1c8c9
+color0 #111313
+color8 #424446
+color1 #9e6b71
+color9 #b69094
+color2 #719e6b
+color10 #94b690
+color3 #9e986c
+color11 #b5b18f
+color4 #6c8b9e
+color12 #90a7b6
+color5 #986b9e
+color13 #b290b6
+color6 #6b9e98
+color14 #90b6b3
+color7 #b8baba
+color15 #cdcfce
+font_family DejaVu Sans Mono
+bold_font DejaVu Sans Mono
+scrollback_lines 20000
diff --git a/config/nvim/init.vim b/config/nvim/init.vim
new file mode 100644
index 0000000..a07227a
--- /dev/null
+++ b/config/nvim/init.vim
@@ -0,0 +1,41 @@
+" Asara's neovim config
+
+" enable syntax highlighting
+syntax enable
+set number
+set cursorline
+filetype plugin indent on
+set lazyredraw
+set showmatch
+set hlsearch
+set incsearch
+
+" `\ ` will remove search highlighting
+nnoremap <leader><space> :nohlsearch<CR>
+
+" remape jk to escape
+inoremap jk <esc>
+
+" highlight extra whitespace
+:hi ExtraWhitespace ctermbg=blue
+:match ExtraWhitespace /\s\+$\| \+\ze\t/
+
+" set status line colors since my theme doesn't set them
+:hi StatusLine ctermbg=grey ctermfg=black
+
+" limit viminfo line memory
+set viminfo='100,<1000,s100,h
+
+" enable some plugins
+call plug#begin('~/.vim/plugged')
+  Plug 'fatih/vim-go', { 'do': ':GoUpdateBinaries' }
+  Plug 'godlygeek/tabular'
+  Plug 'preservim/vim-markdown'
+  Plug 'fladson/vim-kitty'
+  Plug 'hashivim/vim-terraform'
+  Plug 'rhadley-recurly/vim-terragrunt'
+call plug#end()
+
+" terraform fmt/hclfmt on save
+let g:terraform_fmt_on_save=1
+let g:hcl_fmt_autosave = 1
diff --git a/tmux.conf b/tmux.conf
index 1cfad5b..686a79e 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -2,16 +2,12 @@
 unbind d
 bind C-d detach
 
-# UTF8 in statusbar
-set-option -g status-utf8 on
-set -g default-terminal "screen-256color"
-
 # Start counting at 1 instead of 0
 set -g base-index 1
 
 # Window splitting
 unbind %
-bind \ split-window -h 
+bind \\ split-window -h
 bind - split-window -v
 
 #  vim keybindings
@@ -20,8 +16,8 @@ unbind [
 bind Escape copy-mode
 unbind p
 bind p paste-buffer
-bind-key -t vi-copy 'v' begin-selection
-bind-key -t vi-copy 'y' copy-selection
+bind-key -Tcopy-mode-vi v send -X begin-selection
+bind-key -Tcopy-mode-vi y send -X copy-selection
 
 # vim movement
 set-window-option -g mode-keys vi
@@ -38,10 +34,10 @@ bind -r C-k resize-pane -U 5
 bind -r C-l resize-pane -R 5
 
 # Highlight active window
-set-window-option -g window-status-current-bg red
+set-window-option -g window-status-current-style bg=blue
 
 # Statusbar Tweaking
-set -g status-bg colour0
+set -g status-bg black
 set -g status-fg white
 set -g status-left '#[fg=magenta]#H'
 set -g status-right '#[fg=blue]#(uptime | cut -d "," -f 4-)'
diff --git a/vimrc b/vimrc
deleted file mode 100644
index f6a32db..0000000
--- a/vimrc
+++ /dev/null
@@ -1,29 +0,0 @@
-syntax enable
-set tabstop=4
-set softtabstop=4
-set shiftwidth=4
-set expandtab
-
-
-set number
-set cursorline
-
-filetype indent on
-set lazyredraw
-
-set showmatch
-
-set hlsearch
-set incsearch
-nnoremap <leader><space> :nohlsearch<CR>
-
-inoremap jk <esc>
-
-colorscheme elflord
-
-
-set colorcolumn=81
-:hi ColorColumn ctermbg=blue
-
-:hi ExtraWhitespace ctermbg=blue
-:match ExtraWhitespace /\s\+$\| \+\ze\t/