From a1d3309d45908e89fd0c8e90ffcf892b2976b352 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcin=20Wo=C5=BAniak?= <y0rune@aol.com>
Date: Mon, 5 Apr 2021 00:20:37 +0200
Subject: [PATCH] Configured nvim
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Marcin Woźniak <y0rune@aol.com>
---
 .config/nvim/coc-settings.json |  7 +++++--
 .config/nvim/init.vim          | 26 ++++++++++++++++++++++++--
 .markdownlint.json             | 25 +++++++++++++++++++++++++
 3 files changed, 54 insertions(+), 4 deletions(-)
 create mode 100644 .markdownlint.json

diff --git a/.config/nvim/coc-settings.json b/.config/nvim/coc-settings.json
index 64b2ba3..1f644ed 100644
--- a/.config/nvim/coc-settings.json
+++ b/.config/nvim/coc-settings.json
@@ -5,7 +5,8 @@
     "json",
     "python",
     "css",
-    "Markdown"
+    "Markdown",
+    "ruby"
   ],
   "languageserver": {
     "bash": {
@@ -14,5 +15,7 @@
       "filetypes": ["sh"],
       "ignoredRootPaths": ["~"]
     }
-  }
+  },
+  "solargraph.commandPath": "~/.gem/ruby/2.6.0/bin/solargraph",
+  "solargraph.formatting": true
 }
diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index b4ef0cd..c01edee 100644
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -5,6 +5,7 @@ if ! filereadable(system('echo -n "$HOME/.config/nvim/autoload/plug.vim"'))
 	autocmd VimEnter * PlugInstall
 endif
 
+let mapleader = ","
 set laststatus=2
 set shiftwidth=4
 set softtabstop=4
@@ -14,21 +15,26 @@ let g:python3_host_prog = expand('/usr/src/python')
 
 " plugins
 call plug#begin('~/.config/nvim/plugged')
+Plug 'tpope/vim-markdown'
+Plug 'masukomi/vim-markdown-folding'
 Plug 'preservim/nerdtree'
 Plug 'nmante/vim-latex-live-preview'
 Plug 'lervag/vimtex'
 Plug 'junegunn/goyo.vim'
-Plug 'jceb/vim-orgmode'
 Plug 'tpope/vim-commentary'
 Plug 'ap/vim-css-color'
 Plug 'tpope/vim-surround'
 Plug 'neoclide/coc.nvim', {'branch': 'release'}
-Plug 'neoclide/coc-python', {'do': 'yarn install --frozen-lockfile; sudo npm install -g npx-run; pip install --user jedi'}
+Plug 'neoclide/coc-solargraph', {'do': 'gem install solargraph'}
+Plug 'fannheyward/coc-pyright', {'do': 'yarn install --frozen-lockfile; sudo npm install -g npx-run; pip install --user jedi'}
 Plug 'neoclide/coc-yaml', {'do': 'yarn install --frozen-lockfile'}
 Plug 'neoclide/coc-json', {'do': 'yarn install --frozen-lockfile'}
 Plug 'fannheyward/coc-markdownlint', {'do': 'yarn install --frozen-lockfile; sudo npm install markdownlint --save-dev'}
 Plug 'josa42/coc-sh', {'do': 'yarn install --frozen-lockfile; sudo npm i -g bash-language-server'}
 Plug 'neoclide/coc-prettier', {'do': 'yarn install --frozen-lockfile'}
+Plug 'dracula/vim', { 'as': 'dracula'}
+Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' }
+Plug 'junegunn/fzf.vim'
 call plug#end()
 
 " Status-line
@@ -52,12 +58,21 @@ syntax on
 filetype plugin indent on
 set encoding=utf-8
 
+" fzf
+" https://github.com/masukomi/masuconfigs/blob/master/.vimrc
+nmap <Leader>f :FZF<CR>
+nmap <Leader>b :Buffers<CR>
+nmap <Leader>/ :Rg<CR>
+
 " livepreviewer
 let g:livepreview_previewer = 'mupdf'
 
 " markdown preview
 let g:mkdp_browser = '/home/yorune/.local/bin/browser-x'
 let g:mkdp_echo_preview_url = 1
+let g:markdown_fenced_languages = ['html', 'python', 'bash=sh']
+let g:markdown_minlines = 1
+autocmd FileType markdown set foldexpr=NestedMarkdownFolds()
 
 " line numbers
 set number
@@ -99,6 +114,7 @@ hi PmenuSel ctermfg=NONE ctermbg=24 cterm=NONE guifg=NONE guibg=#204a87 gui=NONE
 set bg=dark
 hi CursorLine cterm=NONE term=NONE ctermbg=NONE guibg=NONE
 hi CursorLine ctermbg=235
+colorscheme dracula
 
 " columne
 set textwidth=80
@@ -114,6 +130,12 @@ nnoremap <F11> :Goyo <CR>
 nnoremap <F7> :tabprevious<CR>
 nnoremap <F8> :tabnext<CR>
 
+"" Moving line up or down using alt
+nnoremap <A-Up> :m-2<CR>
+nnoremap <A-Down> :m+<CR>
+inoremap <A-Up> <Esc>:m-2<CR>
+inoremap <A-Down> <Esc>:m+<CR>
+
 cnoremap w!! execute 'silent! write !sudo tee % >/dev/null' <bar> edit!
 
 " latex
diff --git a/.markdownlint.json b/.markdownlint.json
new file mode 100644
index 0000000..6f8b9f6
--- /dev/null
+++ b/.markdownlint.json
@@ -0,0 +1,25 @@
+{
+  "MD013": false,
+  "MD029": {
+    "style": "ordered"
+  },
+  "MD022": false,
+  "MD024": false,
+  "MD025": false,
+  "MD031": false,
+  "MD032": false,
+  "MD043": false,
+  "MD044": {
+    "names": [
+      "CommonMark",
+      "Ctrl",
+      "JavaScript",
+      "Markdown",
+      "markdown-it",
+      "markdownlint",
+      "Node.js",
+      "Shift",
+      "Visual Studio Code"
+    ]
+  }
+}