From 3a9311334c4ff29df875409cfd36c46d106df8a0 Mon Sep 17 00:00:00 2001
From: Chris <chrisatmachine@gmail.com>
Date: Sat, 29 Aug 2020 14:30:22 -0400
Subject: updates

---
 init.vim                     |  8 ++++++--
 nvcode.Dockerfile            | 36 ++++++++++++++++++++++++++++++++++++
 nvim-mach2.Dockerfile        | 36 ------------------------------------
 plug-config/start-screen.vim | 11 ++++++-----
 vim-plug/plugins.vim         |  1 +
 vscode/windows.vim           | 16 ++++++++--------
 6 files changed, 57 insertions(+), 51 deletions(-)
 create mode 100644 nvcode.Dockerfile
 delete mode 100644 nvim-mach2.Dockerfile

diff --git a/init.vim b/init.vim
index 8f8689d1..388471f4 100644
--- a/init.vim
+++ b/init.vim
@@ -10,7 +10,6 @@ source $HOME/.config/nvim/vim-plug/plugins.vim
 source $HOME/.config/nvim/general/settings.vim
 source $HOME/.config/nvim/general/functions.vim
 source $HOME/.config/nvim/keys/mappings.vim
-
 source $HOME/.config/nvim/plug-config/vim-commentary.vim
 
 if exists('g:vscode')
@@ -21,7 +20,8 @@ else
 
   " Themes
   source $HOME/.config/nvim/themes/syntax.vim
-  source $HOME/.config/nvim/themes/onedark.vim
+  " source $HOME/.config/nvim/themes/onedark.vim
+  source $HOME/.config/nvim/themes/material.vim
   source $HOME/.config/nvim/themes/airline.vim
 
   " Plugin Configuration
@@ -61,3 +61,7 @@ endif
 if !empty(glob("~/.config/nvim/paths.vim"))
   source $HOME/.config/nvim/paths.vim
 endif
