diff --git a/.config/fish/functions/edit-dotfile.fish b/.config/fish/functions/edit-dotfile.fish
index f817aa6..fe9ef88 100644
--- a/.config/fish/functions/edit-dotfile.fish
+++ b/.config/fish/functions/edit-dotfile.fish
@@ -13,5 +13,6 @@ function edit-dotfile
             nvim $fullpath
         end
     end
+    commandline -f repaint
 
 end
diff --git a/.config/kitty/kitty.conf b/.config/kitty/kitty.conf
index a5c2d01..34d83aa 100644
--- a/.config/kitty/kitty.conf
+++ b/.config/kitty/kitty.conf
@@ -31,5 +31,5 @@ map shift+left move_window left
 map shift+right move_window right
 map shift+down move_window down
 
-scrollback_pager bash -c 'nvim </dev/null -c "map q :qa!<CR>" -c "autocmd TermOpen * normal G" -c "terminal cat /proc/$$/fd/0 -" -c "set clipboard+=unnamedplus" -c "call cursor(CURSOR_LINE, CURSOR_COLUMN)"'
+scrollback_pager bash -c 'nvim </dev/null -u ~/.config/nvim/init-kitty.vim -c "map q :qa!<CR>" -c "autocmd TermOpen * normal G" -c "terminal cat /proc/$$/fd/0 -" -c "set clipboard+=unnamedplus" -c "call cursor(CURSOR_LINE, CURSOR_COLUMN)"'
 
diff --git a/.config/nvim/init-kitty.vim b/.config/nvim/init-kitty.vim
new file mode 100644
index 0000000..c83c3b1
--- /dev/null
+++ b/.config/nvim/init-kitty.vim
@@ -0,0 +1,88 @@
+call plug#begin(stdpath('data') . '/plugged')
+
+" Themes
+Plug 'morhetz/gruvbox'
+
+"Timmy Popester
+Plug 'tpope/vim-surround'
+Plug 'tpope/vim-repeat'
+Plug 'tpope/vim-commentary'
+Plug 'tpope/vim-fugitive'
+Plug 'jiangmiao/auto-pairs'
+
+" Nav
+Plug 'rhysd/clever-f.vim' 
+Plug 'easymotion/vim-easymotion'
+
+" Utilities
+" Plug 'Yggdroot/LeaderF', { 'do': ':LeaderfInstallCExtension' }
+" Plug 'mhinz/vim-startify'
+" Plug 'mbbill/undotree'
+" Plug 'junegunn/vim-easy-align'
+" Plug 'famiu/nvim-reload'
+" Plug 'kyazdani42/nvim-web-devicons'
+" Plug 'nvim-lua/plenary.nvim'
+" Plug 'nvim-lua/popup.nvim'
+" Plug 'nvim-telescope/telescope.nvim'
+
+" Languages
+Plug 'dag/vim-fish', { 'for' : 'fish' }
+
+" Stuff to maybe install later
+
+Plug 'airblade/vim-gitgutter'  " This one is going to depend on whether vim still remains snappy
+
+" Plug 'ionide/Ionide-vim', {    " Are we really going to try and develop on vim?
+"       \ 'do':  'make fsautocomplete',
+"       \}
+" Plug 'autozimu/LanguageClient-neovim', { 'branch': 'next', 'do': 'bash install.sh' }
+
+
+call plug#end()
+
+" color gruvbox
+
+set autochdir
+set splitbelow
+set splitright
+set tabstop=4
+set shiftwidth=4
+set expandtab
+set softtabstop=4
+set nowrap
+set ignorecase
+set smartcase
+set noswapfile
+set nobackup
+set hidden
+set wildmenu
+set clipboard=unnamedplus
+
+let mapleader = " "
+
+nnoremap d <C-d>
+nnoremap u <C-u>
+nnoremap Y y$
+nnoremap vv ^vg_
+noremap \ q
+noremap $ g_
+nnoremap ' `
+nnoremap ` '
+nnoremap - :Ex<CR>
+map , <Plug>(easymotion-prefix)
+
+tnoremap <A-e> <C-\><C-n>
+nnoremap <silent> <Leader>/ :nohlsearch<CR>
+
+" Plugins
+
+" Clever-F
+let g:clever_f_fix_key_direction = 1
+
+" EasyMotion
+let g:EasyMotion_startofline = 0
+let g:EasyMotion_keys = 'asdfjklhgwueiroxnmvczqp'
+
+" Easy Align
+xmap ga <Plug>(EasyAlign)
+nmap ga <Plug>(EasyAlign)
diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index 6ff6fd2..3d3f340 100644
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -84,9 +84,10 @@ nnoremap <silent> <Leader>/ :nohlsearch<CR>
 nnoremap <Leader>w :w<CR>
 nnoremap <silent> <Leader>rl :so $MYVIMRC<CR>:echo 'init.vim Reloaded!'<CR>
 nnoremap <silent> <Leader>ei :e $MYVIMRC<CR>
-nnoremap <silent> <C-W>k :bd<CR> 
+nnoremap <silent> <Leader>bk :bd<CR> 
 nnoremap <silent> <Leader>bb :b#<CR> 
-nnoremap <silent> <Leader>q :call DeleteBuffer()<CR>
+" nnoremap <silent> <Leader>q :call DeleteBuffer()<CR>
+nnoremap <silent> <Leader>q :q<CR>
 nnoremap <C-W>o :call MaximizeToggle()<CR>
 
 nnoremap <silent> <C-CR> :e term://fish<CR>