From 675e4fd9d5d7293ee403fc1befe705cf279b0246 Mon Sep 17 00:00:00 2001
From: Marty Oehme <marty.oehme@gmail.com>
Date: Fri, 18 Oct 2019 11:02:11 +0200
Subject: [PATCH] Refactor markdown plugins, enable conceal, add day
 colorscheme to term

---
 .config/alacritty/alacritty.yml | 60 ++++++++++++++++++++++++++++++++-
 .config/nvim/init.vim           | 13 ++++---
 2 files changed, 65 insertions(+), 8 deletions(-)

diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml
index e0f6acd..afe07b0 100644
--- a/.config/alacritty/alacritty.yml
+++ b/.config/alacritty/alacritty.yml
@@ -232,7 +232,65 @@ gruvboxdark: &gruvbox-dark
     cyan:    '0x8ec07c'
     white:   '0xebdbb2'
 
-colors: *gruvbox-dark
+# Colors (One Dark)
+onedark: &one-dark
+  # Default colors
+  primary:
+    background: '0x1e2127'
+    foreground: '0xabb2bf'
+
+  # Normal colors
+  normal:
+    black:   '0x1e2127'
+    red:     '0xe06c75'
+    green:   '0x98c379'
+    yellow:  '0xd19a66'
+    blue:    '0x61afef'
+    magenta: '0xc678dd'
+    cyan:    '0x56b6c2'
+    white:   '0xabb2bf'
+
+  # Bright colors
+  bright:
+    black:   '0x5c6370'
+    red:     '0xe06c75'
+    green:   '0x98c379'
+    yellow:  '0xd19a66'
+    blue:    '0x61afef'
+    magenta: '0xc678dd'
+    cyan:    '0x56b6c2'
+    white:   '0xffffff'
+
+# Colors (PaperColor Light -- works as One Light)
+onelight: &one-light
+  # Default colors
+  primary:
+    background: '0xEEEEEE'
+    foreground: '0x4D4D4C'
+
+  # Normal colors
+  normal:
+    black:   '0xEDEDED'
+    red:     '0xD7005F'
+    green:   '0x718C00'
+    yellow:  '0xD75F00'
+    blue:    '0x4271AE'
+    magenta: '0x8959A8'
+    cyan:    '0x3E999F'
+    white:   '0x4D4D4C'
+
+  # Bright colors
+  bright:
+    black:   '0x969694'
+    red:     '0xD7005F'
+    green:   '0x718C00'
+    yellow:  '0xD75F00'
+    blue:    '0x4271AE'
+    magenta: '0x8959A8'
+    cyan:    '0x3E999F'
+    white:   '0xF5F5F5'
+
+colors: *one-light
 
 # Visual Bell
 #
diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index 6045deb..f3751bd 100644
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -46,11 +46,6 @@ Plug 'tpope/vim-commentary' " easily toggle comments for lines, paragraphs etc w
 Plug 'tommcdo/vim-exchange' " adds exchange operator with cx. common use: cxiw . on 2 words to switch
 Plug 'tpope/vim-surround' " lets you change surrounding things with cs (or ds to del, ys to add)
 
-Plug 'kana/vim-textobj-user' " dependency for most other textobj plugins
-Plug 'reedes/vim-textobj-sentence' " extends the capabilities of sentence detection
-" and allows you to jump to the *end* of this <g)> or last <g(> sentence.
-
-
 " " Ecosystem
 " " Plug 'tpope/vim-fugitive' - Will have to take a closer look some other time
 Plug 'scrooloose/nerdtree', { 'on': 'NERDTreeToggle' } " show a directory listing within vim
@@ -79,7 +74,11 @@ augroup load_html_utils
                       \| autocmd! load_html_utils
 augroup END
 
-" Markdown & Prose Workflow
+" Prose Workflow
+Plug 'kana/vim-textobj-user' " dependency for most other textobj plugins
+Plug 'reedes/vim-textobj-sentence' " extends the capabilities of sentence detection
+" and allows you to jump to the *end* of this <g)> or last <g(> sentence.
+
 Plug 'reedes/vim-pencil', { 'for': ['markdown', 'txt'], 'on': 'Goyo' } " provide md convenience functions like hard/softwrap
 Plug 'junegunn/goyo.vim', { 'for': ['markdown', 'txt'], 'on': 'Goyo' } " provide distraction free writing
 Plug 'junegunn/limelight.vim', { 'for': ['markdown', 'txt'], 'on': 'Goyo' } " provide even distraction free-er writing (lowlight paragraphs)
@@ -179,7 +178,7 @@ let g:pandoc#spell#default_langs=["en_us", "de_de"]
 let g:pandoc#hypertext#ausosave_on_edit_open_link=1
 let g:pandoc#hypertext#create_if_no_alternates_exists=1
 " configuration for vim-pandoc and vim-rmarkdown
-let g:pandoc#syntax#conceal#use = 0
+let g:pandoc#syntax#conceal#use = 1
 
 " PLUGIN: wiki.vim
 if $WIKIROOT ==? ""