+
+" Better nav for omnicomplete TODO figure out why this is being overridden
+inoremap <expr> <c-j> ("\<C-n>")
+inoremap <expr> <c-k> ("\<C-p>")
diff --git a/nvcode.Dockerfile b/nvcode.Dockerfile
new file mode 100644
index 00000000..fa3b89ab
--- /dev/null
+++ b/nvcode.Dockerfile
@@ -0,0 +1,36 @@
+FROM ubuntu:20.04
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+# ENV LC_ALL en_US.UTF-8
+ENV TERM screen-256color
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN apt update && apt install -y \
+  git \
+  bash \
+  fzf \
+  wget \
+  python3-dev \
+  python3-pip \
+  libssl-dev \
+  libffi-dev \
+  locales \
+  curl \
+  ripgrep \
+  nodejs \
+  npm \
+  neovim
+
+SHELL ["/bin/bash", "-c"]
+
+RUN npm i -g neovim
+RUN bash  <(curl -s https://raw.githubusercontent.com/ChristianChiarulli/nvim/master/utils/install-docker.sh)
+RUN git clone --depth 1 https://github.com/junegunn/fzf.git ~/.fzf && ~/.fzf/install
+
+CMD ["nvim"]
+
+
+
+
+
diff --git a/nvim-mach2.Dockerfile b/nvim-mach2.Dockerfile
deleted file mode 100644
index fa3b89ab..00000000
--- a/nvim-mach2.Dockerfile
+++ /dev/null
@@ -1,36 +0,0 @@
-FROM ubuntu:20.04
-
-ENV LANG en_US.UTF-8
-ENV LANGUAGE en_US:en
-# ENV LC_ALL en_US.UTF-8
-ENV TERM screen-256color
-ENV DEBIAN_FRONTEND=noninteractive
-
-RUN apt update && apt install -y \
-  git \
-  bash \
-  fzf \
-  wget \
-  python3-dev \
-  python3-pip \
-  libssl-dev \
-  libffi-dev \
-  locales \
-  curl \
-  ripgrep \
-  nodejs \
-  npm \
-  neovim
-
-SHELL ["/bin/bash", "-c"]
-
-RUN npm i -g neovim
-RUN bash  <(curl -s https://raw.githubusercontent.com/ChristianChiarulli/nvim/master/utils/install-docker.sh)
-RUN git clone --depth 1 https://github.com/junegunn/fzf.git ~/.fzf && ~/.fzf/install
-
-CMD ["nvim"]
-
-
-
-
-
diff --git a/plug-config/start-screen.vim b/plug-config/start-screen.vim
index 28d7f649..95c81a29 100644
--- a/plug-config/start-screen.vim
+++ b/plug-config/start-screen.vim
@@ -1,11 +1,12 @@
 
 let g:startify_custom_header = [
-        \ '       _  __     _         __  ___         __     ___',
-        \ '      / |/ /  __(_)_ _    /  |/  /__ _____/ /    |_  |',
-        \ '     /    / |/ / /  ` \  / /|_/ / _ `/ __/ _ \  / __/',
-        \ '    /_/|_/|___/_/_/_/_/ /_/  /_/\_,_/\__/_//_/ /____/',
+        \ '        _   ___    ________          __   ',
+        \ '       / | / / |  / / ____/___  ____/ /__ ',
+        \ '      /  |/ /| | / / /   / __ \/ __  / _ \',
+        \ '     / /|  / | |/ / /___/ /_/ / /_/ /  __/',
+        \ '    /_/ |_/  |___/\____/\____/\__,_/\___/ ',
         \]
-
+                                      
 let g:startify_session_dir = '~/.config/nvim/session'
 
 
diff --git a/vim-plug/plugins.vim b/vim-plug/plugins.vim
index a21db943..1e07a4da 100644
--- a/vim-plug/plugins.vim
+++ b/vim-plug/plugins.vim
@@ -46,6 +46,7 @@ call plug#begin('~/.config/nvim/autoload/plugged')
     Plug 'alvan/vim-closetag'
     " Themes
     Plug 'christianchiarulli/onedark.vim'
+    Plug 'kaicataldo/material.vim', { 'branch': 'main' }
     " Intellisense
     Plug 'neoclide/coc.nvim', {'branch': 'release'}
     " Status Line
diff --git a/vscode/windows.vim b/vscode/windows.vim
index def66822..e6ce55da 100644
--- a/vscode/windows.vim
+++ b/vscode/windows.vim
@@ -42,14 +42,14 @@ xnoremap <silent> <C-w>v :call <SID>split('v')<CR>
 nnoremap <silent> <C-w>n :call <SID>splitNew('h', '__vscode_new__')<CR>
 xnoremap <silent> <C-w>n :call <SID>splitNew('h', '__vscode_new__')<CR>
 
-nnoremap <silent> <C-j> :call VSCodeNotify('workbench.action.focusBelowGroup')<CR>
-xnoremap <silent> <C-j> :call VSCodeNotify('workbench.action.focusBelowGroup')<CR>
-nnoremap <silent> <C-k> :call VSCodeNotify('workbench.action.focusAboveGroup')<CR>
-xnoremap <silent> <C-k> :call VSCodeNotify('workbench.action.focusAboveGroup')<CR>
-nnoremap <silent> <C-h> :call VSCodeNotify('workbench.action.focusLeftGroup')<CR>
-xnoremap <silent> <C-h> :call VSCodeNotify('workbench.action.focusLeftGroup')<CR>
-nnoremap <silent> <C-l> :call VSCodeNotify('workbench.action.focusRightGroup')<CR>
-xnoremap <silent> <C-l> :call VSCodeNotify('workbench.action.focusRightGroup')<CR>
+nnoremap <silent> <C-j> :call VSCodeNotify('workbench.action.navigateDown')<CR>
+xnoremap <silent> <C-j> :call VSCodeNotify('workbench.action.navigateDown')<CR>
+nnoremap <silent> <C-k> :call VSCodeNotify('workbench.action.navigateUp')<CR>
+xnoremap <silent> <C-k> :call VSCodeNotify('workbench.action.navigateUp')<CR>
+nnoremap <silent> <C-h> :call VSCodeNotify('workbench.action.navigateLeft')<CR>
+xnoremap <silent> <C-h> :call VSCodeNotify('workbench.action.navigateLeft')<CR>
+nnoremap <silent> <C-l> :call VSCodeNotify('workbench.action.navigateRight')<CR>
+xnoremap <silent> <C-l> :call VSCodeNotify('workbench.action.navigateRight')<CR>
 
 nnoremap <silent> <C-w>= :<C-u>call VSCodeNotify('workbench.action.evenEditorWidths')<CR>
 xnoremap <silent> <C-w>= :<C-u>call VSCodeNotify('workbench.action.evenEditorWidths')<CR>
-- 
cgit v1.2.3