From bc5750fd0312131c73439d26c3b2fb00afb05a7d Mon Sep 17 00:00:00 2001 From: Thomas Dehaeze Date: Wed, 10 Apr 2019 16:53:26 +0200 Subject: [PATCH] Change vim theme => gruvbox. Remove highlight of badly spelled words --- dotfiles/vim.org | 183 ++++++++++++++++++++++++----------------------- install.org | 23 ------ 2 files changed, 93 insertions(+), 113 deletions(-) diff --git a/dotfiles/vim.org b/dotfiles/vim.org index e91a78c..b490875 100644 --- a/dotfiles/vim.org +++ b/dotfiles/vim.org @@ -6,144 +6,142 @@ * Plugins Install ** Plug start #+BEGIN_SRC conf -call plug#begin('~/.vim/plugged') + call plug#begin('~/.vim/plugged') #+END_SRC ** Manage Files #+BEGIN_SRC conf -Plug 'tpope/vim-vinegar' " Combine with netrw to create a delicious salad dressing -Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --bin' } " A command-line fuzzy finder written in Go -Plug 'junegunn/fzf.vim' " Fzf for vim + Plug 'tpope/vim-vinegar' " Combine with netrw to create a delicious salad dressing + Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --bin' } " A command-line fuzzy finder written in Go + Plug 'junegunn/fzf.vim' " Fzf for vim #+END_SRC ** Text Objects #+BEGIN_SRC conf -Plug 'kana/vim-textobj-user' " Create your own text objects -Plug 'kana/vim-textobj-line' " Text objects for the current line -Plug 'kana/vim-textobj-entire' " Text objects for entire buffer -Plug 'michaeljsmith/vim-indent-object' " Defines a new text object representing lines of code at the same indent level -Plug 'jiangmiao/auto-pairs' " Vim plugin, insert or delete brackets, parens, quotes in pair + Plug 'kana/vim-textobj-user' " Create your own text objects + Plug 'kana/vim-textobj-line' " Text objects for the current line + Plug 'kana/vim-textobj-entire' " Text objects for entire buffer + Plug 'michaeljsmith/vim-indent-object' " Defines a new text object representing lines of code at the same indent level + Plug 'jiangmiao/auto-pairs' " Vim plugin, insert or delete brackets, parens, quotes in pair #+END_SRC ** Git #+BEGIN_SRC conf -" Plug 'jreybert/vimagit' -Plug 'tpope/vim-fugitive' " A Git wrapper so awesome, it should be illegal -Plug 'junegunn/gv.vim' " A git commit browser -Plug 'mhinz/vim-signify' " Show a diff using Vim its sign column + " Plug 'jreybert/vimagit' + Plug 'tpope/vim-fugitive' " A Git wrapper so awesome, it should be illegal + Plug 'junegunn/gv.vim' " A git commit browser + Plug 'mhinz/vim-signify' " Show a diff using Vim its sign column #+END_SRC ** Motions, Search #+BEGIN_SRC conf -Plug 'terryma/vim-expand-region' " Vim plugin that allows you to visually select increasingly larger regions of text using the same key combination -Plug 'justinmk/vim-sneak' " The missing motion for Vim -Plug 'haya14busa/is.vim' " Improved incremental searching for Vim + Plug 'terryma/vim-expand-region' " Vim plugin that allows you to visually select increasingly larger regions of text using the same key combination + Plug 'justinmk/vim-sneak' " The missing motion for Vim + Plug 'haya14busa/is.vim' " Improved incremental searching for Vim #+END_SRC ** Manipulate Things #+BEGIN_SRC conf -Plug 'tpope/vim-surround' " Quoting/parenthesizing made simple -Plug 'tpope/vim-commentary' " Comment stuff out -Plug 'junegunn/vim-easy-align' " A Vim alignment plugin -Plug 'Olical/vim-enmasse' " Edit every line in a quickfix list at the same time -Plug 'mhinz/vim-grepper', { 'on': ['Grepper', '(GrepperOperator)'] } " + Plug 'tpope/vim-surround' " Quoting/parenthesizing made simple + Plug 'tpope/vim-commentary' " Comment stuff out + Plug 'junegunn/vim-easy-align' " A Vim alignment plugin + Plug 'Olical/vim-enmasse' " Edit every line in a quickfix list at the same time + Plug 'mhinz/vim-grepper', { 'on': ['Grepper', '(GrepperOperator)'] } " #+END_SRC ** Utils #+BEGIN_SRC conf -Plug 'tpope/vim-repeat' " Enable repeating supported plugin maps with '.' -Plug 'tpope/vim-obsession' " Continuously updated session files -Plug 'tpope/vim-eunuch' " eunuch.vim: helpers for UNIX -Plug 'kana/vim-operator-user' " Define your own operator easily -Plug 'majutsushi/tagbar' " Vim plugin that displays tags in a window, ordered by scope -Plug 'tpope/vim-speeddating' " use CTRL-A/CTRL-X to increment dates, times, and more -Plug 'liuchengxu/vim-which-key' " Vim plugin that shows keybindings in popup + Plug 'tpope/vim-repeat' " Enable repeating supported plugin maps with '.' + Plug 'tpope/vim-obsession' " Continuously updated session files + Plug 'tpope/vim-eunuch' " eunuch.vim: helpers for UNIX + Plug 'kana/vim-operator-user' " Define your own operator easily + Plug 'majutsushi/tagbar' " Vim plugin that displays tags in a window, ordered by scope + Plug 'tpope/vim-speeddating' " use CTRL-A/CTRL-X to increment dates, times, and more + Plug 'liuchengxu/vim-which-key' " Vim plugin that shows keybindings in popup #+END_SRC ** Visual #+BEGIN_SRC conf -Plug 'itchyny/lightline.vim' " A light and configurable statusline/tabline for Vim -Plug 'Yggdroot/indentLine' " A vim plugin to display the indention levels with thin vertical lines -Plug 'ryanoasis/vim-devicons' " Adds file type glyphs/icons to many popular Vim plugins such as: NERDTree, vim-airline, unite, vim-startify and many more -Plug 'mhinz/vim-startify' " The fancy start screen for Vim -Plug 'junegunn/goyo.vim' " Distraction-free writing in Vim + Plug 'itchyny/lightline.vim' " A light and configurable statusline/tabline for Vim + Plug 'Yggdroot/indentLine' " A vim plugin to display the indention levels with thin vertical lines + Plug 'ryanoasis/vim-devicons' " Adds file type glyphs/icons to many popular Vim plugins such as: NERDTree, vim-airline, unite, vim-startify and many more + Plug 'mhinz/vim-startify' " The fancy start screen for Vim + Plug 'junegunn/goyo.vim' " Distraction-free writing in Vim #+END_SRC ** Themes #+BEGIN_SRC conf -Plug 'chriskempson/base16-vim' " Base16 for Vim -Plug 'morhetz/gruvbox' " Retro groove color scheme for Vim -Plug 'jacoborus/tender.vim' " A 24bit colorscheme for Vim, Airline and Lightline + Plug 'morhetz/gruvbox' " Retro groove color scheme for Vim #+END_SRC ** Snippnets and autocompletion #+BEGIN_SRC conf -Plug 'SirVer/ultisnips' " The ultimate snippet solution for Vim -" TODO Alternative https://github.com/Shougo/neosnippet.vim -Plug 'honza/vim-snippets' " Vim-snipmate default snippets + Plug 'SirVer/ultisnips' " The ultimate snippet solution for Vim + " TODO Alternative https://github.com/Shougo/neosnippet.vim + Plug 'honza/vim-snippets' " Vim-snipmate default snippets #+END_SRC ** Syntax Checking and Build Utils #+BEGIN_SRC conf -Plug 'neomake/neomake' " Asynchronous linting and make framework for Neovim/Vim + Plug 'neomake/neomake' " Asynchronous linting and make framework for Neovim/Vim #+END_SRC ** Auto Completion #+BEGIN_SRC conf -Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' } " Dark powered asynchronous completion framework for neovim + Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' } " Dark powered asynchronous completion framework for neovim #+END_SRC ** Tmux #+BEGIN_SRC conf -Plug 'christoomey/vim-tmux-navigator' " Seamless navigation between tmux panes and vim splits -Plug 'jpalardy/vim-slime' " Used to type text into a REPL + Plug 'christoomey/vim-tmux-navigator' " Seamless navigation between tmux panes and vim splits + Plug 'jpalardy/vim-slime' " Used to type text into a REPL #+END_SRC ** Syntax #+BEGIN_SRC conf -Plug 'sheerun/vim-polyglot' " A solid language pack for Vim + Plug 'sheerun/vim-polyglot' " A solid language pack for Vim #+END_SRC ** Markdown #+BEGIN_SRC conf -Plug 'plasticboy/vim-markdown', { 'for': 'markdown' } " Markdown Vim Mode -Plug 'mzlogin/vim-markdown-toc', { 'for': 'markdown' } " A vim plugin to generate table of contents for Markdown files -Plug 'JamshedVesuna/vim-markdown-preview', { 'for': 'markdown' } " A light Vim plugin for previewing markdown files in a browser -Plug 'nelstrom/vim-markdown-folding' " Fold markdown documents by section + Plug 'plasticboy/vim-markdown', { 'for': 'markdown' } " Markdown Vim Mode + Plug 'mzlogin/vim-markdown-toc', { 'for': 'markdown' } " A vim plugin to generate table of contents for Markdown files + Plug 'JamshedVesuna/vim-markdown-preview', { 'for': 'markdown' } " A light Vim plugin for previewing markdown files in a browser + Plug 'nelstrom/vim-markdown-folding' " Fold markdown documents by section #+END_SRC ** LaTeX #+BEGIN_SRC conf -Plug 'lervag/vimtex', { 'for': 'tex' } " A modern vim plugin for editing LaTeX files. + Plug 'lervag/vimtex', { 'for': 'tex' } " A modern vim plugin for editing LaTeX files. #+END_SRC ** Matlab #+BEGIN_SRC conf -Plug 'tdehaeze/matlab-vim', { 'for': 'matlab' } " Edit Matlab M-files in Vim editor -Plug 'djoshea/vim-matlab-fold', { 'for': 'matlab' } " Vim code folding for Matlab files + Plug 'tdehaeze/matlab-vim', { 'for': 'matlab' } " Edit Matlab M-files in Vim editor + Plug 'djoshea/vim-matlab-fold', { 'for': 'matlab' } " Vim code folding for Matlab files #+END_SRC ** Org Mode #+BEGIN_SRC conf -Plug 'jceb/vim-orgmode' " Text outlining and task management for Vim -Plug 'vim-scripts/SyntaxRange' " Define a different filetype syntax on regions of a buffer -Plug 'chrisbra/NrrwRgn' " A Narrow Region Plugin for vim -Plug 'mattn/calendar-vim' " calendar vimscript -Plug 'vim-scripts/utl.vim' " Univeral Text Linking - Execute URLs, footnotes, open emails, organize ideas + Plug 'jceb/vim-orgmode' " Text outlining and task management for Vim + Plug 'vim-scripts/SyntaxRange' " Define a different filetype syntax on regions of a buffer + Plug 'chrisbra/NrrwRgn' " A Narrow Region Plugin for vim + Plug 'mattn/calendar-vim' " calendar vimscript + Plug 'vim-scripts/utl.vim' " Univeral Text Linking - Execute URLs, footnotes, open emails, organize ideas #+END_SRC ** Others / To test #+BEGIN_SRC conf -" Plug 'francoiscabrol/ranger.vim' " Ranger integration in vim and neovim -" Plug 'brooth/far.vim' " Find And Replace Vim plugin -" Plug 'justinmk/vim-gtfo' " Go to Terminal or File manager -" Plug 'sjl/gundo.vim', { 'on': 'GundoToggle' } " Vim plugin to visualize your Vim undo tree -" Plug 'drzel/vim-line-no-indicator' " Simple and expressive line number indicator + " Plug 'francoiscabrol/ranger.vim' " Ranger integration in vim and neovim + " Plug 'brooth/far.vim' " Find And Replace Vim plugin + " Plug 'justinmk/vim-gtfo' " Go to Terminal or File manager + " Plug 'sjl/gundo.vim', { 'on': 'GundoToggle' } " Vim plugin to visualize your Vim undo tree + " Plug 'drzel/vim-line-no-indicator' " Simple and expressive line number indicator #+END_SRC ** Plug End #+BEGIN_SRC conf -call plug#end() + call plug#end() #+END_SRC * Basic @@ -277,35 +275,40 @@ endif ** Colors and Fonts #+BEGIN_SRC conf -" Theme -syntax enable + " Theme + syntax enable -set background=dark + set background=dark -let base16colorspace=256 + let base16colorspace=256 -try - " colorscheme tender - colorscheme base16-default-dark -catch -endtry + try + colorscheme gruvbox + catch + endtry -" set cursor shapes for insert and replace modes -set guicursor=n-v-c-sm:block,i-ci-ve:ver25,r-cr-o:hor20 + " set cursor shapes for insert and replace modes + set guicursor=n-v-c-sm:block,i-ci-ve:ver25,r-cr-o:hor20 -" Set utf8 as standard encoding -set encoding=utf-8 -set fileencoding=utf-8 + " Set utf8 as standard encoding + set encoding=utf-8 + set fileencoding=utf-8 -" Use Unix as the standard file type -set ffs=unix,dos,mac + " Use Unix as the standard file type + set ffs=unix,dos,mac -" Do not highlight the cursor line : http://vim.wikia.com/wiki/Highlight_current_line -set nocursorline -set nocursorcolumn + " Do not highlight the cursor line : http://vim.wikia.com/wiki/Highlight_current_line + set nocursorline + set nocursorcolumn -" Always show the status line -set laststatus=2 + " Always show the status line + set laststatus=2 + + " Underline for bad spelled words + hi clear SpellBad + hi SpellBad cterm=underline + " Set style for gVim + hi SpellBad gui=undercurl #+END_SRC ** Files, backups and undo @@ -419,14 +422,14 @@ endfunction ** GUI related #+BEGIN_SRC conf -set guifont=SauceCodePro\ Nerd\ Font:h13 -set gfn=SauceCodePro\ Nerd\ Font,Hack\ 14,Bitstream\ Vera\ Sans\ Mono\ 11 + set guifont=Hack\ Nerd\ Font\ Mono:h13 + set gfn=Hack\ Nerd\ Font\ Mono:h13 -" Disable scrollbars -set guioptions-=r -set guioptions-=R -set guioptions-=l -set guioptions-=L + " Disable scrollbars + set guioptions-=r + set guioptions-=R + set guioptions-=l + set guioptions-=L #+END_SRC ** Turn persistent undo on diff --git a/install.org b/install.org index 9650c5f..b84e509 100644 --- a/install.org +++ b/install.org @@ -26,7 +26,6 @@ abook - Address book with mutt support elinks - Text mode web browser lbdb - Little brother's database for the mutt mail reader mu - Tool for searching e-mail messages stored in the maildir-format -contacts - Command-line tool to access macOS's Contacts (formerly 'Address Book') ripmime - Extract attachments out of MIME encoded email packages shared-mime-info - Database of common MIME types @@ -49,7 +48,6 @@ arduino-mk - Makefile for Arduino sketches | =ranger= | File browser | | =vifm= | Ncurses based file manager with vi like keybindings | | =tree= | Display directories as trees (with optional color/HTML output) | -| =launch= | Command-line launcher for macOS, in the spirit of 'open' | | =p7zip= | 7-Zip (high compression file archiver) implementation | | =unrar= | Extract, view, and test RAR archives | | =atool= | script for managing file archives of various types | @@ -84,12 +82,9 @@ moreutils - Collection of tools that nobody wrote when UNIX was young | =hugo= | Configurable static site generator | | =markdown= | Text-to-HTML conversion tool | | =musikcube= | A cross-platform, terminal-based music player | -| =ncurses= | Text-based UI library | | =openssl= | Cryptography and SSL/TLS Toolkit | | =openvpn= | SSL/TLS VPN implementing OSI layer 2 or 3 secure network extension | | =sdl= | Low-level access to audio, keyboard, mouse, joystick and graphics | -| =ssh= | copy-id - Add a public key to a remote machine's authorized_keys file | -| =terminal= | notifier - Send macOS User Notifications from the command-line | | =texinfo= | Official documentation format of the GNU project | | =weechat= | Extensible IRC client | | =wego= | Weather app for the terminal | @@ -97,21 +92,3 @@ moreutils - Collection of tools that nobody wrote when UNIX was young | =imagemagick= | Tools and libraries to manipulate images in many formats | | =glances= | Alternative to top/htop | | =pandoc= | Swiss-army knife of markup format conversion | - -* Applications -| =airflow= | Watch local content on Apple TV and Chromecast | -| =angry-ip-scanner= | Fast and friendly network scanner | -| =arduino= | Arduino IDE | -| =font-hack-nerd-font= | Iconic font aggregator | -| =kap= | An open-source screen recorder built with web technology | -| =karabiner-elements= | powerful utility for keyboard customization on macOS | -| =launchcontrol= | Create, manage and debug launchd(8) services | -| =mactex= | The MacTeX Distribution | -| =nmap= | the Network Mapper - Free Security Scanner | -| =numi= | Beautiful calculator app for Mac | -| =virtualbox= | VirtualBox | -| =vlc= | the best Open Source player | -| =castnow= | Commandline chromecast player | -| =fast-cli= | Test your download speed using fast.com | -| =neovim= | Neovim client API and neovim remote plugin provider | -| =wunderline= | Wunderlist for your command line |