From 31047b239ce86ccf74ac7783c93b3ff7fde4ed76 Mon Sep 17 00:00:00 2001
From: "E. Almqvist" <elalmqvist@gmail.com>
Date: Thu, 23 Mar 2023 21:37:13 +0100
Subject: [PATCH 1/7] Editor tweaks

---
 doomemacs/.doom.d/custom.el             | 2 +-
 nvim/.config/nvim/lua/custom/chadrc.lua | 6 ++++++
 oh-my-zsh/.oh-my-zsh/aliases.sh         | 4 ++--
 3 files changed, 9 insertions(+), 3 deletions(-)
 create mode 100644 nvim/.config/nvim/lua/custom/chadrc.lua

diff --git a/doomemacs/.doom.d/custom.el b/doomemacs/.doom.d/custom.el
index c65db52..f353b6d 100644
--- a/doomemacs/.doom.d/custom.el
+++ b/doomemacs/.doom.d/custom.el
@@ -12,7 +12,7 @@
  '(elcord-idle-message "Thinking...")
  '(elcord-mode t nil (elcord))
  '(elcord-quiet t)
- '(package-selected-packages '(elcord quelpa eldoc-cmake cpputils-cmake))
+ '(package-selected-packages '(lsp-pyright elcord quelpa eldoc-cmake cpputils-cmake))
  '(warning-suppress-types '((initialization) (defvaralias))))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
diff --git a/nvim/.config/nvim/lua/custom/chadrc.lua b/nvim/.config/nvim/lua/custom/chadrc.lua
new file mode 100644
index 0000000..e71eeb2
--- /dev/null
+++ b/nvim/.config/nvim/lua/custom/chadrc.lua
@@ -0,0 +1,6 @@
+              local M = {}
+                M.ui = {
+                  theme = "onedark",
+               }
+              return M
+           
\ No newline at end of file
diff --git a/oh-my-zsh/.oh-my-zsh/aliases.sh b/oh-my-zsh/.oh-my-zsh/aliases.sh
index 99bc12a..f38d37e 100644
--- a/oh-my-zsh/.oh-my-zsh/aliases.sh
+++ b/oh-my-zsh/.oh-my-zsh/aliases.sh
@@ -7,8 +7,8 @@ alias ccd="pwd | xclip"
 
 # Programs
 alias vidconvert="ffmpeg -i"
-alias vim="nvim"
-alias vi="nvim"
+# alias vim="nvim"
+# alias vi="nvim"
 
 # Shortcuts
 alias todo="task"

From 6c282bf90c893bfafcbfa93a7be7bbf94b9f559a Mon Sep 17 00:00:00 2001
From: "E. Almqvist" <elalmqvist@gmail.com>
Date: Sat, 1 Apr 2023 15:40:47 +0200
Subject: [PATCH 2/7] Minor tweak

---
 doomemacs/.doom.d/custom.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/doomemacs/.doom.d/custom.el b/doomemacs/.doom.d/custom.el
index f353b6d..12acc10 100644
--- a/doomemacs/.doom.d/custom.el
+++ b/doomemacs/.doom.d/custom.el
@@ -12,7 +12,8 @@
  '(elcord-idle-message "Thinking...")
  '(elcord-mode t nil (elcord))
  '(elcord-quiet t)
- '(package-selected-packages '(lsp-pyright elcord quelpa eldoc-cmake cpputils-cmake))
+ '(package-selected-packages
+   '(scala-mode thrift lsp-pyright elcord quelpa eldoc-cmake cpputils-cmake))
  '(warning-suppress-types '((initialization) (defvaralias))))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.

From 6aa0e3a61abc63a0b657da19c40014af4e3e376c Mon Sep 17 00:00:00 2001
From: "E. Almqvist" <elalmqvist@gmail.com>
Date: Sat, 1 Apr 2023 19:27:49 +0200
Subject: [PATCH 3/7] Stuff

---
 doomemacs/.doom.d/custom.el |  4 +++-
 doomemacs/.doom.d/init.el   | 36 ++++++++++++++++++++----------------
 nvim/.config/nvim/init.vim  | 25 +++++++++++++------------
 3 files changed, 36 insertions(+), 29 deletions(-)

diff --git a/doomemacs/.doom.d/custom.el b/doomemacs/.doom.d/custom.el
index 12acc10..758e730 100644
--- a/doomemacs/.doom.d/custom.el
+++ b/doomemacs/.doom.d/custom.el
@@ -3,6 +3,8 @@
  ;; If you edit it by hand, you could mess it up, so be careful.
  ;; Your init file should contain only one such instance.
  ;; If there is more than one, they won't work right.
+ '(custom-safe-themes
+   '("2dd4951e967990396142ec54d376cced3f135810b2b69920e77103e0bcedfba9" default))
  '(elcord-display-buffer-details nil)
  '(elcord-display-elapsed t)
  '(elcord-display-line-numbers nil)
@@ -13,7 +15,7 @@
  '(elcord-mode t nil (elcord))
  '(elcord-quiet t)
  '(package-selected-packages
-   '(scala-mode thrift lsp-pyright elcord quelpa eldoc-cmake cpputils-cmake))
+   '(elcord quelpa eldoc-cmake cpputils-cmake))
  '(warning-suppress-types '((initialization) (defvaralias))))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
diff --git a/doomemacs/.doom.d/init.el b/doomemacs/.doom.d/init.el
index 8279616..b710d50 100644
--- a/doomemacs/.doom.d/init.el
+++ b/doomemacs/.doom.d/init.el
@@ -37,8 +37,8 @@
        ;;hydra
        ;;indent-guides     ; highlighted indent columns
        ligatures         ; ligatures and symbols to make your code pretty again
-       ;; minimap           ; show a map of the code on the side
-       ;; modeline          ; snazzy, Atom-inspired modeline, plus API
+       minimap           ; show a map of the code on the side
+       modeline          ; snazzy, Atom-inspired modeline, plus API
        ;;nav-flash         ; blink cursor line after big motions
        neotree           ; a project drawer, like NERDTree for vim
        ophints           ; highlight the region an operation acts on
@@ -121,7 +121,7 @@
        ;;common-lisp       ; if you've seen one lisp, you've seen them all
        ;;coq               ; proofs-as-programs
        ;;crystal           ; ruby at the speed of c
-       csharp            ; unity, .NET, and mono shenanigans
+       (csharp +lsp)            ; unity, .NET, and mono shenanigans
        ;;data              ; config/data formats
        ;;(dart +flutter)   ; paint ui and not much else
        ;;dhall
@@ -144,38 +144,38 @@
        json              ; At least it ain't XML
        (java +lsp)       ; the poster child for carpal tunnel syndrome
        javascript        ; all(hope(abandon(ye(who(enter(here))))))
-       ;;julia             ; a better, faster MATLAB
-       ;;kotlin            ; a better, slicker Java(Script)
+       julia             ; a better, faster MATLAB
+       kotlin            ; a better, slicker Java(Script)
        latex             ; writing papers in Emacs has never been so fun
        ;;lean              ; for folks with too much to prove
        ;;ledger            ; be audit you can be
-       lua               ; one-based indices? one-based indices
+       (lua +lsp)               ; one-based indices? one-based indices
        markdown          ; writing docs for people to ignore
-       ;;nim               ; python + lisp at the speed of c
-       ;;nix               ; I hereby declare "nix geht mehr!"
-       ;;ocaml             ; an objective camel
+       nim               ; python + lisp at the speed of c
+       nix               ; I hereby declare "nix geht mehr!"
+       ocaml             ; an objective camel
        org               ; organize your plain life in plain text
-       ;;php               ; perl's insecure younger brother
+       php               ; perl's insecure younger brother
        ;;plantuml          ; diagrams for confusing people more
        ;; purescript        ; javascript, but functional
-       python            ; beautiful is better than ugly
+       (python +lsp)            ; beautiful is better than ugly
        ;;qt                ; the 'cutest' gui framework ever
        ;;racket            ; a DSL for DSLs
        ;;raku              ; the artist formerly known as perl6
        ;;rest              ; Emacs as a REST client
        ;;rst               ; ReST in peace
        (ruby +rails)     ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"}
-       rust              ; Fe2O3.unwrap().unwrap().unwrap().unwrap()
-       ;;scala             ; java, but good
+       (rust +lsp)              ; Fe2O3.unwrap().unwrap().unwrap().unwrap()
+       (scala +lsp)             ; java, but good
        ;;(scheme +guile)   ; a fully conniving family of lisps
        sh                ; she sells {ba,z,fi}sh shells on the C xor
        ;;sml
        ;;solidity          ; do you need a blockchain? No.
-       ;;swift             ; who asked for emoji variables?
+       (swift +lsp)             ; who asked for emoji variables?
        ;;terra             ; Earth and Moon in alignment for performance.
-       ;;web               ; the tubes
+       web               ; the tubes
        yaml              ; JSON, but readable
-       ;;zig               ; C, but simpler
+       (zig +lsp)               ; C, but simpler
 
        :email
        ;;(mu4e +org +gmail)
@@ -193,3 +193,7 @@
        :config
        ;;literate
        (default +bindings +smartparens))
+
+
+(after! lsp-pyls
+  (setq lsp-pyls-plugins-pycodestyle-ignore '("E501")))
diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim
index 423ddff..5b04419 100644
--- a/nvim/.config/nvim/init.vim
+++ b/nvim/.config/nvim/init.vim
@@ -28,6 +28,7 @@ call plug#begin('~/.config/nvim/plugged')
 	Plug 'ellisonleao/gruvbox.nvim'
 	Plug 'sainnhe/gruvbox-material'
 	Plug 'projekt0n/github-nvim-theme'
+	Plug 'chriskempson/base16-vim'
 	" Lua Line
 	Plug 'nvim-lualine/lualine.nvim'
 	Plug 'kyazdani42/nvim-web-devicons'
@@ -56,27 +57,27 @@ set shiftwidth=4
 let g:ruby_recommended_style = 0
 
 " Binds
-	" Tabs
-	vmap <Tab> >gv
-	vmap <S-Tab> <gv
+" Tabs
+vmap <Tab> >gv
+vmap <S-Tab> <gv
 
-	" NERDTree
-	nmap <silent> <C-D> :NERDTreeToggle<CR> 
+" NERDTree
+nmap <silent> <C-D> :NERDTreeToggle<CR> 
 
 set clipboard+=unnamedplus
 
 " Theme
 " set background=dark
-colorscheme github_dark
+colorscheme base16-tomorrow-night
 let &showbreak = '↳ '
 set laststatus=0 ruler
-" set rnu nu
+set nu
 
-hi Normal guibg=NONE ctermbg=NONE
-hi EndOfBuffer guibg=NONE ctermbg=NONE
-hi TabLine guibg=NONE ctermbg=NONE
-" hi TabLineSel ctermfg=223 guibg=NONE ctermbg=NONE 
-hi TabLineFill guibg=NONE ctermbg=NONE
+" hi Normal guibg=NONE ctermbg=NONE
+" hi EndOfBuffer guibg=NONE ctermbg=NONE
+" hi TabLine guibg=NONE ctermbg=NONE
+" " hi TabLineSel ctermfg=223 guibg=NONE ctermbg=NONE 
+" hi TabLineFill guibg=NONE ctermbg=NONE
 
 hi StatusLine ctermbg=NONE guibg=NONE
 

From 6bcbf5646d48a4217ad7df4b00705a1c873312e6 Mon Sep 17 00:00:00 2001
From: "E. Almqvist" <elalmqvist@gmail.com>
Date: Thu, 6 Apr 2023 13:27:57 +0200
Subject: [PATCH 4/7] Shell & nvim stuff

---
 nvim/.config/nvim/init.vim | 34 +++++++++++++++++++++++++++++++++-
 zsh/.zshrc                 |  2 +-
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim
index 5b04419..22df3b8 100644
--- a/nvim/.config/nvim/init.vim
+++ b/nvim/.config/nvim/init.vim
@@ -10,8 +10,14 @@ call plug#begin('~/.config/nvim/plugged')
 	Plug 'vim-scripts/fountain.vim'
 	Plug 'preservim/nerdtree'
 	Plug 'numToStr/Comment.nvim'
+	Plug 'andweeb/presence.nvim'
+
+	" LS
+	" Plug 'neoclide/coc.nvim', {'branch': 'release'}
+	Plug 'nvim-lua/completion-nvim'
+	Plug 'neovim/nvim-lspconfig'
+
 	" Lang support
-	Plug 'neoclide/coc.nvim', {'branch': 'release'}
 	Plug 'tpope/vim-markdown'
 	Plug 'ap/vim-css-color' 
 	Plug 'axelf4/vim-haskell'
@@ -24,11 +30,13 @@ call plug#begin('~/.config/nvim/plugged')
 	Plug 'slim-template/vim-slim'
 	Plug 'OmniSharp/omnisharp-vim'
 	Plug 'ARM9/arm-syntax-vim'
+	
 	" Themes
 	Plug 'ellisonleao/gruvbox.nvim'
 	Plug 'sainnhe/gruvbox-material'
 	Plug 'projekt0n/github-nvim-theme'
 	Plug 'chriskempson/base16-vim'
+
 	" Lua Line
 	Plug 'nvim-lualine/lualine.nvim'
 	Plug 'kyazdani42/nvim-web-devicons'
@@ -122,4 +130,28 @@ set title
 lua << END
 require('lualine').setup()
 require('Comment').setup()
+----require('lspconfig').setup({})
+require("presence").setup({
+    -- General options
+    auto_update         = true,                       -- Update activity based on autocmd events (if `false`, map or manually execute `:lua package.loaded.presence:update()`)
+    neovim_image_text   = "Neovim", -- Text displayed when hovered over the Neovim image
+    main_image          = "neovim",                   -- Main image display (either "neovim" or "file")
+    client_id           = "793271441293967371",       -- Use your own Discord application client id (not recommended)
+    log_level           = nil,                        -- Log messages at or above this level (one of the following: "debug", "info", "warn", "error")
+    debounce_timeout    = 10,                         -- Number of seconds to debounce events (or calls to `:lua package.loaded.presence:update(<filename>, true)`)
+    enable_line_number  = false,                      -- Displays the current line number instead of the current project
+    blacklist           = {},                         -- A list of strings or Lua patterns that disable Rich Presence if the current file name, path, or workspace matches
+    buttons             = false,                       -- Configure Rich Presence button(s), either a boolean to enable/disable, a static table (`{{ label = "<label>", url = "<url>" }, ...}`, or a function(buffer: string, repo_url: string|nil): table)
+    file_assets         = {},                         -- Custom file asset definitions keyed by file names and extensions (see default config at `lua/presence/file_assets.lua` for reference)
+    show_time           = true,                       -- Show the timer
+
+    -- Rich Presence text options
+    editing_text        = "Editing %s",               -- Format string rendered when an editable file is loaded in the buffer (either string or function(filename: string): string)
+    file_explorer_text  = "Browsing %s",              -- Format string rendered when browsing a file explorer (either string or function(file_explorer_name: string): string)
+    git_commit_text     = "Committing changes",       -- Format string rendered when committing changes in git (either string or function(filename: string): string)
+    plugin_manager_text = "Managing plugins",         -- Format string rendered when managing plugins (either string or function(plugin_manager_name: string): string)
+    reading_text        = "Reading %s",               -- Format string rendered when a read-only or unmodifiable file is loaded in the buffer (either string or function(filename: string): string)
+    workspace_text      = "Working on %s",            -- Format string rendered when in a git repository (either string or function(project_name: string|nil, filename: string): string)
+    line_number_text    = "Line %s out of %s",        -- Format string rendered when `enable_line_number` is set to true (either string or function(line_number: number, line_count: number): string)
+})
 END
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 299afef..4b36b5a 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -104,7 +104,7 @@ source $ZSH/oh-my-zsh.sh
 
 source $ZSH/aliases.sh
 export TERM='xterm-256color'
-export PATH="$HOME/.scripts:$HOME/.cargo/bin:$PATH" # Add custom scripts!
+export PATH="$HOME/.scripts:$HOME/.cargo/bin:$HOME/.local/bin:$PATH" # Add custom scripts!
 
 # Program defaults
 export VIDPLAY=vlc

From 14f8f6825f67b72c5c96050eee64b987a307aa6c Mon Sep 17 00:00:00 2001
From: "E. Almqvist" <elalmqvist@gmail.com>
Date: Thu, 6 Apr 2023 15:40:38 +0200
Subject: [PATCH 5/7] eVim 1.0

---
 nvim2/.config/nvim/after/plugin/comment.lua   |   1 +
 nvim2/.config/nvim/after/plugin/lsp.lua       |  48 +++++
 nvim2/.config/nvim/after/plugin/lualine.lua   |   1 +
 nvim2/.config/nvim/after/plugin/presence.lua  |  23 +++
 .../.config/nvim/after/plugin/treesitter.lua  |  16 ++
 nvim2/.config/nvim/init.lua                   |  23 +++
 nvim2/.config/nvim/lua/evim/init.lua          |   3 +
 nvim2/.config/nvim/lua/evim/packer.lua        |  52 +++++
 nvim2/.config/nvim/lua/evim/remap.lua         |  21 ++
 nvim2/.config/nvim/plugin/packer_compiled.lua | 185 ++++++++++++++++++
 10 files changed, 373 insertions(+)
 create mode 100644 nvim2/.config/nvim/after/plugin/comment.lua
 create mode 100644 nvim2/.config/nvim/after/plugin/lsp.lua
 create mode 100644 nvim2/.config/nvim/after/plugin/lualine.lua
 create mode 100644 nvim2/.config/nvim/after/plugin/presence.lua
 create mode 100644 nvim2/.config/nvim/after/plugin/treesitter.lua
 create mode 100644 nvim2/.config/nvim/init.lua
 create mode 100644 nvim2/.config/nvim/lua/evim/init.lua
 create mode 100644 nvim2/.config/nvim/lua/evim/packer.lua
 create mode 100644 nvim2/.config/nvim/lua/evim/remap.lua
 create mode 100644 nvim2/.config/nvim/plugin/packer_compiled.lua

diff --git a/nvim2/.config/nvim/after/plugin/comment.lua b/nvim2/.config/nvim/after/plugin/comment.lua
new file mode 100644
index 0000000..a844323
--- /dev/null
+++ b/nvim2/.config/nvim/after/plugin/comment.lua
@@ -0,0 +1 @@
+require('Comment').setup()
diff --git a/nvim2/.config/nvim/after/plugin/lsp.lua b/nvim2/.config/nvim/after/plugin/lsp.lua
new file mode 100644
index 0000000..8d8592f
--- /dev/null
+++ b/nvim2/.config/nvim/after/plugin/lsp.lua
@@ -0,0 +1,48 @@
+local lsp = require("lsp-zero")
+
+lsp.preset("recommended")
+
+lsp.ensure_installed({
+        "tsserver",
+        "eslint",
+        "lua_ls",
+        "rust_analyzer",
+        "pyright",
+})
+
+local cmp = require("cmp")
+local cmp_select = { behavior = cmp.SelectBehavior.Select }
+local cmp_mappings = lsp.defaults.cmp_mappings({
+        ["<C-p>"] = cmp.mapping.select_prev_item(cmp_select),
+        ["<C-n>"] = cmp.mapping.select_next_item(cmp_select),
+        ["<C-y>"] = cmp.mapping.confirm({ select = true }),
+        ["<C-Space>"] = cmp.mapping.complete(),
+})
+
+lsp.set_preferences({
+        sign_icons = {}
+})
+
+lsp.setup_nvim_cmp({
+        mapping = cmp_mappings
+})
+
+lsp.on_attach(function(client, bufnr)
+        local opts = { buffer = bufnr, remap = false }
+
+        vim.keymap.set("n", "gd", function() vim.lsp.buf.definition() end, opts)
+        vim.keymap.set("n", "K", function() vim.lsp.buf.hover() end, opts)
+        vim.keymap.set("n", "<leader>vws", function() vim.lsp.buf.workspace_symbol() end, opts)
+        vim.keymap.set("n", "<leader>vd", function() vim.diagnostic.open_float() end, opts)
+        vim.keymap.set("n", "[d", function() vim.diagnostic.goto_next() end, opts)
+        vim.keymap.set("n", "]d", function() vim.diagnostic.goto_prev() end, opts)
+        vim.keymap.set("n", "<leader>vca", function() vim.lsp.buf.code_action() end, opts)
+        vim.keymap.set("n", "<leader>vrr", function() vim.lsp.buf.references() end, opts)
+        vim.keymap.set("n", "<leader>vrn", function() vim.lsp.buf.rename() end, opts)
+        vim.keymap.set("i", "<C-h>", function() vim.lsp.buf.signature_help() end, opts)
+        vim.keymap.set("n", "<A-g>", function()
+                vim.lsp.buf.format { async = true }
+        end, opts)
+end)
+
+lsp.setup()
diff --git a/nvim2/.config/nvim/after/plugin/lualine.lua b/nvim2/.config/nvim/after/plugin/lualine.lua
new file mode 100644
index 0000000..9814cae
--- /dev/null
+++ b/nvim2/.config/nvim/after/plugin/lualine.lua
@@ -0,0 +1 @@
+require("lualine").setup()
diff --git a/nvim2/.config/nvim/after/plugin/presence.lua b/nvim2/.config/nvim/after/plugin/presence.lua
new file mode 100644
index 0000000..d7dcc05
--- /dev/null
+++ b/nvim2/.config/nvim/after/plugin/presence.lua
@@ -0,0 +1,23 @@
+require("presence").setup({
+    -- General options
+    auto_update         = true,                       -- Update activity based on autocmd events (if `false`, map or manually execute `:lua package.loaded.presence:update()`)
+    neovim_image_text   = "Neovim", -- Text displayed when hovered over the Neovim image
+    main_image          = "file",                   -- Main image display (either "neovim" or "file")
+    client_id           = "793271441293967371",       -- Use your own Discord application client id (not recommended)
+    log_level           = nil,                        -- Log messages at or above this level (one of the following: "debug", "info", "warn", "error")
+    debounce_timeout    = 10,                         -- Number of seconds to debounce events (or calls to `:lua package.loaded.presence:update(<filename>, true)`)
+    enable_line_number  = false,                      -- Displays the current line number instead of the current project
+    blacklist           = {},                         -- A list of strings or Lua patterns that disable Rich Presence if the current file name, path, or workspace matches
+    buttons             = false,                       -- Configure Rich Presence button(s), either a boolean to enable/disable, a static table (`{{ label = "<label>", url = "<url>" }, ...}`, or a function(buffer: string, repo_url: string|nil): table)
+    file_assets         = {},                         -- Custom file asset definitions keyed by file names and extensions (see default config at `lua/presence/file_assets.lua` for reference)
+    show_time           = false,                       -- Show the timer
+
+    -- Rich Presence text options
+    editing_text        = "Editing %s",               -- Format string rendered when an editable file is loaded in the buffer (either string or function(filename: string): string)
+    file_explorer_text  = "Browsing %s",              -- Format string rendered when browsing a file explorer (either string or function(file_explorer_name: string): string)
+    git_commit_text     = "Committing changes",       -- Format string rendered when committing changes in git (either string or function(filename: string): string)
+    plugin_manager_text = "Managing plugins",         -- Format string rendered when managing plugins (either string or function(plugin_manager_name: string): string)
+    reading_text        = "Reading %s",               -- Format string rendered when a read-only or unmodifiable file is loaded in the buffer (either string or function(filename: string): string)
+    workspace_text      = "Working on %s",            -- Format string rendered when in a git repository (either string or function(project_name: string|nil, filename: string): string)
+    line_number_text    = "Line %s out of %s",        -- Format string rendered when `enable_line_number` is set to true (either string or function(line_number: number, line_count: number): string)
+})
diff --git a/nvim2/.config/nvim/after/plugin/treesitter.lua b/nvim2/.config/nvim/after/plugin/treesitter.lua
new file mode 100644
index 0000000..fa9f65a
--- /dev/null
+++ b/nvim2/.config/nvim/after/plugin/treesitter.lua
@@ -0,0 +1,16 @@
+-- Treesitter init
+require("nvim-treesitter.configs").setup({
+	-- A list of parser names, or "all" (the five listed parsers should always be installed)
+	ensure_installed = { "c", "lua", "vim", "vimdoc", "query", "typescript", "javascript", "python", "rust" },
+
+	-- Install parsers synchronously (only applied to `ensure_installed`)
+	sync_install = false,
+
+	-- Automatically install missing parsers when entering buffer
+	-- Recommendation: set to false if you don"t have `tree-sitter` CLI installed locally
+	auto_install = true,
+	highlight = {
+		enable = true,
+		additional_vim_regex_highlighting = false,
+	},
+})
diff --git a/nvim2/.config/nvim/init.lua b/nvim2/.config/nvim/init.lua
new file mode 100644
index 0000000..3d0f3e3
--- /dev/null
+++ b/nvim2/.config/nvim/init.lua
@@ -0,0 +1,23 @@
+--      __     ___
+--    __\ \   / (_)_ __ ___
+--   / _ \ \ / /| | '_ ` _ \
+--  |  __/\ V / | | | | | | |
+--   \___| \_/  |_|_| |_| |_|
+--        epsilons Viim
+
+require("evim.init")
+
+-- Theme
+vim.opt.termguicolors = true
+vim.cmd.colorscheme "melange"
+
+-- Editor settings
+vim.opt.nu         = true
+vim.opt.scrolloff  = 4
+
+vim.opt.autoindent = true
+vim.opt.tabstop    = 4
+vim.opt.shiftwidth = 4
+
+vim.opt.hlsearch   = false
+vim.opt.incsearch  = true
diff --git a/nvim2/.config/nvim/lua/evim/init.lua b/nvim2/.config/nvim/lua/evim/init.lua
new file mode 100644
index 0000000..2609dca
--- /dev/null
+++ b/nvim2/.config/nvim/lua/evim/init.lua
@@ -0,0 +1,3 @@
+require("evim.remap")	-- Default binds
+require("evim.packer") -- Package manager
+
diff --git a/nvim2/.config/nvim/lua/evim/packer.lua b/nvim2/.config/nvim/lua/evim/packer.lua
new file mode 100644
index 0000000..02ca1c5
--- /dev/null
+++ b/nvim2/.config/nvim/lua/evim/packer.lua
@@ -0,0 +1,52 @@
+vim.cmd [[packadd packer.nvim]]
+
+return require("packer").startup(function(use)
+        -- Core
+        use "wbthomason/packer.nvim"
+        use("nvim-treesitter/nvim-treesitter", { run = ":TSUpdate" })
+        use {
+                "nvim-telescope/telescope.nvim", tag = "0.1.1",
+                requires = { { "nvim-lua/plenary.nvim" } }
+        }
+        use {
+                "numToStr/Comment.nvim",
+                config = function()
+                        require("Comment").setup()
+                end
+        }
+
+        -- Themes
+        use "savq/melange-nvim"
+        use "chriskempson/base16-vim"
+
+        -- LSP
+        use {
+                "VonHeikemen/lsp-zero.nvim",
+                branch = "v2.x",
+                requires = {
+                        -- LSP Support
+                        { "neovim/nvim-lspconfig" }, -- Required
+                        {
+                                -- Optional
+                                "williamboman/mason.nvim",
+                                run = function()
+                                        pcall(vim.cmd, "MasonUpdate")
+                                end,
+                        },
+                        { "williamboman/mason-lspconfig.nvim" }, -- Optional
+
+                        -- Autocompletion
+                        { "hrsh7th/nvim-cmp" },     -- Required
+                        { "hrsh7th/cmp-nvim-lsp" }, -- Required
+                        { "L3MON4D3/LuaSnip" },     -- Required
+                }
+        }
+
+        -- Misc
+        -- use "vimsence/vimsence"
+        use "andweeb/presence.nvim"
+        use {
+                'nvim-lualine/lualine.nvim',
+                requires = { 'nvim-tree/nvim-web-devicons', opt = true }
+        }
+end)
diff --git a/nvim2/.config/nvim/lua/evim/remap.lua b/nvim2/.config/nvim/lua/evim/remap.lua
new file mode 100644
index 0000000..9576344
--- /dev/null
+++ b/nvim2/.config/nvim/lua/evim/remap.lua
@@ -0,0 +1,21 @@
+vim.g.mapleader = " "
+
+-- Generic binds
+vim.keymap.set("n", "<leader>f", vim.cmd.Ex)
+
+-- Telescope
+local builtin = require("telescope.builtin")
+vim.keymap.set("n", "<A-f>", builtin.find_files, {})
+-- vim.keymap.set("n", "<A-g>", builtin.live_grep, {})
+vim.keymap.set("n", "<A-b>", builtin.buffers, {})
+vim.keymap.set("n", "<A-h>", builtin.help_tags, {})
+
+-- Editor binds
+vim.keymap.set("v", "J", ":m '>+1<CR>gv=gv")
+vim.keymap.set("v", "K", ":m '<-2<CR>gv=gv")
+
+-- Copy/paste stuff
+vim.keymap.set("n", "<leader>y", "\"+y")
+vim.keymap.set("v", "<leader>y", "\"+y")
+vim.keymap.set("n", "<leader>Y", "\"+Y")
+
diff --git a/nvim2/.config/nvim/plugin/packer_compiled.lua b/nvim2/.config/nvim/plugin/packer_compiled.lua
new file mode 100644
index 0000000..8a928be
--- /dev/null
+++ b/nvim2/.config/nvim/plugin/packer_compiled.lua
@@ -0,0 +1,185 @@
+-- Automatically generated packer.nvim plugin loader code
+
+if vim.api.nvim_call_function('has', {'nvim-0.5'}) ~= 1 then
+  vim.api.nvim_command('echohl WarningMsg | echom "Invalid Neovim version for packer.nvim! | echohl None"')
+  return
+end
+
+vim.api.nvim_command('packadd packer.nvim')
+
+local no_errors, error_msg = pcall(function()
+
+_G._packer = _G._packer or {}
+_G._packer.inside_compile = true
+
+local time
+local profile_info
+local should_profile = false
+if should_profile then
+  local hrtime = vim.loop.hrtime
+  profile_info = {}
+  time = function(chunk, start)
+    if start then
+      profile_info[chunk] = hrtime()
+    else
+      profile_info[chunk] = (hrtime() - profile_info[chunk]) / 1e6
+    end
+  end
+else
+  time = function(chunk, start) end
+end
+
+local function save_profiles(threshold)
+  local sorted_times = {}
+  for chunk_name, time_taken in pairs(profile_info) do
+    sorted_times[#sorted_times + 1] = {chunk_name, time_taken}
+  end
+  table.sort(sorted_times, function(a, b) return a[2] > b[2] end)
+  local results = {}
+  for i, elem in ipairs(sorted_times) do
+    if not threshold or threshold and elem[2] > threshold then
+      results[i] = elem[1] .. ' took ' .. elem[2] .. 'ms'
+    end
+  end
+  if threshold then
+    table.insert(results, '(Only showing plugins that took longer than ' .. threshold .. ' ms ' .. 'to load)')
+  end
+
+  _G._packer.profile_output = results
+end
+
+time([[Luarocks path setup]], true)
+local package_path_str = "/home/elal/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?.lua;/home/elal/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?/init.lua;/home/elal/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?.lua;/home/elal/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?/init.lua"
+local install_cpath_pattern = "/home/elal/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/lua/5.1/?.so"
+if not string.find(package.path, package_path_str, 1, true) then
+  package.path = package.path .. ';' .. package_path_str
+end
+
+if not string.find(package.cpath, install_cpath_pattern, 1, true) then
+  package.cpath = package.cpath .. ';' .. install_cpath_pattern
+end
+
+time([[Luarocks path setup]], false)
+time([[try_loadstring definition]], true)
+local function try_loadstring(s, component, name)
+  local success, result = pcall(loadstring(s), name, _G.packer_plugins[name])
+  if not success then
+    vim.schedule(function()
+      vim.api.nvim_notify('packer.nvim: Error running ' .. component .. ' for ' .. name .. ': ' .. result, vim.log.levels.ERROR, {})
+    end)
+  end
+  return result
+end
+
+time([[try_loadstring definition]], false)
+time([[Defining packer_plugins]], true)
+_G.packer_plugins = {
+  ["Comment.nvim"] = {
+    config = { "\27LJ\2\n5\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\fComment\frequire\0" },
+    loaded = true,
+    path = "/home/elal/.local/share/nvim/site/pack/packer/start/Comment.nvim",
+    url = "https://github.com/numToStr/Comment.nvim"
+  },
+  LuaSnip = {
+    loaded = true,
+    path = "/home/elal/.local/share/nvim/site/pack/packer/start/LuaSnip",
+    url = "https://github.com/L3MON4D3/LuaSnip"
+  },
+  ["base16-vim"] = {
+    loaded = true,
+    path = "/home/elal/.local/share/nvim/site/pack/packer/start/base16-vim",
+    url = "https://github.com/chriskempson/base16-vim"
+  },
+  ["cmp-nvim-lsp"] = {
+    loaded = true,
+    path = "/home/elal/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp",
+    url = "https://github.com/hrsh7th/cmp-nvim-lsp"
+  },
+  ["lsp-zero.nvim"] = {
+    loaded = true,
+    path = "/home/elal/.local/share/nvim/site/pack/packer/start/lsp-zero.nvim",
+    url = "https://github.com/VonHeikemen/lsp-zero.nvim"
+  },
+  ["lualine.nvim"] = {
+    loaded = true,
+    path = "/home/elal/.local/share/nvim/site/pack/packer/start/lualine.nvim",
+    url = "https://github.com/nvim-lualine/lualine.nvim"
+  },
+  ["mason-lspconfig.nvim"] = {
+    loaded = true,
+    path = "/home/elal/.local/share/nvim/site/pack/packer/start/mason-lspconfig.nvim",
+    url = "https://github.com/williamboman/mason-lspconfig.nvim"
+  },
+  ["mason.nvim"] = {
+    loaded = true,
+    path = "/home/elal/.local/share/nvim/site/pack/packer/start/mason.nvim",
+    url = "https://github.com/williamboman/mason.nvim"
+  },
+  ["melange-nvim"] = {
+    loaded = true,
+    path = "/home/elal/.local/share/nvim/site/pack/packer/start/melange-nvim",
+    url = "https://github.com/savq/melange-nvim"
+  },
+  ["nvim-cmp"] = {
+    loaded = true,
+    path = "/home/elal/.local/share/nvim/site/pack/packer/start/nvim-cmp",
+    url = "https://github.com/hrsh7th/nvim-cmp"
+  },
+  ["nvim-lspconfig"] = {
+    loaded = true,
+    path = "/home/elal/.local/share/nvim/site/pack/packer/start/nvim-lspconfig",
+    url = "https://github.com/neovim/nvim-lspconfig"
+  },
+  ["nvim-treesitter"] = {
+    loaded = true,
+    path = "/home/elal/.local/share/nvim/site/pack/packer/start/nvim-treesitter",
+    url = "https://github.com/nvim-treesitter/nvim-treesitter"
+  },
+  ["nvim-web-devicons"] = {
+    loaded = false,
+    needs_bufread = false,
+    path = "/home/elal/.local/share/nvim/site/pack/packer/opt/nvim-web-devicons",
+    url = "https://github.com/nvim-tree/nvim-web-devicons"
+  },
+  ["packer.nvim"] = {
+    loaded = true,
+    path = "/home/elal/.local/share/nvim/site/pack/packer/start/packer.nvim",
+    url = "https://github.com/wbthomason/packer.nvim"
+  },
+  ["plenary.nvim"] = {
+    loaded = true,
+    path = "/home/elal/.local/share/nvim/site/pack/packer/start/plenary.nvim",
+    url = "https://github.com/nvim-lua/plenary.nvim"
+  },
+  ["presence.nvim"] = {
+    loaded = true,
+    path = "/home/elal/.local/share/nvim/site/pack/packer/start/presence.nvim",
+    url = "https://github.com/andweeb/presence.nvim"
+  },
+  ["telescope.nvim"] = {
+    loaded = true,
+    path = "/home/elal/.local/share/nvim/site/pack/packer/start/telescope.nvim",
+    url = "https://github.com/nvim-telescope/telescope.nvim"
+  }
+}
+
+time([[Defining packer_plugins]], false)
+-- Config for: Comment.nvim
+time([[Config for Comment.nvim]], true)
+try_loadstring("\27LJ\2\n5\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\fComment\frequire\0", "config", "Comment.nvim")
+time([[Config for Comment.nvim]], false)
+
+_G._packer.inside_compile = false
+if _G._packer.needs_bufread == true then
+  vim.cmd("doautocmd BufRead")
+end
+_G._packer.needs_bufread = false
+
+if should_profile then save_profiles() end
+
+end)
+
+if not no_errors then
+  error_msg = error_msg:gsub('"', '\\"')
+  vim.api.nvim_command('echohl ErrorMsg | echom "Error in packer_compiled: '..error_msg..'" | echom "Please check your config for correctness" | echohl None')
+end

From 9a6e6a650f4ba631751711b96b0011e79df420cb Mon Sep 17 00:00:00 2001
From: "E. Almqvist" <elalmqvist@gmail.com>
Date: Thu, 6 Apr 2023 15:41:28 +0200
Subject: [PATCH 6/7] New neovim config

---
 .../.config/nvim/after/plugin/comment.lua     |    0
 .../.config/nvim/after/plugin/lsp.lua         |    0
 .../.config/nvim/after/plugin/lualine.lua     |    0
 .../.config/nvim/after/plugin/presence.lua    |    0
 .../.config/nvim/after/plugin/treesitter.lua  |    0
 nvim/.config/nvim/autoload/plug.vim           | 2788 -----------------
 nvim/.config/nvim/coc-settings.json           |    4 -
 nvim/.config/nvim/colors/111015.vim           |  151 -
 nvim/.config/nvim/colors/Greymatters.vim      |  151 -
 {nvim2 => nvim}/.config/nvim/init.lua         |    0
 nvim/.config/nvim/init.vim                    |  157 -
 nvim/.config/nvim/lua/custom/chadrc.lua       |    6 -
 .../.config/nvim/lua/evim/init.lua            |    0
 .../.config/nvim/lua/evim/packer.lua          |    0
 .../.config/nvim/lua/evim/remap.lua           |    0
 .../.config/nvim/plugin/packer_compiled.lua   |    0
 16 files changed, 3257 deletions(-)
 rename {nvim2 => nvim}/.config/nvim/after/plugin/comment.lua (100%)
 rename {nvim2 => nvim}/.config/nvim/after/plugin/lsp.lua (100%)
 rename {nvim2 => nvim}/.config/nvim/after/plugin/lualine.lua (100%)
 rename {nvim2 => nvim}/.config/nvim/after/plugin/presence.lua (100%)
 rename {nvim2 => nvim}/.config/nvim/after/plugin/treesitter.lua (100%)
 delete mode 100644 nvim/.config/nvim/autoload/plug.vim
 delete mode 100644 nvim/.config/nvim/coc-settings.json
 delete mode 100644 nvim/.config/nvim/colors/111015.vim
 delete mode 100644 nvim/.config/nvim/colors/Greymatters.vim
 rename {nvim2 => nvim}/.config/nvim/init.lua (100%)
 delete mode 100644 nvim/.config/nvim/init.vim
 delete mode 100644 nvim/.config/nvim/lua/custom/chadrc.lua
 rename {nvim2 => nvim}/.config/nvim/lua/evim/init.lua (100%)
 rename {nvim2 => nvim}/.config/nvim/lua/evim/packer.lua (100%)
 rename {nvim2 => nvim}/.config/nvim/lua/evim/remap.lua (100%)
 rename {nvim2 => nvim}/.config/nvim/plugin/packer_compiled.lua (100%)

diff --git a/nvim2/.config/nvim/after/plugin/comment.lua b/nvim/.config/nvim/after/plugin/comment.lua
similarity index 100%
rename from nvim2/.config/nvim/after/plugin/comment.lua
rename to nvim/.config/nvim/after/plugin/comment.lua
diff --git a/nvim2/.config/nvim/after/plugin/lsp.lua b/nvim/.config/nvim/after/plugin/lsp.lua
similarity index 100%
rename from nvim2/.config/nvim/after/plugin/lsp.lua
rename to nvim/.config/nvim/after/plugin/lsp.lua
diff --git a/nvim2/.config/nvim/after/plugin/lualine.lua b/nvim/.config/nvim/after/plugin/lualine.lua
similarity index 100%
rename from nvim2/.config/nvim/after/plugin/lualine.lua
rename to nvim/.config/nvim/after/plugin/lualine.lua
diff --git a/nvim2/.config/nvim/after/plugin/presence.lua b/nvim/.config/nvim/after/plugin/presence.lua
similarity index 100%
rename from nvim2/.config/nvim/after/plugin/presence.lua
rename to nvim/.config/nvim/after/plugin/presence.lua
diff --git a/nvim2/.config/nvim/after/plugin/treesitter.lua b/nvim/.config/nvim/after/plugin/treesitter.lua
similarity index 100%
rename from nvim2/.config/nvim/after/plugin/treesitter.lua
rename to nvim/.config/nvim/after/plugin/treesitter.lua
diff --git a/nvim/.config/nvim/autoload/plug.vim b/nvim/.config/nvim/autoload/plug.vim
deleted file mode 100644
index 9c296ac..0000000
--- a/nvim/.config/nvim/autoload/plug.vim
+++ /dev/null
@@ -1,2788 +0,0 @@
-" vim-plug: Vim plugin manager
-" ============================
-"
-" Download plug.vim and put it in ~/.vim/autoload
-"
-"   curl -fLo ~/.vim/autoload/plug.vim --create-dirs \
-"     https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
-"
-" Edit your .vimrc
-"
-"   call plug#begin('~/.vim/plugged')
-"
-"   " Make sure you use single quotes
-"
-"   " Shorthand notation; fetches https://github.com/junegunn/vim-easy-align
-"   Plug 'junegunn/vim-easy-align'
-"
-"   " Any valid git URL is allowed
-"   Plug 'https://github.com/junegunn/vim-github-dashboard.git'
-"
-"   " Multiple Plug commands can be written in a single line using | separators
-"   Plug 'SirVer/ultisnips' | Plug 'honza/vim-snippets'
-"
-"   " On-demand loading
-"   Plug 'scrooloose/nerdtree', { 'on':  'NERDTreeToggle' }
-"   Plug 'tpope/vim-fireplace', { 'for': 'clojure' }
-"
-"   " Using a non-default branch
-"   Plug 'rdnetto/YCM-Generator', { 'branch': 'stable' }
-"
-"   " Using a tagged release; wildcard allowed (requires git 1.9.2 or above)
-"   Plug 'fatih/vim-go', { 'tag': '*' }
-"
-"   " Plugin options
-"   Plug 'nsf/gocode', { 'tag': 'v.20150303', 'rtp': 'vim' }
-"
-"   " Plugin outside ~/.vim/plugged with post-update hook
-"   Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' }
-"
-"   " Unmanaged plugin (manually installed and updated)
-"   Plug '~/my-prototype-plugin'
-"
-"   " Initialize plugin system
-"   call plug#end()
-"
-" Then reload .vimrc and :PlugInstall to install plugins.
-"
-" Plug options:
-"
-"| Option                  | Description                                      |
-"| ----------------------- | ------------------------------------------------ |
-"| `branch`/`tag`/`commit` | Branch/tag/commit of the repository to use       |
-"| `rtp`                   | Subdirectory that contains Vim plugin            |
-"| `dir`                   | Custom directory for the plugin                  |
-"| `as`                    | Use different name for the plugin                |
-"| `do`                    | Post-update hook (string or funcref)             |
-"| `on`                    | On-demand loading: Commands or `<Plug>`-mappings |
-"| `for`                   | On-demand loading: File types                    |
-"| `frozen`                | Do not update unless explicitly specified        |
-"
-" More information: https://github.com/junegunn/vim-plug
-"
-"
-" Copyright (c) 2017 Junegunn Choi
-"
-" MIT License
-"
-" Permission is hereby granted, free of charge, to any person obtaining
-" a copy of this software and associated documentation files (the
-" "Software"), to deal in the Software without restriction, including
-" without limitation the rights to use, copy, modify, merge, publish,
-" distribute, sublicense, and/or sell copies of the Software, and to
-" permit persons to whom the Software is furnished to do so, subject to
-" the following conditions:
-"
-" The above copyright notice and this permission notice shall be
-" included in all copies or substantial portions of the Software.
-"
-" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-" EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-" NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-" LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-" OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-" WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-if exists('g:loaded_plug')
-  finish
-endif
-let g:loaded_plug = 1
-
-let s:cpo_save = &cpo
-set cpo&vim
-
-let s:plug_src = 'https://github.com/junegunn/vim-plug.git'
-let s:plug_tab = get(s:, 'plug_tab', -1)
-let s:plug_buf = get(s:, 'plug_buf', -1)
-let s:mac_gui = has('gui_macvim') && has('gui_running')
-let s:is_win = has('win32')
-let s:nvim = has('nvim-0.2') || (has('nvim') && exists('*jobwait') && !s:is_win)
-let s:vim8 = has('patch-8.0.0039') && exists('*job_start')
-if s:is_win && &shellslash
-  set noshellslash
-  let s:me = resolve(expand('<sfile>:p'))
-  set shellslash
-else
-  let s:me = resolve(expand('<sfile>:p'))
-endif
-let s:base_spec = { 'branch': '', 'frozen': 0 }
-let s:TYPE = {
-\   'string':  type(''),
-\   'list':    type([]),
-\   'dict':    type({}),
-\   'funcref': type(function('call'))
-\ }
-let s:loaded = get(s:, 'loaded', {})
-let s:triggers = get(s:, 'triggers', {})
-
-function! s:isabsolute(dir) abort
-  return a:dir =~# '^/' || (has('win32') && a:dir =~? '^\%(\\\|[A-Z]:\)')
-endfunction
-
-function! s:git_dir(dir) abort
-  let gitdir = s:trim(a:dir) . '/.git'
-  if isdirectory(gitdir)
-    return gitdir
-  endif
-  if !filereadable(gitdir)
-    return ''
-  endif
-  let gitdir = matchstr(get(readfile(gitdir), 0, ''), '^gitdir: \zs.*')
-  if len(gitdir) && !s:isabsolute(gitdir)
-    let gitdir = a:dir . '/' . gitdir
-  endif
-  return isdirectory(gitdir) ? gitdir : ''
-endfunction
-
-function! s:git_origin_url(dir) abort
-  let gitdir = s:git_dir(a:dir)
-  let config = gitdir . '/config'
-  if empty(gitdir) || !filereadable(config)
-    return ''
-  endif
-  return matchstr(join(readfile(config)), '\[remote "origin"\].\{-}url\s*=\s*\zs\S*\ze')
-endfunction
-
-function! s:git_revision(dir) abort
-  let gitdir = s:git_dir(a:dir)
-  let head = gitdir . '/HEAD'
-  if empty(gitdir) || !filereadable(head)
-    return ''
-  endif
-
-  let line = get(readfile(head), 0, '')
-  let ref = matchstr(line, '^ref: \zs.*')
-  if empty(ref)
-    return line
-  endif
-
-  if filereadable(gitdir . '/' . ref)
-    return get(readfile(gitdir . '/' . ref), 0, '')
-  endif
-
-  if filereadable(gitdir . '/packed-refs')
-    for line in readfile(gitdir . '/packed-refs')
-      if line =~# ' ' . ref
-        return matchstr(line, '^[0-9a-f]*')
-      endif
-    endfor
-  endif
-
-  return ''
-endfunction
-
-function! s:git_local_branch(dir) abort
-  let gitdir = s:git_dir(a:dir)
-  let head = gitdir . '/HEAD'
-  if empty(gitdir) || !filereadable(head)
-    return ''
-  endif
-  let branch = matchstr(get(readfile(head), 0, ''), '^ref: refs/heads/\zs.*')
-  return len(branch) ? branch : 'HEAD'
-endfunction
-
-function! s:git_origin_branch(spec)
-  if len(a:spec.branch)
-    return a:spec.branch
-  endif
-
-  " The file may not be present if this is a local repository
-  let gitdir = s:git_dir(a:spec.dir)
-  let origin_head = gitdir.'/refs/remotes/origin/HEAD'
-  if len(gitdir) && filereadable(origin_head)
-    return matchstr(get(readfile(origin_head), 0, ''),
-                  \ '^ref: refs/remotes/origin/\zs.*')
-  endif
-
-  " The command may not return the name of a branch in detached HEAD state
-  let result = s:lines(s:system('git symbolic-ref --short HEAD', a:spec.dir))
-  return v:shell_error ? '' : result[-1]
-endfunction
-
-if s:is_win
-  function! s:plug_call(fn, ...)
-    let shellslash = &shellslash
-    try
-      set noshellslash
-      return call(a:fn, a:000)
-    finally
-      let &shellslash = shellslash
-    endtry
-  endfunction
-else
-  function! s:plug_call(fn, ...)
-    return call(a:fn, a:000)
-  endfunction
-endif
-
-function! s:plug_getcwd()
-  return s:plug_call('getcwd')
-endfunction
-
-function! s:plug_fnamemodify(fname, mods)
-  return s:plug_call('fnamemodify', a:fname, a:mods)
-endfunction
-
-function! s:plug_expand(fmt)
-  return s:plug_call('expand', a:fmt, 1)
-endfunction
-
-function! s:plug_tempname()
-  return s:plug_call('tempname')
-endfunction
-
-function! plug#begin(...)
-  if a:0 > 0
-    let s:plug_home_org = a:1
-    let home = s:path(s:plug_fnamemodify(s:plug_expand(a:1), ':p'))
-  elseif exists('g:plug_home')
-    let home = s:path(g:plug_home)
-  elseif !empty(&rtp)
-    let home = s:path(split(&rtp, ',')[0]) . '/plugged'
-  else
-    return s:err('Unable to determine plug home. Try calling plug#begin() with a path argument.')
-  endif
-  if s:plug_fnamemodify(home, ':t') ==# 'plugin' && s:plug_fnamemodify(home, ':h') ==# s:first_rtp
-    return s:err('Invalid plug home. '.home.' is a standard Vim runtime path and is not allowed.')
-  endif
-
-  let g:plug_home = home
-  let g:plugs = {}
-  let g:plugs_order = []
-  let s:triggers = {}
-
-  call s:define_commands()
-  return 1
-endfunction
-
-function! s:define_commands()
-  command! -nargs=+ -bar Plug call plug#(<args>)
-  if !executable('git')
-    return s:err('`git` executable not found. Most commands will not be available. To suppress this message, prepend `silent!` to `call plug#begin(...)`.')
-  endif
-  if has('win32')
-  \ && &shellslash
-  \ && (&shell =~# 'cmd\(\.exe\)\?$' || &shell =~# 'powershell\(\.exe\)\?$')
-    return s:err('vim-plug does not support shell, ' . &shell . ', when shellslash is set.')
-  endif
-  if !has('nvim')
-    \ && (has('win32') || has('win32unix'))
-    \ && !has('multi_byte')
-    return s:err('Vim needs +multi_byte feature on Windows to run shell commands. Enable +iconv for best results.')
-  endif
-  command! -nargs=* -bar -bang -complete=customlist,s:names PlugInstall call s:install(<bang>0, [<f-args>])
-  command! -nargs=* -bar -bang -complete=customlist,s:names PlugUpdate  call s:update(<bang>0, [<f-args>])
-  command! -nargs=0 -bar -bang PlugClean call s:clean(<bang>0)
-  command! -nargs=0 -bar PlugUpgrade if s:upgrade() | execute 'source' s:esc(s:me) | endif
-  command! -nargs=0 -bar PlugStatus  call s:status()
-  command! -nargs=0 -bar PlugDiff    call s:diff()
-  command! -nargs=? -bar -bang -complete=file PlugSnapshot call s:snapshot(<bang>0, <f-args>)
-endfunction
-
-function! s:to_a(v)
-  return type(a:v) == s:TYPE.list ? a:v : [a:v]
-endfunction
-
-function! s:to_s(v)
-  return type(a:v) == s:TYPE.string ? a:v : join(a:v, "\n") . "\n"
-endfunction
-
-function! s:glob(from, pattern)
-  return s:lines(globpath(a:from, a:pattern))
-endfunction
-
-function! s:source(from, ...)
-  let found = 0
-  for pattern in a:000
-    for vim in s:glob(a:from, pattern)
-      execute 'source' s:esc(vim)
-      let found = 1
-    endfor
-  endfor
-  return found
-endfunction
-
-function! s:assoc(dict, key, val)
-  let a:dict[a:key] = add(get(a:dict, a:key, []), a:val)
-endfunction
-
-function! s:ask(message, ...)
-  call inputsave()
-  echohl WarningMsg
-  let answer = input(a:message.(a:0 ? ' (y/N/a) ' : ' (y/N) '))
-  echohl None
-  call inputrestore()
-  echo "\r"
-  return (a:0 && answer =~? '^a') ? 2 : (answer =~? '^y') ? 1 : 0
-endfunction
-
-function! s:ask_no_interrupt(...)
-  try
-    return call('s:ask', a:000)
-  catch
-    return 0
-  endtry
-endfunction
-
-function! s:lazy(plug, opt)
-  return has_key(a:plug, a:opt) &&
-        \ (empty(s:to_a(a:plug[a:opt]))         ||
-        \  !isdirectory(a:plug.dir)             ||
-        \  len(s:glob(s:rtp(a:plug), 'plugin')) ||
-        \  len(s:glob(s:rtp(a:plug), 'after/plugin')))
-endfunction
-
-function! plug#end()
-  if !exists('g:plugs')
-    return s:err('plug#end() called without calling plug#begin() first')
-  endif
-
-  if exists('#PlugLOD')
-    augroup PlugLOD
-      autocmd!
-    augroup END
-    augroup! PlugLOD
-  endif
-  let lod = { 'ft': {}, 'map': {}, 'cmd': {} }
-
-  if exists('g:did_load_filetypes')
-    filetype off
-  endif
-  for name in g:plugs_order
-    if !has_key(g:plugs, name)
-      continue
-    endif
-    let plug = g:plugs[name]
-    if get(s:loaded, name, 0) || !s:lazy(plug, 'on') && !s:lazy(plug, 'for')
-      let s:loaded[name] = 1
-      continue
-    endif
-
-    if has_key(plug, 'on')
-      let s:triggers[name] = { 'map': [], 'cmd': [] }
-      for cmd in s:to_a(plug.on)
-        if cmd =~? '^<Plug>.\+'
-          if empty(mapcheck(cmd)) && empty(mapcheck(cmd, 'i'))
-            call s:assoc(lod.map, cmd, name)
-          endif
-          call add(s:triggers[name].map, cmd)
-        elseif cmd =~# '^[A-Z]'
-          let cmd = substitute(cmd, '!*$', '', '')
-          if exists(':'.cmd) != 2
-            call s:assoc(lod.cmd, cmd, name)
-          endif
-          call add(s:triggers[name].cmd, cmd)
-        else
-          call s:err('Invalid `on` option: '.cmd.
-          \ '. Should start with an uppercase letter or `<Plug>`.')
-        endif
-      endfor
-    endif
-
-    if has_key(plug, 'for')
-      let types = s:to_a(plug.for)
-      if !empty(types)
-        augroup filetypedetect
-        call s:source(s:rtp(plug), 'ftdetect/**/*.vim', 'after/ftdetect/**/*.vim')
-        augroup END
-      endif
-      for type in types
-        call s:assoc(lod.ft, type, name)
-      endfor
-    endif
-  endfor
-
-  for [cmd, names] in items(lod.cmd)
-    execute printf(
-    \ 'command! -nargs=* -range -bang -complete=file %s call s:lod_cmd(%s, "<bang>", <line1>, <line2>, <q-args>, %s)',
-    \ cmd, string(cmd), string(names))
-  endfor
-
-  for [map, names] in items(lod.map)
-    for [mode, map_prefix, key_prefix] in
-          \ [['i', '<C-O>', ''], ['n', '', ''], ['v', '', 'gv'], ['o', '', '']]
-      execute printf(
-      \ '%snoremap <silent> %s %s:<C-U>call <SID>lod_map(%s, %s, %s, "%s")<CR>',
-      \ mode, map, map_prefix, string(map), string(names), mode != 'i', key_prefix)
-    endfor
-  endfor
-
-  for [ft, names] in items(lod.ft)
-    augroup PlugLOD
-      execute printf('autocmd FileType %s call <SID>lod_ft(%s, %s)',
-            \ ft, string(ft), string(names))
-    augroup END
-  endfor
-
-  call s:reorg_rtp()
-  filetype plugin indent on
-  if has('vim_starting')
-    if has('syntax') && !exists('g:syntax_on')
-      syntax enable
-    end
-  else
-    call s:reload_plugins()
-  endif
-endfunction
-
-function! s:loaded_names()
-  return filter(copy(g:plugs_order), 'get(s:loaded, v:val, 0)')
-endfunction
-
-function! s:load_plugin(spec)
-  call s:source(s:rtp(a:spec), 'plugin/**/*.vim', 'after/plugin/**/*.vim')
-endfunction
-
-function! s:reload_plugins()
-  for name in s:loaded_names()
-    call s:load_plugin(g:plugs[name])
-  endfor
-endfunction
-
-function! s:trim(str)
-  return substitute(a:str, '[\/]\+$', '', '')
-endfunction
-
-function! s:version_requirement(val, min)
-  for idx in range(0, len(a:min) - 1)
-    let v = get(a:val, idx, 0)
-    if     v < a:min[idx] | return 0
-    elseif v > a:min[idx] | return 1
-    endif
-  endfor
-  return 1
-endfunction
-
-function! s:git_version_requirement(...)
-  if !exists('s:git_version')
-    let s:git_version = map(split(split(s:system(['git', '--version']))[2], '\.'), 'str2nr(v:val)')
-  endif
-  return s:version_requirement(s:git_version, a:000)
-endfunction
-
-function! s:progress_opt(base)
-  return a:base && !s:is_win &&
-        \ s:git_version_requirement(1, 7, 1) ? '--progress' : ''
-endfunction
-
-function! s:rtp(spec)
-  return s:path(a:spec.dir . get(a:spec, 'rtp', ''))
-endfunction
-
-if s:is_win
-  function! s:path(path)
-    return s:trim(substitute(a:path, '/', '\', 'g'))
-  endfunction
-
-  function! s:dirpath(path)
-    return s:path(a:path) . '\'
-  endfunction
-
-  function! s:is_local_plug(repo)
-    return a:repo =~? '^[a-z]:\|^[%~]'
-  endfunction
-
-  " Copied from fzf
-  function! s:wrap_cmds(cmds)
-    let cmds = [
-      \ '@echo off',
-      \ 'setlocal enabledelayedexpansion']
-    \ + (type(a:cmds) == type([]) ? a:cmds : [a:cmds])
-    \ + ['endlocal']
-    if has('iconv')
-      if !exists('s:codepage')
-        let s:codepage = libcallnr('kernel32.dll', 'GetACP', 0)
-      endif
-      return map(cmds, printf('iconv(v:val."\r", "%s", "cp%d")', &encoding, s:codepage))
-    endif
-    return map(cmds, 'v:val."\r"')
-  endfunction
-
-  function! s:batchfile(cmd)
-    let batchfile = s:plug_tempname().'.bat'
-    call writefile(s:wrap_cmds(a:cmd), batchfile)
-    let cmd = plug#shellescape(batchfile, {'shell': &shell, 'script': 0})
-    if &shell =~# 'powershell\(\.exe\)\?$'
-      let cmd = '& ' . cmd
-    endif
-    return [batchfile, cmd]
-  endfunction
-else
-  function! s:path(path)
-    return s:trim(a:path)
-  endfunction
-
-  function! s:dirpath(path)
-    return substitute(a:path, '[/\\]*$', '/', '')
-  endfunction
-
-  function! s:is_local_plug(repo)
-    return a:repo[0] =~ '[/$~]'
-  endfunction
-endif
-
-function! s:err(msg)
-  echohl ErrorMsg
-  echom '[vim-plug] '.a:msg
-  echohl None
-endfunction
-
-function! s:warn(cmd, msg)
-  echohl WarningMsg
-  execute a:cmd 'a:msg'
-  echohl None
-endfunction
-
-function! s:esc(path)
-  return escape(a:path, ' ')
-endfunction
-
-function! s:escrtp(path)
-  return escape(a:path, ' ,')
-endfunction
-
-function! s:remove_rtp()
-  for name in s:loaded_names()
-    let rtp = s:rtp(g:plugs[name])
-    execute 'set rtp-='.s:escrtp(rtp)
-    let after = globpath(rtp, 'after')
-    if isdirectory(after)
-      execute 'set rtp-='.s:escrtp(after)
-    endif
-  endfor
-endfunction
-
-function! s:reorg_rtp()
-  if !empty(s:first_rtp)
-    execute 'set rtp-='.s:first_rtp
-    execute 'set rtp-='.s:last_rtp
-  endif
-
-  " &rtp is modified from outside
-  if exists('s:prtp') && s:prtp !=# &rtp
-    call s:remove_rtp()
-    unlet! s:middle
-  endif
-
-  let s:middle = get(s:, 'middle', &rtp)
-  let rtps     = map(s:loaded_names(), 's:rtp(g:plugs[v:val])')
-  let afters   = filter(map(copy(rtps), 'globpath(v:val, "after")'), '!empty(v:val)')
-  let rtp      = join(map(rtps, 'escape(v:val, ",")'), ',')
-                 \ . ','.s:middle.','
-                 \ . join(map(afters, 'escape(v:val, ",")'), ',')
-  let &rtp     = substitute(substitute(rtp, ',,*', ',', 'g'), '^,\|,$', '', 'g')
-  let s:prtp   = &rtp
-
-  if !empty(s:first_rtp)
-    execute 'set rtp^='.s:first_rtp
-    execute 'set rtp+='.s:last_rtp
-  endif
-endfunction
-
-function! s:doautocmd(...)
-  if exists('#'.join(a:000, '#'))
-    execute 'doautocmd' ((v:version > 703 || has('patch442')) ? '<nomodeline>' : '') join(a:000)
-  endif
-endfunction
-
-function! s:dobufread(names)
-  for name in a:names
-    let path = s:rtp(g:plugs[name])
-    for dir in ['ftdetect', 'ftplugin', 'after/ftdetect', 'after/ftplugin']
-      if len(finddir(dir, path))
-        if exists('#BufRead')
-          doautocmd BufRead
-        endif
-        return
-      endif
-    endfor
-  endfor
-endfunction
-
-function! plug#load(...)
-  if a:0 == 0
-    return s:err('Argument missing: plugin name(s) required')
-  endif
-  if !exists('g:plugs')
-    return s:err('plug#begin was not called')
-  endif
-  let names = a:0 == 1 && type(a:1) == s:TYPE.list ? a:1 : a:000
-  let unknowns = filter(copy(names), '!has_key(g:plugs, v:val)')
-  if !empty(unknowns)
-    let s = len(unknowns) > 1 ? 's' : ''
-    return s:err(printf('Unknown plugin%s: %s', s, join(unknowns, ', ')))
-  end
-  let unloaded = filter(copy(names), '!get(s:loaded, v:val, 0)')
-  if !empty(unloaded)
-    for name in unloaded
-      call s:lod([name], ['ftdetect', 'after/ftdetect', 'plugin', 'after/plugin'])
-    endfor
-    call s:dobufread(unloaded)
-    return 1
-  end
-  return 0
-endfunction
-
-function! s:remove_triggers(name)
-  if !has_key(s:triggers, a:name)
-    return
-  endif
-  for cmd in s:triggers[a:name].cmd
-    execute 'silent! delc' cmd
-  endfor
-  for map in s:triggers[a:name].map
-    execute 'silent! unmap' map
-    execute 'silent! iunmap' map
-  endfor
-  call remove(s:triggers, a:name)
-endfunction
-
-function! s:lod(names, types, ...)
-  for name in a:names
-    call s:remove_triggers(name)
-    let s:loaded[name] = 1
-  endfor
-  call s:reorg_rtp()
-
-  for name in a:names
-    let rtp = s:rtp(g:plugs[name])
-    for dir in a:types
-      call s:source(rtp, dir.'/**/*.vim')
-    endfor
-    if a:0
-      if !s:source(rtp, a:1) && !empty(s:glob(rtp, a:2))
-        execute 'runtime' a:1
-      endif
-      call s:source(rtp, a:2)
-    endif
-    call s:doautocmd('User', name)
-  endfor
-endfunction
-
-function! s:lod_ft(pat, names)
-  let syn = 'syntax/'.a:pat.'.vim'
-  call s:lod(a:names, ['plugin', 'after/plugin'], syn, 'after/'.syn)
-  execute 'autocmd! PlugLOD FileType' a:pat
-  call s:doautocmd('filetypeplugin', 'FileType')
-  call s:doautocmd('filetypeindent', 'FileType')
-endfunction
-
-function! s:lod_cmd(cmd, bang, l1, l2, args, names)
-  call s:lod(a:names, ['ftdetect', 'after/ftdetect', 'plugin', 'after/plugin'])
-  call s:dobufread(a:names)
-  execute printf('%s%s%s %s', (a:l1 == a:l2 ? '' : (a:l1.','.a:l2)), a:cmd, a:bang, a:args)
-endfunction
-
-function! s:lod_map(map, names, with_prefix, prefix)
-  call s:lod(a:names, ['ftdetect', 'after/ftdetect', 'plugin', 'after/plugin'])
-  call s:dobufread(a:names)
-  let extra = ''
-  while 1
-    let c = getchar(0)
-    if c == 0
-      break
-    endif
-    let extra .= nr2char(c)
-  endwhile
-
-  if a:with_prefix
-    let prefix = v:count ? v:count : ''
-    let prefix .= '"'.v:register.a:prefix
-    if mode(1) == 'no'
-      if v:operator == 'c'
-        let prefix = "\<esc>" . prefix
-      endif
-      let prefix .= v:operator
-    endif
-    call feedkeys(prefix, 'n')
-  endif
-  call feedkeys(substitute(a:map, '^<Plug>', "\<Plug>", '') . extra)
-endfunction
-
-function! plug#(repo, ...)
-  if a:0 > 1
-    return s:err('Invalid number of arguments (1..2)')
-  endif
-
-  try
-    let repo = s:trim(a:repo)
-    let opts = a:0 == 1 ? s:parse_options(a:1) : s:base_spec
-    let name = get(opts, 'as', s:plug_fnamemodify(repo, ':t:s?\.git$??'))
-    let spec = extend(s:infer_properties(name, repo), opts)
-    if !has_key(g:plugs, name)
-      call add(g:plugs_order, name)
-    endif
-    let g:plugs[name] = spec
-    let s:loaded[name] = get(s:loaded, name, 0)
-  catch
-    return s:err(repo . ' ' . v:exception)
-  endtry
-endfunction
-
-function! s:parse_options(arg)
-  let opts = copy(s:base_spec)
-  let type = type(a:arg)
-  let opt_errfmt = 'Invalid argument for "%s" option of :Plug (expected: %s)'
-  if type == s:TYPE.string
-    if empty(a:arg)
-      throw printf(opt_errfmt, 'tag', 'string')
-    endif
-    let opts.tag = a:arg
-  elseif type == s:TYPE.dict
-    for opt in ['branch', 'tag', 'commit', 'rtp', 'dir', 'as']
-      if has_key(a:arg, opt)
-      \ && (type(a:arg[opt]) != s:TYPE.string || empty(a:arg[opt]))
-        throw printf(opt_errfmt, opt, 'string')
-      endif
-    endfor
-    for opt in ['on', 'for']
-      if has_key(a:arg, opt)
-      \ && type(a:arg[opt]) != s:TYPE.list
-      \ && (type(a:arg[opt]) != s:TYPE.string || empty(a:arg[opt]))
-        throw printf(opt_errfmt, opt, 'string or list')
-      endif
-    endfor
-    if has_key(a:arg, 'do')
-      \ && type(a:arg.do) != s:TYPE.funcref
-      \ && (type(a:arg.do) != s:TYPE.string || empty(a:arg.do))
-        throw printf(opt_errfmt, 'do', 'string or funcref')
-    endif
-    call extend(opts, a:arg)
-    if has_key(opts, 'dir')
-      let opts.dir = s:dirpath(s:plug_expand(opts.dir))
-    endif
-  else
-    throw 'Invalid argument type (expected: string or dictionary)'
-  endif
-  return opts
-endfunction
-
-function! s:infer_properties(name, repo)
-  let repo = a:repo
-  if s:is_local_plug(repo)
-    return { 'dir': s:dirpath(s:plug_expand(repo)) }
-  else
-    if repo =~ ':'
-      let uri = repo
-    else
-      if repo !~ '/'
-        throw printf('Invalid argument: %s (implicit `vim-scripts'' expansion is deprecated)', repo)
-      endif
-      let fmt = get(g:, 'plug_url_format', 'https://git::@github.com/%s.git')
-      let uri = printf(fmt, repo)
-    endif
-    return { 'dir': s:dirpath(g:plug_home.'/'.a:name), 'uri': uri }
-  endif
-endfunction
-
-function! s:install(force, names)
-  call s:update_impl(0, a:force, a:names)
-endfunction
-
-function! s:update(force, names)
-  call s:update_impl(1, a:force, a:names)
-endfunction
-
-function! plug#helptags()
-  if !exists('g:plugs')
-    return s:err('plug#begin was not called')
-  endif
-  for spec in values(g:plugs)
-    let docd = join([s:rtp(spec), 'doc'], '/')
-    if isdirectory(docd)
-      silent! execute 'helptags' s:esc(docd)
-    endif
-  endfor
-  return 1
-endfunction
-
-function! s:syntax()
-  syntax clear
-  syntax region plug1 start=/\%1l/ end=/\%2l/ contains=plugNumber
-  syntax region plug2 start=/\%2l/ end=/\%3l/ contains=plugBracket,plugX
-  syn match plugNumber /[0-9]\+[0-9.]*/ contained
-  syn match plugBracket /[[\]]/ contained
-  syn match plugX /x/ contained
-  syn match plugDash /^-\{1}\ /
-  syn match plugPlus /^+/
-  syn match plugStar /^*/
-  syn match plugMessage /\(^- \)\@<=.*/
-  syn match plugName /\(^- \)\@<=[^ ]*:/
-  syn match plugSha /\%(: \)\@<=[0-9a-f]\{4,}$/
-  syn match plugTag /(tag: [^)]\+)/
-  syn match plugInstall /\(^+ \)\@<=[^:]*/
-  syn match plugUpdate /\(^* \)\@<=[^:]*/
-  syn match plugCommit /^  \X*[0-9a-f]\{7,9} .*/ contains=plugRelDate,plugEdge,plugTag
-  syn match plugEdge /^  \X\+$/
-  syn match plugEdge /^  \X*/ contained nextgroup=plugSha
-  syn match plugSha /[0-9a-f]\{7,9}/ contained
-  syn match plugRelDate /([^)]*)$/ contained
-  syn match plugNotLoaded /(not loaded)$/
-  syn match plugError /^x.*/
-  syn region plugDeleted start=/^\~ .*/ end=/^\ze\S/
-  syn match plugH2 /^.*:\n-\+$/
-  syn match plugH2 /^-\{2,}/
-  syn keyword Function PlugInstall PlugStatus PlugUpdate PlugClean
-  hi def link plug1       Title
-  hi def link plug2       Repeat
-  hi def link plugH2      Type
-  hi def link plugX       Exception
-  hi def link plugBracket Structure
-  hi def link plugNumber  Number
-
-  hi def link plugDash    Special
-  hi def link plugPlus    Constant
-  hi def link plugStar    Boolean
-
-  hi def link plugMessage Function
-  hi def link plugName    Label
-  hi def link plugInstall Function
-  hi def link plugUpdate  Type
-
-  hi def link plugError   Error
-  hi def link plugDeleted Ignore
-  hi def link plugRelDate Comment
-  hi def link plugEdge    PreProc
-  hi def link plugSha     Identifier
-  hi def link plugTag     Constant
-
-  hi def link plugNotLoaded Comment
-endfunction
-
-function! s:lpad(str, len)
-  return a:str . repeat(' ', a:len - len(a:str))
-endfunction
-
-function! s:lines(msg)
-  return split(a:msg, "[\r\n]")
-endfunction
-
-function! s:lastline(msg)
-  return get(s:lines(a:msg), -1, '')
-endfunction
-
-function! s:new_window()
-  execute get(g:, 'plug_window', 'vertical topleft new')
-endfunction
-
-function! s:plug_window_exists()
-  let buflist = tabpagebuflist(s:plug_tab)
-  return !empty(buflist) && index(buflist, s:plug_buf) >= 0
-endfunction
-
-function! s:switch_in()
-  if !s:plug_window_exists()
-    return 0
-  endif
-
-  if winbufnr(0) != s:plug_buf
-    let s:pos = [tabpagenr(), winnr(), winsaveview()]
-    execute 'normal!' s:plug_tab.'gt'
-    let winnr = bufwinnr(s:plug_buf)
-    execute winnr.'wincmd w'
-    call add(s:pos, winsaveview())
-  else
-    let s:pos = [winsaveview()]
-  endif
-
-  setlocal modifiable
-  return 1
-endfunction
-
-function! s:switch_out(...)
-  call winrestview(s:pos[-1])
-  setlocal nomodifiable
-  if a:0 > 0
-    execute a:1
-  endif
-
-  if len(s:pos) > 1
-    execute 'normal!' s:pos[0].'gt'
-    execute s:pos[1] 'wincmd w'
-    call winrestview(s:pos[2])
-  endif
-endfunction
-
-function! s:finish_bindings()
-  nnoremap <silent> <buffer> R  :call <SID>retry()<cr>
-  nnoremap <silent> <buffer> D  :PlugDiff<cr>
-  nnoremap <silent> <buffer> S  :PlugStatus<cr>
-  nnoremap <silent> <buffer> U  :call <SID>status_update()<cr>
-  xnoremap <silent> <buffer> U  :call <SID>status_update()<cr>
-  nnoremap <silent> <buffer> ]] :silent! call <SID>section('')<cr>
-  nnoremap <silent> <buffer> [[ :silent! call <SID>section('b')<cr>
-endfunction
-
-function! s:prepare(...)
-  if empty(s:plug_getcwd())
-    throw 'Invalid current working directory. Cannot proceed.'
-  endif
-
-  for evar in ['$GIT_DIR', '$GIT_WORK_TREE']
-    if exists(evar)
-      throw evar.' detected. Cannot proceed.'
-    endif
-  endfor
-
-  call s:job_abort()
-  if s:switch_in()
-    if b:plug_preview == 1
-      pc
-    endif
-    enew
-  else
-    call s:new_window()
-  endif
-
-  nnoremap <silent> <buffer> q  :if b:plug_preview==1<bar>pc<bar>endif<bar>bd<cr>
-  if a:0 == 0
-    call s:finish_bindings()
-  endif
-  let b:plug_preview = -1
-  let s:plug_tab = tabpagenr()
-  let s:plug_buf = winbufnr(0)
-  call s:assign_name()
-
-  for k in ['<cr>', 'L', 'o', 'X', 'd', 'dd']
-    execute 'silent! unmap <buffer>' k
-  endfor
-  setlocal buftype=nofile bufhidden=wipe nobuflisted nolist noswapfile nowrap cursorline modifiable nospell
-  if exists('+colorcolumn')
-    setlocal colorcolumn=
-  endif
-  setf vim-plug
-  if exists('g:syntax_on')
-    call s:syntax()
-  endif
-endfunction
-
-function! s:assign_name()
-  " Assign buffer name
-  let prefix = '[Plugins]'
-  let name   = prefix
-  let idx    = 2
-  while bufexists(name)
-    let name = printf('%s (%s)', prefix, idx)
-    let idx = idx + 1
-  endwhile
-  silent! execute 'f' fnameescape(name)
-endfunction
-
-function! s:chsh(swap)
-  let prev = [&shell, &shellcmdflag, &shellredir]
-  if !s:is_win
-    set shell=sh
-  endif
-  if a:swap
-    if &shell =~# 'powershell\(\.exe\)\?$' || &shell =~# 'pwsh$'
-      let &shellredir = '2>&1 | Out-File -Encoding UTF8 %s'
-    elseif &shell =~# 'sh' || &shell =~# 'cmd\(\.exe\)\?$'
-      set shellredir=>%s\ 2>&1
-    endif
-  endif
-  return prev
-endfunction
-
-function! s:bang(cmd, ...)
-  let batchfile = ''
-  try
-    let [sh, shellcmdflag, shrd] = s:chsh(a:0)
-    " FIXME: Escaping is incomplete. We could use shellescape with eval,
-    "        but it won't work on Windows.
-    let cmd = a:0 ? s:with_cd(a:cmd, a:1) : a:cmd
-    if s:is_win
-      let [batchfile, cmd] = s:batchfile(cmd)
-    endif
-    let g:_plug_bang = (s:is_win && has('gui_running') ? 'silent ' : '').'!'.escape(cmd, '#!%')
-    execute "normal! :execute g:_plug_bang\<cr>\<cr>"
-  finally
-    unlet g:_plug_bang
-    let [&shell, &shellcmdflag, &shellredir] = [sh, shellcmdflag, shrd]
-    if s:is_win && filereadable(batchfile)
-      call delete(batchfile)
-    endif
-  endtry
-  return v:shell_error ? 'Exit status: ' . v:shell_error : ''
-endfunction
-
-function! s:regress_bar()
-  let bar = substitute(getline(2)[1:-2], '.*\zs=', 'x', '')
-  call s:progress_bar(2, bar, len(bar))
-endfunction
-
-function! s:is_updated(dir)
-  return !empty(s:system_chomp(['git', 'log', '--pretty=format:%h', 'HEAD...HEAD@{1}'], a:dir))
-endfunction
-
-function! s:do(pull, force, todo)
-  for [name, spec] in items(a:todo)
-    if !isdirectory(spec.dir)
-      continue
-    endif
-    let installed = has_key(s:update.new, name)
-    let updated = installed ? 0 :
-      \ (a:pull && index(s:update.errors, name) < 0 && s:is_updated(spec.dir))
-    if a:force || installed || updated
-      execute 'cd' s:esc(spec.dir)
-      call append(3, '- Post-update hook for '. name .' ... ')
-      let error = ''
-      let type = type(spec.do)
-      if type == s:TYPE.string
-        if spec.do[0] == ':'
-          if !get(s:loaded, name, 0)
-            let s:loaded[name] = 1
-            call s:reorg_rtp()
-          endif
-          call s:load_plugin(spec)
-          try
-            execute spec.do[1:]
-          catch
-            let error = v:exception
-          endtry
-          if !s:plug_window_exists()
-            cd -
-            throw 'Warning: vim-plug was terminated by the post-update hook of '.name
-          endif
-        else
-          let error = s:bang(spec.do)
-        endif
-      elseif type == s:TYPE.funcref
-        try
-          call s:load_plugin(spec)
-          let status = installed ? 'installed' : (updated ? 'updated' : 'unchanged')
-          call spec.do({ 'name': name, 'status': status, 'force': a:force })
-        catch
-          let error = v:exception
-        endtry
-      else
-        let error = 'Invalid hook type'
-      endif
-      call s:switch_in()
-      call setline(4, empty(error) ? (getline(4) . 'OK')
-                                 \ : ('x' . getline(4)[1:] . error))
-      if !empty(error)
-        call add(s:update.errors, name)
-        call s:regress_bar()
-      endif
-      cd -
-    endif
-  endfor
-endfunction
-
-function! s:hash_match(a, b)
-  return stridx(a:a, a:b) == 0 || stridx(a:b, a:a) == 0
-endfunction
-
-function! s:checkout(spec)
-  let sha = a:spec.commit
-  let output = s:git_revision(a:spec.dir)
-  if !empty(output) && !s:hash_match(sha, s:lines(output)[0])
-    let credential_helper = s:git_version_requirement(2) ? '-c credential.helper= ' : ''
-    let output = s:system(
-          \ 'git '.credential_helper.'fetch --depth 999999 && git checkout '.plug#shellescape(sha).' --', a:spec.dir)
-  endif
-  return output
-endfunction
-
-function! s:finish(pull)
-  let new_frozen = len(filter(keys(s:update.new), 'g:plugs[v:val].frozen'))
-  if new_frozen
-    let s = new_frozen > 1 ? 's' : ''
-    call append(3, printf('- Installed %d frozen plugin%s', new_frozen, s))
-  endif
-  call append(3, '- Finishing ... ') | 4
-  redraw
-  call plug#helptags()
-  call plug#end()
-  call setline(4, getline(4) . 'Done!')
-  redraw
-  let msgs = []
-  if !empty(s:update.errors)
-    call add(msgs, "Press 'R' to retry.")
-  endif
-  if a:pull && len(s:update.new) < len(filter(getline(5, '$'),
-                \ "v:val =~ '^- ' && v:val !~# 'Already up.to.date'"))
-    call add(msgs, "Press 'D' to see the updated changes.")
-  endif
-  echo join(msgs, ' ')
-  call s:finish_bindings()
-endfunction
-
-function! s:retry()
-  if empty(s:update.errors)
-    return
-  endif
-  echo
-  call s:update_impl(s:update.pull, s:update.force,
-        \ extend(copy(s:update.errors), [s:update.threads]))
-endfunction
-
-function! s:is_managed(name)
-  return has_key(g:plugs[a:name], 'uri')
-endfunction
-
-function! s:names(...)
-  return sort(filter(keys(g:plugs), 'stridx(v:val, a:1) == 0 && s:is_managed(v:val)'))
-endfunction
-
-function! s:check_ruby()
-  silent! ruby require 'thread'; VIM::command("let g:plug_ruby = '#{RUBY_VERSION}'")
-  if !exists('g:plug_ruby')
-    redraw!
-    return s:warn('echom', 'Warning: Ruby interface is broken')
-  endif
-  let ruby_version = split(g:plug_ruby, '\.')
-  unlet g:plug_ruby
-  return s:version_requirement(ruby_version, [1, 8, 7])
-endfunction
-
-function! s:update_impl(pull, force, args) abort
-  let sync = index(a:args, '--sync') >= 0 || has('vim_starting')
-  let args = filter(copy(a:args), 'v:val != "--sync"')
-  let threads = (len(args) > 0 && args[-1] =~ '^[1-9][0-9]*$') ?
-                  \ remove(args, -1) : get(g:, 'plug_threads', 16)
-
-  let managed = filter(copy(g:plugs), 's:is_managed(v:key)')
-  let todo = empty(args) ? filter(managed, '!v:val.frozen || !isdirectory(v:val.dir)') :
-                         \ filter(managed, 'index(args, v:key) >= 0')
-
-  if empty(todo)
-    return s:warn('echo', 'No plugin to '. (a:pull ? 'update' : 'install'))
-  endif
-
-  if !s:is_win && s:git_version_requirement(2, 3)
-    let s:git_terminal_prompt = exists('$GIT_TERMINAL_PROMPT') ? $GIT_TERMINAL_PROMPT : ''
-    let $GIT_TERMINAL_PROMPT = 0
-    for plug in values(todo)
-      let plug.uri = substitute(plug.uri,
-            \ '^https://git::@github\.com', 'https://github.com', '')
-    endfor
-  endif
-
-  if !isdirectory(g:plug_home)
-    try
-      call mkdir(g:plug_home, 'p')
-    catch
-      return s:err(printf('Invalid plug directory: %s. '.
-              \ 'Try to call plug#begin with a valid directory', g:plug_home))
-    endtry
-  endif
-
-  if has('nvim') && !exists('*jobwait') && threads > 1
-    call s:warn('echom', '[vim-plug] Update Neovim for parallel installer')
-  endif
-
-  let use_job = s:nvim || s:vim8
-  let python = (has('python') || has('python3')) && !use_job
-  let ruby = has('ruby') && !use_job && (v:version >= 703 || v:version == 702 && has('patch374')) && !(s:is_win && has('gui_running')) && threads > 1 && s:check_ruby()
-
-  let s:update = {
-    \ 'start':   reltime(),
-    \ 'all':     todo,
-    \ 'todo':    copy(todo),
-    \ 'errors':  [],
-    \ 'pull':    a:pull,
-    \ 'force':   a:force,
-    \ 'new':     {},
-    \ 'threads': (python || ruby || use_job) ? min([len(todo), threads]) : 1,
-    \ 'bar':     '',
-    \ 'fin':     0
-  \ }
-
-  call s:prepare(1)
-  call append(0, ['', ''])
-  normal! 2G
-  silent! redraw
-
-  let s:clone_opt = []
-  if get(g:, 'plug_shallow', 1)
-    call extend(s:clone_opt, ['--depth', '1'])
-    if s:git_version_requirement(1, 7, 10)
-      call add(s:clone_opt, '--no-single-branch')
-    endif
-  endif
-
-  if has('win32unix') || has('wsl')
-    call extend(s:clone_opt, ['-c', 'core.eol=lf', '-c', 'core.autocrlf=input'])
-  endif
-
-  let s:submodule_opt = s:git_version_requirement(2, 8) ? ' --jobs='.threads : ''
-
-  " Python version requirement (>= 2.7)
-  if python && !has('python3') && !ruby && !use_job && s:update.threads > 1
-    redir => pyv
-    silent python import platform; print platform.python_version()
-    redir END
-    let python = s:version_requirement(
-          \ map(split(split(pyv)[0], '\.'), 'str2nr(v:val)'), [2, 6])
-  endif
-
-  if (python || ruby) && s:update.threads > 1
-    try
-      let imd = &imd
-      if s:mac_gui
-        set noimd
-      endif
-      if ruby
-        call s:update_ruby()
-      else
-        call s:update_python()
-      endif
-    catch
-      let lines = getline(4, '$')
-      let printed = {}
-      silent! 4,$d _
-      for line in lines
-        let name = s:extract_name(line, '.', '')
-        if empty(name) || !has_key(printed, name)
-          call append('$', line)
-          if !empty(name)
-            let printed[name] = 1
-            if line[0] == 'x' && index(s:update.errors, name) < 0
-              call add(s:update.errors, name)
-            end
-          endif
-        endif
-      endfor
-    finally
-      let &imd = imd
-      call s:update_finish()
-    endtry
-  else
-    call s:update_vim()
-    while use_job && sync
-      sleep 100m
-      if s:update.fin
-        break
-      endif
-    endwhile
-  endif
-endfunction
-
-function! s:log4(name, msg)
-  call setline(4, printf('- %s (%s)', a:msg, a:name))
-  redraw
-endfunction
-
-function! s:update_finish()
-  if exists('s:git_terminal_prompt')
-    let $GIT_TERMINAL_PROMPT = s:git_terminal_prompt
-  endif
-  if s:switch_in()
-    call append(3, '- Updating ...') | 4
-    for [name, spec] in items(filter(copy(s:update.all), 'index(s:update.errors, v:key) < 0 && (s:update.force || s:update.pull || has_key(s:update.new, v:key))'))
-      let [pos, _] = s:logpos(name)
-      if !pos
-        continue
-      endif
-      if has_key(spec, 'commit')
-        call s:log4(name, 'Checking out '.spec.commit)
-        let out = s:checkout(spec)
-      elseif has_key(spec, 'tag')
-        let tag = spec.tag
-        if tag =~ '\*'
-          let tags = s:lines(s:system('git tag --list '.plug#shellescape(tag).' --sort -version:refname 2>&1', spec.dir))
-          if !v:shell_error && !empty(tags)
-            let tag = tags[0]
-            call s:log4(name, printf('Latest tag for %s -> %s', spec.tag, tag))
-            call append(3, '')
-          endif
-        endif
-        call s:log4(name, 'Checking out '.tag)
-        let out = s:system('git checkout -q '.plug#shellescape(tag).' -- 2>&1', spec.dir)
-      else
-        let branch = s:git_origin_branch(spec)
-        call s:log4(name, 'Merging origin/'.s:esc(branch))
-        let out = s:system('git checkout -q '.plug#shellescape(branch).' -- 2>&1'
-              \. (has_key(s:update.new, name) ? '' : ('&& git merge --ff-only '.plug#shellescape('origin/'.branch).' 2>&1')), spec.dir)
-      endif
-      if !v:shell_error && filereadable(spec.dir.'/.gitmodules') &&
-            \ (s:update.force || has_key(s:update.new, name) || s:is_updated(spec.dir))
-        call s:log4(name, 'Updating submodules. This may take a while.')
-        let out .= s:bang('git submodule update --init --recursive'.s:submodule_opt.' 2>&1', spec.dir)
-      endif
-      let msg = s:format_message(v:shell_error ? 'x': '-', name, out)
-      if v:shell_error
-        call add(s:update.errors, name)
-        call s:regress_bar()
-        silent execute pos 'd _'
-        call append(4, msg) | 4
-      elseif !empty(out)
-        call setline(pos, msg[0])
-      endif
-      redraw
-    endfor
-    silent 4 d _
-    try
-      call s:do(s:update.pull, s:update.force, filter(copy(s:update.all), 'index(s:update.errors, v:key) < 0 && has_key(v:val, "do")'))
-    catch
-      call s:warn('echom', v:exception)
-      call s:warn('echo', '')
-      return
-    endtry
-    call s:finish(s:update.pull)
-    call setline(1, 'Updated. Elapsed time: ' . split(reltimestr(reltime(s:update.start)))[0] . ' sec.')
-    call s:switch_out('normal! gg')
-  endif
-endfunction
-
-function! s:job_abort()
-  if (!s:nvim && !s:vim8) || !exists('s:jobs')
-    return
-  endif
-
-  for [name, j] in items(s:jobs)
-    if s:nvim
-      silent! call jobstop(j.jobid)
-    elseif s:vim8
-      silent! call job_stop(j.jobid)
-    endif
-    if j.new
-      call s:rm_rf(g:plugs[name].dir)
-    endif
-  endfor
-  let s:jobs = {}
-endfunction
-
-function! s:last_non_empty_line(lines)
-  let len = len(a:lines)
-  for idx in range(len)
-    let line = a:lines[len-idx-1]
-    if !empty(line)
-      return line
-    endif
-  endfor
-  return ''
-endfunction
-
-function! s:job_out_cb(self, data) abort
-  let self = a:self
-  let data = remove(self.lines, -1) . a:data
-  let lines = map(split(data, "\n", 1), 'split(v:val, "\r", 1)[-1]')
-  call extend(self.lines, lines)
-  " To reduce the number of buffer updates
-  let self.tick = get(self, 'tick', -1) + 1
-  if !self.running || self.tick % len(s:jobs) == 0
-    let bullet = self.running ? (self.new ? '+' : '*') : (self.error ? 'x' : '-')
-    let result = self.error ? join(self.lines, "\n") : s:last_non_empty_line(self.lines)
-    call s:log(bullet, self.name, result)
-  endif
-endfunction
-
-function! s:job_exit_cb(self, data) abort
-  let a:self.running = 0
-  let a:self.error = a:data != 0
-  call s:reap(a:self.name)
-  call s:tick()
-endfunction
-
-function! s:job_cb(fn, job, ch, data)
-  if !s:plug_window_exists() " plug window closed
-    return s:job_abort()
-  endif
-  call call(a:fn, [a:job, a:data])
-endfunction
-
-function! s:nvim_cb(job_id, data, event) dict abort
-  return (a:event == 'stdout' || a:event == 'stderr') ?
-    \ s:job_cb('s:job_out_cb',  self, 0, join(a:data, "\n")) :
-    \ s:job_cb('s:job_exit_cb', self, 0, a:data)
-endfunction
-
-function! s:spawn(name, cmd, opts)
-  let job = { 'name': a:name, 'running': 1, 'error': 0, 'lines': [''],
-            \ 'new': get(a:opts, 'new', 0) }
-  let s:jobs[a:name] = job
-
-  if s:nvim
-    if has_key(a:opts, 'dir')
-      let job.cwd = a:opts.dir
-    endif
-    let argv = a:cmd
-    call extend(job, {
-    \ 'on_stdout': function('s:nvim_cb'),
-    \ 'on_stderr': function('s:nvim_cb'),
-    \ 'on_exit':   function('s:nvim_cb'),
-    \ })
-    let jid = s:plug_call('jobstart', argv, job)
-    if jid > 0
-      let job.jobid = jid
-    else
-      let job.running = 0
-      let job.error   = 1
-      let job.lines   = [jid < 0 ? argv[0].' is not executable' :
-            \ 'Invalid arguments (or job table is full)']
-    endif
-  elseif s:vim8
-    let cmd = join(map(copy(a:cmd), 'plug#shellescape(v:val, {"script": 0})'))
-    if has_key(a:opts, 'dir')
-      let cmd = s:with_cd(cmd, a:opts.dir, 0)
-    endif
-    let argv = s:is_win ? ['cmd', '/s', '/c', '"'.cmd.'"'] : ['sh', '-c', cmd]
-    let jid = job_start(s:is_win ? join(argv, ' ') : argv, {
-    \ 'out_cb':   function('s:job_cb', ['s:job_out_cb',  job]),
-    \ 'err_cb':   function('s:job_cb', ['s:job_out_cb',  job]),
-    \ 'exit_cb':  function('s:job_cb', ['s:job_exit_cb', job]),
-    \ 'err_mode': 'raw',
-    \ 'out_mode': 'raw'
-    \})
-    if job_status(jid) == 'run'
-      let job.jobid = jid
-    else
-      let job.running = 0
-      let job.error   = 1
-      let job.lines   = ['Failed to start job']
-    endif
-  else
-    let job.lines = s:lines(call('s:system', has_key(a:opts, 'dir') ? [a:cmd, a:opts.dir] : [a:cmd]))
-    let job.error = v:shell_error != 0
-    let job.running = 0
-  endif
-endfunction
-
-function! s:reap(name)
-  let job = s:jobs[a:name]
-  if job.error
-    call add(s:update.errors, a:name)
-  elseif get(job, 'new', 0)
-    let s:update.new[a:name] = 1
-  endif
-  let s:update.bar .= job.error ? 'x' : '='
-
-  let bullet = job.error ? 'x' : '-'
-  let result = job.error ? join(job.lines, "\n") : s:last_non_empty_line(job.lines)
-  call s:log(bullet, a:name, empty(result) ? 'OK' : result)
-  call s:bar()
-
-  call remove(s:jobs, a:name)
-endfunction
-
-function! s:bar()
-  if s:switch_in()
-    let total = len(s:update.all)
-    call setline(1, (s:update.pull ? 'Updating' : 'Installing').
-          \ ' plugins ('.len(s:update.bar).'/'.total.')')
-    call s:progress_bar(2, s:update.bar, total)
-    call s:switch_out()
-  endif
-endfunction
-
-function! s:logpos(name)
-  let max = line('$')
-  for i in range(4, max > 4 ? max : 4)
-    if getline(i) =~# '^[-+x*] '.a:name.':'
-      for j in range(i + 1, max > 5 ? max : 5)
-        if getline(j) !~ '^ '
-          return [i, j - 1]
-        endif
-      endfor
-      return [i, i]
-    endif
-  endfor
-  return [0, 0]
-endfunction
-
-function! s:log(bullet, name, lines)
-  if s:switch_in()
-    let [b, e] = s:logpos(a:name)
-    if b > 0
-      silent execute printf('%d,%d d _', b, e)
-      if b > winheight('.')
-        let b = 4
-      endif
-    else
-      let b = 4
-    endif
-    " FIXME For some reason, nomodifiable is set after :d in vim8
-    setlocal modifiable
-    call append(b - 1, s:format_message(a:bullet, a:name, a:lines))
-    call s:switch_out()
-  endif
-endfunction
-
-function! s:update_vim()
-  let s:jobs = {}
-
-  call s:bar()
-  call s:tick()
-endfunction
-
-function! s:tick()
-  let pull = s:update.pull
-  let prog = s:progress_opt(s:nvim || s:vim8)
-while 1 " Without TCO, Vim stack is bound to explode
-  if empty(s:update.todo)
-    if empty(s:jobs) && !s:update.fin
-      call s:update_finish()
-      let s:update.fin = 1
-    endif
-    return
-  endif
-
-  let name = keys(s:update.todo)[0]
-  let spec = remove(s:update.todo, name)
-  let new  = empty(globpath(spec.dir, '.git', 1))
-
-  call s:log(new ? '+' : '*', name, pull ? 'Updating ...' : 'Installing ...')
-  redraw
-
-  let has_tag = has_key(spec, 'tag')
-  if !new
-    let [error, _] = s:git_validate(spec, 0)
-    if empty(error)
-      if pull
-        let cmd = s:git_version_requirement(2) ? ['git', '-c', 'credential.helper=', 'fetch'] : ['git', 'fetch']
-        if has_tag && !empty(globpath(spec.dir, '.git/shallow'))
-          call extend(cmd, ['--depth', '99999999'])
-        endif
-        if !empty(prog)
-          call add(cmd, prog)
-        endif
-        call s:spawn(name, cmd, { 'dir': spec.dir })
-      else
-        let s:jobs[name] = { 'running': 0, 'lines': ['Already installed'], 'error': 0 }
-      endif
-    else
-      let s:jobs[name] = { 'running': 0, 'lines': s:lines(error), 'error': 1 }
-    endif
-  else
-    let cmd = ['git', 'clone']
-    if !has_tag
-      call extend(cmd, s:clone_opt)
-    endif
-    if !empty(prog)
-      call add(cmd, prog)
-    endif
-    call s:spawn(name, extend(cmd, [spec.uri, s:trim(spec.dir)]), { 'new': 1 })
-  endif
-
-  if !s:jobs[name].running
-    call s:reap(name)
-  endif
-  if len(s:jobs) >= s:update.threads
-    break
-  endif
-endwhile
-endfunction
-
-function! s:update_python()
-let py_exe = has('python') ? 'python' : 'python3'
-execute py_exe "<< EOF"
-import datetime
-import functools
-import os
-try:
-  import queue
-except ImportError:
-  import Queue as queue
-import random
-import re
-import shutil
-import signal
-import subprocess
-import tempfile
-import threading as thr
-import time
-import traceback
-import vim
-
-G_NVIM = vim.eval("has('nvim')") == '1'
-G_PULL = vim.eval('s:update.pull') == '1'
-G_RETRIES = int(vim.eval('get(g:, "plug_retries", 2)')) + 1
-G_TIMEOUT = int(vim.eval('get(g:, "plug_timeout", 60)'))
-G_CLONE_OPT = ' '.join(vim.eval('s:clone_opt'))
-G_PROGRESS = vim.eval('s:progress_opt(1)')
-G_LOG_PROB = 1.0 / int(vim.eval('s:update.threads'))
-G_STOP = thr.Event()
-G_IS_WIN = vim.eval('s:is_win') == '1'
-
-class PlugError(Exception):
-  def __init__(self, msg):
-    self.msg = msg
-class CmdTimedOut(PlugError):
-  pass
-class CmdFailed(PlugError):
-  pass
-class InvalidURI(PlugError):
-  pass
-class Action(object):
-  INSTALL, UPDATE, ERROR, DONE = ['+', '*', 'x', '-']
-
-class Buffer(object):
-  def __init__(self, lock, num_plugs, is_pull):
-    self.bar = ''
-    self.event = 'Updating' if is_pull else 'Installing'
-    self.lock = lock
-    self.maxy = int(vim.eval('winheight(".")'))
-    self.num_plugs = num_plugs
-
-  def __where(self, name):
-    """ Find first line with name in current buffer. Return line num. """
-    found, lnum = False, 0
-    matcher = re.compile('^[-+x*] {0}:'.format(name))
-    for line in vim.current.buffer:
-      if matcher.search(line) is not None:
-        found = True
-        break
-      lnum += 1
-
-    if not found:
-      lnum = -1
-    return lnum
-
-  def header(self):
-    curbuf = vim.current.buffer
-    curbuf[0] = self.event + ' plugins ({0}/{1})'.format(len(self.bar), self.num_plugs)
-
-    num_spaces = self.num_plugs - len(self.bar)
-    curbuf[1] = '[{0}{1}]'.format(self.bar, num_spaces * ' ')
-
-    with self.lock:
-      vim.command('normal! 2G')
-      vim.command('redraw')
-
-  def write(self, action, name, lines):
-    first, rest = lines[0], lines[1:]
-    msg = ['{0} {1}{2}{3}'.format(action, name, ': ' if first else '', first)]
-    msg.extend(['    ' + line for line in rest])
-
-    try:
-      if action == Action.ERROR:
-        self.bar += 'x'
-        vim.command("call add(s:update.errors, '{0}')".format(name))
-      elif action == Action.DONE:
-        self.bar += '='
-
-      curbuf = vim.current.buffer
-      lnum = self.__where(name)
-      if lnum != -1: # Found matching line num
-        del curbuf[lnum]
-        if lnum > self.maxy and action in set([Action.INSTALL, Action.UPDATE]):
-          lnum = 3
-      else:
-        lnum = 3
-      curbuf.append(msg, lnum)
-
-      self.header()
-    except vim.error:
-      pass
-
-class Command(object):
-  CD = 'cd /d' if G_IS_WIN else 'cd'
-
-  def __init__(self, cmd, cmd_dir=None, timeout=60, cb=None, clean=None):
-    self.cmd = cmd
-    if cmd_dir:
-      self.cmd = '{0} {1} && {2}'.format(Command.CD, cmd_dir, self.cmd)
-    self.timeout = timeout
-    self.callback = cb if cb else (lambda msg: None)
-    self.clean = clean if clean else (lambda: None)
-    self.proc = None
-
-  @property
-  def alive(self):
-    """ Returns true only if command still running. """
-    return self.proc and self.proc.poll() is None
-
-  def execute(self, ntries=3):
-    """ Execute the command with ntries if CmdTimedOut.
-        Returns the output of the command if no Exception.
-    """
-    attempt, finished, limit = 0, False, self.timeout
-
-    while not finished:
-      try:
-        attempt += 1
-        result = self.try_command()
-        finished = True
-        return result
-      except CmdTimedOut:
-        if attempt != ntries:
-          self.notify_retry()
-          self.timeout += limit
-        else:
-          raise
-
-  def notify_retry(self):
-    """ Retry required for command, notify user. """
-    for count in range(3, 0, -1):
-      if G_STOP.is_set():
-        raise KeyboardInterrupt
-      msg = 'Timeout. Will retry in {0} second{1} ...'.format(
-            count, 's' if count != 1 else '')
-      self.callback([msg])
-      time.sleep(1)
-    self.callback(['Retrying ...'])
-
-  def try_command(self):
-    """ Execute a cmd & poll for callback. Returns list of output.
-        Raises CmdFailed   -> return code for Popen isn't 0
-        Raises CmdTimedOut -> command exceeded timeout without new output
-    """
-    first_line = True
-
-    try:
-      tfile = tempfile.NamedTemporaryFile(mode='w+b')
-      preexec_fn = not G_IS_WIN and os.setsid or None
-      self.proc = subprocess.Popen(self.cmd, stdout=tfile,
-                                   stderr=subprocess.STDOUT,
-                                   stdin=subprocess.PIPE, shell=True,
-                                   preexec_fn=preexec_fn)
-      thrd = thr.Thread(target=(lambda proc: proc.wait()), args=(self.proc,))
-      thrd.start()
-
-      thread_not_started = True
-      while thread_not_started:
-        try:
-          thrd.join(0.1)
-          thread_not_started = False
-        except RuntimeError:
-          pass
-
-      while self.alive:
-        if G_STOP.is_set():
-          raise KeyboardInterrupt
-
-        if first_line or random.random() < G_LOG_PROB:
-          first_line = False
-          line = '' if G_IS_WIN else nonblock_read(tfile.name)
-          if line:
-            self.callback([line])
-
-        time_diff = time.time() - os.path.getmtime(tfile.name)
-        if time_diff > self.timeout:
-          raise CmdTimedOut(['Timeout!'])
-
-        thrd.join(0.5)
-
-      tfile.seek(0)
-      result = [line.decode('utf-8', 'replace').rstrip() for line in tfile]
-
-      if self.proc.returncode != 0:
-        raise CmdFailed([''] + result)
-
-      return result
-    except:
-      self.terminate()
-      raise
-
-  def terminate(self):
-    """ Terminate process and cleanup. """
-    if self.alive:
-      if G_IS_WIN:
-        os.kill(self.proc.pid, signal.SIGINT)
-      else:
-        os.killpg(self.proc.pid, signal.SIGTERM)
-    self.clean()
-
-class Plugin(object):
-  def __init__(self, name, args, buf_q, lock):
-    self.name = name
-    self.args = args
-    self.buf_q = buf_q
-    self.lock = lock
-    self.tag = args.get('tag', 0)
-
-  def manage(self):
-    try:
-      if os.path.exists(self.args['dir']):
-        self.update()
-      else:
-        self.install()
-        with self.lock:
-          thread_vim_command("let s:update.new['{0}'] = 1".format(self.name))
-    except PlugError as exc:
-      self.write(Action.ERROR, self.name, exc.msg)
-    except KeyboardInterrupt:
-      G_STOP.set()
-      self.write(Action.ERROR, self.name, ['Interrupted!'])
-    except:
-      # Any exception except those above print stack trace
-      msg = 'Trace:\n{0}'.format(traceback.format_exc().rstrip())
-      self.write(Action.ERROR, self.name, msg.split('\n'))
-      raise
-
-  def install(self):
-    target = self.args['dir']
-    if target[-1] == '\\':
-      target = target[0:-1]
-
-    def clean(target):
-      def _clean():
-        try:
-          shutil.rmtree(target)
-        except OSError:
-          pass
-      return _clean
-
-    self.write(Action.INSTALL, self.name, ['Installing ...'])
-    callback = functools.partial(self.write, Action.INSTALL, self.name)
-    cmd = 'git clone {0} {1} {2} {3} 2>&1'.format(
-          '' if self.tag else G_CLONE_OPT, G_PROGRESS, self.args['uri'],
-          esc(target))
-    com = Command(cmd, None, G_TIMEOUT, callback, clean(target))
-    result = com.execute(G_RETRIES)
-    self.write(Action.DONE, self.name, result[-1:])
-
-  def repo_uri(self):
-    cmd = 'git rev-parse --abbrev-ref HEAD 2>&1 && git config -f .git/config remote.origin.url'
-    command = Command(cmd, self.args['dir'], G_TIMEOUT,)
-    result = command.execute(G_RETRIES)
-    return result[-1]
-
-  def update(self):
-    actual_uri = self.repo_uri()
-    expect_uri = self.args['uri']
-    regex = re.compile(r'^(?:\w+://)?(?:[^@/]*@)?([^:/]*(?::[0-9]*)?)[:/](.*?)(?:\.git)?/?$')
-    ma = regex.match(actual_uri)
-    mb = regex.match(expect_uri)
-    if ma is None or mb is None or ma.groups() != mb.groups():
-      msg = ['',
-             'Invalid URI: {0}'.format(actual_uri),
-             'Expected     {0}'.format(expect_uri),
-             'PlugClean required.']
-      raise InvalidURI(msg)
-
-    if G_PULL:
-      self.write(Action.UPDATE, self.name, ['Updating ...'])
-      callback = functools.partial(self.write, Action.UPDATE, self.name)
-      fetch_opt = '--depth 99999999' if self.tag and os.path.isfile(os.path.join(self.args['dir'], '.git/shallow')) else ''
-      cmd = 'git fetch {0} {1} 2>&1'.format(fetch_opt, G_PROGRESS)
-      com = Command(cmd, self.args['dir'], G_TIMEOUT, callback)
-      result = com.execute(G_RETRIES)
-      self.write(Action.DONE, self.name, result[-1:])
-    else:
-      self.write(Action.DONE, self.name, ['Already installed'])
-
-  def write(self, action, name, msg):
-    self.buf_q.put((action, name, msg))
-
-class PlugThread(thr.Thread):
-  def __init__(self, tname, args):
-    super(PlugThread, self).__init__()
-    self.tname = tname
-    self.args = args
-
-  def run(self):
-    thr.current_thread().name = self.tname
-    buf_q, work_q, lock = self.args
-
-    try:
-      while not G_STOP.is_set():
-        name, args = work_q.get_nowait()
-        plug = Plugin(name, args, buf_q, lock)
-        plug.manage()
-        work_q.task_done()
-    except queue.Empty:
-      pass
-
-class RefreshThread(thr.Thread):
-  def __init__(self, lock):
-    super(RefreshThread, self).__init__()
-    self.lock = lock
-    self.running = True
-
-  def run(self):
-    while self.running:
-      with self.lock:
-        thread_vim_command('noautocmd normal! a')
-      time.sleep(0.33)
-
-  def stop(self):
-    self.running = False
-
-if G_NVIM:
-  def thread_vim_command(cmd):
-    vim.session.threadsafe_call(lambda: vim.command(cmd))
-else:
-  def thread_vim_command(cmd):
-    vim.command(cmd)
-
-def esc(name):
-  return '"' + name.replace('"', '\"') + '"'
-
-def nonblock_read(fname):
-  """ Read a file with nonblock flag. Return the last line. """
-  fread = os.open(fname, os.O_RDONLY | os.O_NONBLOCK)
-  buf = os.read(fread, 100000).decode('utf-8', 'replace')
-  os.close(fread)
-
-  line = buf.rstrip('\r\n')
-  left = max(line.rfind('\r'), line.rfind('\n'))
-  if left != -1:
-    left += 1
-    line = line[left:]
-
-  return line
-
-def main():
-  thr.current_thread().name = 'main'
-  nthreads = int(vim.eval('s:update.threads'))
-  plugs = vim.eval('s:update.todo')
-  mac_gui = vim.eval('s:mac_gui') == '1'
-
-  lock = thr.Lock()
-  buf = Buffer(lock, len(plugs), G_PULL)
-  buf_q, work_q = queue.Queue(), queue.Queue()
-  for work in plugs.items():
-    work_q.put(work)
-
-  start_cnt = thr.active_count()
-  for num in range(nthreads):
-    tname = 'PlugT-{0:02}'.format(num)
-    thread = PlugThread(tname, (buf_q, work_q, lock))
-    thread.start()
-  if mac_gui:
-    rthread = RefreshThread(lock)
-    rthread.start()
-
-  while not buf_q.empty() or thr.active_count() != start_cnt:
-    try:
-      action, name, msg = buf_q.get(True, 0.25)
-      buf.write(action, name, ['OK'] if not msg else msg)
-      buf_q.task_done()
-    except queue.Empty:
-      pass
-    except KeyboardInterrupt:
-      G_STOP.set()
-
-  if mac_gui:
-    rthread.stop()
-    rthread.join()
-
-main()
-EOF
-endfunction
-
-function! s:update_ruby()
-  ruby << EOF
-  module PlugStream
-    SEP = ["\r", "\n", nil]
-    def get_line
-      buffer = ''
-      loop do
-        char = readchar rescue return
-        if SEP.include? char.chr
-          buffer << $/
-          break
-        else
-          buffer << char
-        end
-      end
-      buffer
-    end
-  end unless defined?(PlugStream)
-
-  def esc arg
-    %["#{arg.gsub('"', '\"')}"]
-  end
-
-  def killall pid
-    pids = [pid]
-    if /mswin|mingw|bccwin/ =~ RUBY_PLATFORM
-      pids.each { |pid| Process.kill 'INT', pid.to_i rescue nil }
-    else
-      unless `which pgrep 2> /dev/null`.empty?
-        children = pids
-        until children.empty?
-          children = children.map { |pid|
-            `pgrep -P #{pid}`.lines.map { |l| l.chomp }
-          }.flatten
-          pids += children
-        end
-      end
-      pids.each { |pid| Process.kill 'TERM', pid.to_i rescue nil }
-    end
-  end
-
-  def compare_git_uri a, b
-    regex = %r{^(?:\w+://)?(?:[^@/]*@)?([^:/]*(?::[0-9]*)?)[:/](.*?)(?:\.git)?/?$}
-    regex.match(a).to_a.drop(1) == regex.match(b).to_a.drop(1)
-  end
-
-  require 'thread'
-  require 'fileutils'
-  require 'timeout'
-  running = true
-  iswin = VIM::evaluate('s:is_win').to_i == 1
-  pull  = VIM::evaluate('s:update.pull').to_i == 1
-  base  = VIM::evaluate('g:plug_home')
-  all   = VIM::evaluate('s:update.todo')
-  limit = VIM::evaluate('get(g:, "plug_timeout", 60)')
-  tries = VIM::evaluate('get(g:, "plug_retries", 2)') + 1
-  nthr  = VIM::evaluate('s:update.threads').to_i
-  maxy  = VIM::evaluate('winheight(".")').to_i
-  vim7  = VIM::evaluate('v:version').to_i <= 703 && RUBY_PLATFORM =~ /darwin/
-  cd    = iswin ? 'cd /d' : 'cd'
-  tot   = VIM::evaluate('len(s:update.todo)') || 0
-  bar   = ''
-  skip  = 'Already installed'
-  mtx   = Mutex.new
-  take1 = proc { mtx.synchronize { running && all.shift } }
-  logh  = proc {
-    cnt = bar.length
-    $curbuf[1] = "#{pull ? 'Updating' : 'Installing'} plugins (#{cnt}/#{tot})"
-    $curbuf[2] = '[' + bar.ljust(tot) + ']'
-    VIM::command('normal! 2G')
-    VIM::command('redraw')
-  }
-  where = proc { |name| (1..($curbuf.length)).find { |l| $curbuf[l] =~ /^[-+x*] #{name}:/ } }
-  log   = proc { |name, result, type|
-    mtx.synchronize do
-      ing  = ![true, false].include?(type)
-      bar += type ? '=' : 'x' unless ing
-      b = case type
-          when :install  then '+' when :update then '*'
-          when true, nil then '-' else
-            VIM::command("call add(s:update.errors, '#{name}')")
-            'x'
-          end
-      result =
-        if type || type.nil?
-          ["#{b} #{name}: #{result.lines.to_a.last || 'OK'}"]
-        elsif result =~ /^Interrupted|^Timeout/
-          ["#{b} #{name}: #{result}"]
-        else
-          ["#{b} #{name}"] + result.lines.map { |l| "    " << l }
-        end
-      if lnum = where.call(name)
-        $curbuf.delete lnum
-        lnum = 4 if ing && lnum > maxy
-      end
-      result.each_with_index do |line, offset|
-        $curbuf.append((lnum || 4) - 1 + offset, line.gsub(/\e\[./, '').chomp)
-      end
-      logh.call
-    end
-  }
-  bt = proc { |cmd, name, type, cleanup|
-    tried = timeout = 0
-    begin
-      tried += 1
-      timeout += limit
-      fd = nil
-      data = ''
-      if iswin
-        Timeout::timeout(timeout) do
-          tmp = VIM::evaluate('tempname()')
-          system("(#{cmd}) > #{tmp}")
-          data = File.read(tmp).chomp
-          File.unlink tmp rescue nil
-        end
-      else
-        fd = IO.popen(cmd).extend(PlugStream)
-        first_line = true
-        log_prob = 1.0 / nthr
-        while line = Timeout::timeout(timeout) { fd.get_line }
-          data << line
-          log.call name, line.chomp, type if name && (first_line || rand < log_prob)
-          first_line = false
-        end
-        fd.close
-      end
-      [$? == 0, data.chomp]
-    rescue Timeout::Error, Interrupt => e
-      if fd && !fd.closed?
-        killall fd.pid
-        fd.close
-      end
-      cleanup.call if cleanup
-      if e.is_a?(Timeout::Error) && tried < tries
-        3.downto(1) do |countdown|
-          s = countdown > 1 ? 's' : ''
-          log.call name, "Timeout. Will retry in #{countdown} second#{s} ...", type
-          sleep 1
-        end
-        log.call name, 'Retrying ...', type
-        retry
-      end
-      [false, e.is_a?(Interrupt) ? "Interrupted!" : "Timeout!"]
-    end
-  }
-  main = Thread.current
-  threads = []
-  watcher = Thread.new {
-    if vim7
-      while VIM::evaluate('getchar(1)')
-        sleep 0.1
-      end
-    else
-      require 'io/console' # >= Ruby 1.9
-      nil until IO.console.getch == 3.chr
-    end
-    mtx.synchronize do
-      running = false
-      threads.each { |t| t.raise Interrupt } unless vim7
-    end
-    threads.each { |t| t.join rescue nil }
-    main.kill
-  }
-  refresh = Thread.new {
-    while true
-      mtx.synchronize do
-        break unless running
-        VIM::command('noautocmd normal! a')
-      end
-      sleep 0.2
-    end
-  } if VIM::evaluate('s:mac_gui') == 1
-
-  clone_opt = VIM::evaluate('s:clone_opt').join(' ')
-  progress = VIM::evaluate('s:progress_opt(1)')
-  nthr.times do
-    mtx.synchronize do
-      threads << Thread.new {
-        while pair = take1.call
-          name = pair.first
-          dir, uri, tag = pair.last.values_at *%w[dir uri tag]
-          exists = File.directory? dir
-          ok, result =
-            if exists
-              chdir = "#{cd} #{iswin ? dir : esc(dir)}"
-              ret, data = bt.call "#{chdir} && git rev-parse --abbrev-ref HEAD 2>&1 && git config -f .git/config remote.origin.url", nil, nil, nil
-              current_uri = data.lines.to_a.last
-              if !ret
-                if data =~ /^Interrupted|^Timeout/
-                  [false, data]
-                else
-                  [false, [data.chomp, "PlugClean required."].join($/)]
-                end
-              elsif !compare_git_uri(current_uri, uri)
-                [false, ["Invalid URI: #{current_uri}",
-                         "Expected:    #{uri}",
-                         "PlugClean required."].join($/)]
-              else
-                if pull
-                  log.call name, 'Updating ...', :update
-                  fetch_opt = (tag && File.exist?(File.join(dir, '.git/shallow'))) ? '--depth 99999999' : ''
-                  bt.call "#{chdir} && git fetch #{fetch_opt} #{progress} 2>&1", name, :update, nil
-                else
-                  [true, skip]
-                end
-              end
-            else
-              d = esc dir.sub(%r{[\\/]+$}, '')
-              log.call name, 'Installing ...', :install
-              bt.call "git clone #{clone_opt unless tag} #{progress} #{uri} #{d} 2>&1", name, :install, proc {
-                FileUtils.rm_rf dir
-              }
-            end
-          mtx.synchronize { VIM::command("let s:update.new['#{name}'] = 1") } if !exists && ok
-          log.call name, result, ok
-        end
-      } if running
-    end
-  end
-  threads.each { |t| t.join rescue nil }
-  logh.call
-  refresh.kill if refresh
-  watcher.kill
-EOF
-endfunction
-
-function! s:shellesc_cmd(arg, script)
-  let escaped = substitute('"'.a:arg.'"', '[&|<>()@^!"]', '^&', 'g')
-  return substitute(escaped, '%', (a:script ? '%' : '^') . '&', 'g')
-endfunction
-
-function! s:shellesc_ps1(arg)
-  return "'".substitute(escape(a:arg, '\"'), "'", "''", 'g')."'"
-endfunction
-
-function! s:shellesc_sh(arg)
-  return "'".substitute(a:arg, "'", "'\\\\''", 'g')."'"
-endfunction
-
-" Escape the shell argument based on the shell.
-" Vim and Neovim's shellescape() are insufficient.
-" 1. shellslash determines whether to use single/double quotes.
-"    Double-quote escaping is fragile for cmd.exe.
-" 2. It does not work for powershell.
-" 3. It does not work for *sh shells if the command is executed
-"    via cmd.exe (ie. cmd.exe /c sh -c command command_args)
-" 4. It does not support batchfile syntax.
-"
-" Accepts an optional dictionary with the following keys:
-" - shell: same as Vim/Neovim 'shell' option.
-"          If unset, fallback to 'cmd.exe' on Windows or 'sh'.
-" - script: If truthy and shell is cmd.exe, escape for batchfile syntax.
-function! plug#shellescape(arg, ...)
-  if a:arg =~# '^[A-Za-z0-9_/:.-]\+$'
-    return a:arg
-  endif
-  let opts = a:0 > 0 && type(a:1) == s:TYPE.dict ? a:1 : {}
-  let shell = get(opts, 'shell', s:is_win ? 'cmd.exe' : 'sh')
-  let script = get(opts, 'script', 1)
-  if shell =~# 'cmd\(\.exe\)\?$'
-    return s:shellesc_cmd(a:arg, script)
-  elseif shell =~# 'powershell\(\.exe\)\?$' || shell =~# 'pwsh$'
-    return s:shellesc_ps1(a:arg)
-  endif
-  return s:shellesc_sh(a:arg)
-endfunction
-
-function! s:glob_dir(path)
-  return map(filter(s:glob(a:path, '**'), 'isdirectory(v:val)'), 's:dirpath(v:val)')
-endfunction
-
-function! s:progress_bar(line, bar, total)
-  call setline(a:line, '[' . s:lpad(a:bar, a:total) . ']')
-endfunction
-
-function! s:compare_git_uri(a, b)
-  " See `git help clone'
-  " https:// [user@] github.com[:port] / junegunn/vim-plug [.git]
-  "          [git@]  github.com[:port] : junegunn/vim-plug [.git]
-  " file://                            / junegunn/vim-plug        [/]
-  "                                    / junegunn/vim-plug        [/]
-  let pat = '^\%(\w\+://\)\='.'\%([^@/]*@\)\='.'\([^:/]*\%(:[0-9]*\)\=\)'.'[:/]'.'\(.\{-}\)'.'\%(\.git\)\=/\?$'
-  let ma = matchlist(a:a, pat)
-  let mb = matchlist(a:b, pat)
-  return ma[1:2] ==# mb[1:2]
-endfunction
-
-function! s:format_message(bullet, name, message)
-  if a:bullet != 'x'
-    return [printf('%s %s: %s', a:bullet, a:name, s:lastline(a:message))]
-  else
-    let lines = map(s:lines(a:message), '"    ".v:val')
-    return extend([printf('x %s:', a:name)], lines)
-  endif
-endfunction
-
-function! s:with_cd(cmd, dir, ...)
-  let script = a:0 > 0 ? a:1 : 1
-  return printf('cd%s %s && %s', s:is_win ? ' /d' : '', plug#shellescape(a:dir, {'script': script}), a:cmd)
-endfunction
-
-function! s:system(cmd, ...)
-  let batchfile = ''
-  try
-    let [sh, shellcmdflag, shrd] = s:chsh(1)
-    if type(a:cmd) == s:TYPE.list
-      " Neovim's system() supports list argument to bypass the shell
-      " but it cannot set the working directory for the command.
-      " Assume that the command does not rely on the shell.
-      if has('nvim') && a:0 == 0
-        return system(a:cmd)
-      endif
-      let cmd = join(map(copy(a:cmd), 'plug#shellescape(v:val, {"shell": &shell, "script": 0})'))
-      if &shell =~# 'powershell\(\.exe\)\?$'
-        let cmd = '& ' . cmd
-      endif
-    else
-      let cmd = a:cmd
-    endif
-    if a:0 > 0
-      let cmd = s:with_cd(cmd, a:1, type(a:cmd) != s:TYPE.list)
-    endif
-    if s:is_win && type(a:cmd) != s:TYPE.list
-      let [batchfile, cmd] = s:batchfile(cmd)
-    endif
-    return system(cmd)
-  finally
-    let [&shell, &shellcmdflag, &shellredir] = [sh, shellcmdflag, shrd]
-    if s:is_win && filereadable(batchfile)
-      call delete(batchfile)
-    endif
-  endtry
-endfunction
-
-function! s:system_chomp(...)
-  let ret = call('s:system', a:000)
-  return v:shell_error ? '' : substitute(ret, '\n$', '', '')
-endfunction
-
-function! s:git_validate(spec, check_branch)
-  let err = ''
-  if isdirectory(a:spec.dir)
-    let result = [s:git_local_branch(a:spec.dir), s:git_origin_url(a:spec.dir)]
-    let remote = result[-1]
-    if empty(remote)
-      let err = join([remote, 'PlugClean required.'], "\n")
-    elseif !s:compare_git_uri(remote, a:spec.uri)
-      let err = join(['Invalid URI: '.remote,
-                    \ 'Expected:    '.a:spec.uri,
-                    \ 'PlugClean required.'], "\n")
-    elseif a:check_branch && has_key(a:spec, 'commit')
-      let sha = s:git_revision(a:spec.dir)
-      if empty(sha)
-        let err = join(add(result, 'PlugClean required.'), "\n")
-      elseif !s:hash_match(sha, a:spec.commit)
-        let err = join([printf('Invalid HEAD (expected: %s, actual: %s)',
-                              \ a:spec.commit[:6], sha[:6]),
-                      \ 'PlugUpdate required.'], "\n")
-      endif
-    elseif a:check_branch
-      let current_branch = result[0]
-      " Check tag
-      let origin_branch = s:git_origin_branch(a:spec)
-      if has_key(a:spec, 'tag')
-        let tag = s:system_chomp('git describe --exact-match --tags HEAD 2>&1', a:spec.dir)
-        if a:spec.tag !=# tag && a:spec.tag !~ '\*'
-          let err = printf('Invalid tag: %s (expected: %s). Try PlugUpdate.',
-                \ (empty(tag) ? 'N/A' : tag), a:spec.tag)
-        endif
-      " Check branch
-      elseif origin_branch !=# current_branch
-        let err = printf('Invalid branch: %s (expected: %s). Try PlugUpdate.',
-              \ current_branch, origin_branch)
-      endif
-      if empty(err)
-        let [ahead, behind] = split(s:lastline(s:system([
-        \ 'git', 'rev-list', '--count', '--left-right',
-        \ printf('HEAD...origin/%s', origin_branch)
-        \ ], a:spec.dir)), '\t')
-        if !v:shell_error && ahead
-          if behind
-            " Only mention PlugClean if diverged, otherwise it's likely to be
-            " pushable (and probably not that messed up).
-            let err = printf(
-                  \ "Diverged from origin/%s (%d commit(s) ahead and %d commit(s) behind!\n"
-                  \ .'Backup local changes and run PlugClean and PlugUpdate to reinstall it.', origin_branch, ahead, behind)
-          else
-            let err = printf("Ahead of origin/%s by %d commit(s).\n"
-                  \ .'Cannot update until local changes are pushed.',
-                  \ origin_branch, ahead)
-          endif
-        endif
-      endif
-    endif
-  else
-    let err = 'Not found'
-  endif
-  return [err, err =~# 'PlugClean']
-endfunction
-
-function! s:rm_rf(dir)
-  if isdirectory(a:dir)
-    return s:system(s:is_win
-    \ ? 'rmdir /S /Q '.plug#shellescape(a:dir)
-    \ : ['rm', '-rf', a:dir])
-  endif
-endfunction
-
-function! s:clean(force)
-  call s:prepare()
-  call append(0, 'Searching for invalid plugins in '.g:plug_home)
-  call append(1, '')
-
-  " List of valid directories
-  let dirs = []
-  let errs = {}
-  let [cnt, total] = [0, len(g:plugs)]
-  for [name, spec] in items(g:plugs)
-    if !s:is_managed(name)
-      call add(dirs, spec.dir)
-    else
-      let [err, clean] = s:git_validate(spec, 1)
-      if clean
-        let errs[spec.dir] = s:lines(err)[0]
-      else
-        call add(dirs, spec.dir)
-      endif
-    endif
-    let cnt += 1
-    call s:progress_bar(2, repeat('=', cnt), total)
-    normal! 2G
-    redraw
-  endfor
-
-  let allowed = {}
-  for dir in dirs
-    let allowed[s:dirpath(s:plug_fnamemodify(dir, ':h:h'))] = 1
-    let allowed[dir] = 1
-    for child in s:glob_dir(dir)
-      let allowed[child] = 1
-    endfor
-  endfor
-
-  let todo = []
-  let found = sort(s:glob_dir(g:plug_home))
-  while !empty(found)
-    let f = remove(found, 0)
-    if !has_key(allowed, f) && isdirectory(f)
-      call add(todo, f)
-      call append(line('$'), '- ' . f)
-      if has_key(errs, f)
-        call append(line('$'), '    ' . errs[f])
-      endif
-      let found = filter(found, 'stridx(v:val, f) != 0')
-    end
-  endwhile
-
-  4
-  redraw
-  if empty(todo)
-    call append(line('$'), 'Already clean.')
-  else
-    let s:clean_count = 0
-    call append(3, ['Directories to delete:', ''])
-    redraw!
-    if a:force || s:ask_no_interrupt('Delete all directories?')
-      call s:delete([6, line('$')], 1)
-    else
-      call setline(4, 'Cancelled.')
-      nnoremap <silent> <buffer> d :set opfunc=<sid>delete_op<cr>g@
-      nmap     <silent> <buffer> dd d_
-      xnoremap <silent> <buffer> d :<c-u>call <sid>delete_op(visualmode(), 1)<cr>
-      echo 'Delete the lines (d{motion}) to delete the corresponding directories'
-    endif
-  endif
-  4
-  setlocal nomodifiable
-endfunction
-
-function! s:delete_op(type, ...)
-  call s:delete(a:0 ? [line("'<"), line("'>")] : [line("'["), line("']")], 0)
-endfunction
-
-function! s:delete(range, force)
-  let [l1, l2] = a:range
-  let force = a:force
-  let err_count = 0
-  while l1 <= l2
-    let line = getline(l1)
-    if line =~ '^- ' && isdirectory(line[2:])
-      execute l1
-      redraw!
-      let answer = force ? 1 : s:ask('Delete '.line[2:].'?', 1)
-      let force = force || answer > 1
-      if answer
-        let err = s:rm_rf(line[2:])
-        setlocal modifiable
-        if empty(err)
-          call setline(l1, '~'.line[1:])
-          let s:clean_count += 1
-        else
-          delete _
-          call append(l1 - 1, s:format_message('x', line[1:], err))
-          let l2 += len(s:lines(err))
-          let err_count += 1
-        endif
-        let msg = printf('Removed %d directories.', s:clean_count)
-        if err_count > 0
-          let msg .= printf(' Failed to remove %d directories.', err_count)
-        endif
-        call setline(4, msg)
-        setlocal nomodifiable
-      endif
-    endif
-    let l1 += 1
-  endwhile
-endfunction
-
-function! s:upgrade()
-  echo 'Downloading the latest version of vim-plug'
-  redraw
-  let tmp = s:plug_tempname()
-  let new = tmp . '/plug.vim'
-
-  try
-    let out = s:system(['git', 'clone', '--depth', '1', s:plug_src, tmp])
-    if v:shell_error
-      return s:err('Error upgrading vim-plug: '. out)
-    endif
-
-    if readfile(s:me) ==# readfile(new)
-      echo 'vim-plug is already up-to-date'
-      return 0
-    else
-      call rename(s:me, s:me . '.old')
-      call rename(new, s:me)
-      unlet g:loaded_plug
-      echo 'vim-plug has been upgraded'
-      return 1
-    endif
-  finally
-    silent! call s:rm_rf(tmp)
-  endtry
-endfunction
-
-function! s:upgrade_specs()
-  for spec in values(g:plugs)
-    let spec.frozen = get(spec, 'frozen', 0)
-  endfor
-endfunction
-
-function! s:status()
-  call s:prepare()
-  call append(0, 'Checking plugins')
-  call append(1, '')
-
-  let ecnt = 0
-  let unloaded = 0
-  let [cnt, total] = [0, len(g:plugs)]
-  for [name, spec] in items(g:plugs)
-    let is_dir = isdirectory(spec.dir)
-    if has_key(spec, 'uri')
-      if is_dir
-        let [err, _] = s:git_validate(spec, 1)
-        let [valid, msg] = [empty(err), empty(err) ? 'OK' : err]
-      else
-        let [valid, msg] = [0, 'Not found. Try PlugInstall.']
-      endif
-    else
-      if is_dir
-        let [valid, msg] = [1, 'OK']
-      else
-        let [valid, msg] = [0, 'Not found.']
-      endif
-    endif
-    let cnt += 1
-    let ecnt += !valid
-    " `s:loaded` entry can be missing if PlugUpgraded
-    if is_dir && get(s:loaded, name, -1) == 0
-      let unloaded = 1
-      let msg .= ' (not loaded)'
-    endif
-    call s:progress_bar(2, repeat('=', cnt), total)
-    call append(3, s:format_message(valid ? '-' : 'x', name, msg))
-    normal! 2G
-    redraw
-  endfor
-  call setline(1, 'Finished. '.ecnt.' error(s).')
-  normal! gg
-  setlocal nomodifiable
-  if unloaded
-    echo "Press 'L' on each line to load plugin, or 'U' to update"
-    nnoremap <silent> <buffer> L :call <SID>status_load(line('.'))<cr>
-    xnoremap <silent> <buffer> L :call <SID>status_load(line('.'))<cr>
-  end
-endfunction
-
-function! s:extract_name(str, prefix, suffix)
-  return matchstr(a:str, '^'.a:prefix.' \zs[^:]\+\ze:.*'.a:suffix.'$')
-endfunction
-
-function! s:status_load(lnum)
-  let line = getline(a:lnum)
-  let name = s:extract_name(line, '-', '(not loaded)')
-  if !empty(name)
-    call plug#load(name)
-    setlocal modifiable
-    call setline(a:lnum, substitute(line, ' (not loaded)$', '', ''))
-    setlocal nomodifiable
-  endif
-endfunction
-
-function! s:status_update() range
-  let lines = getline(a:firstline, a:lastline)
-  let names = filter(map(lines, 's:extract_name(v:val, "[x-]", "")'), '!empty(v:val)')
-  if !empty(names)
-    echo
-    execute 'PlugUpdate' join(names)
-  endif
-endfunction
-
-function! s:is_preview_window_open()
-  silent! wincmd P
-  if &previewwindow
-    wincmd p
-    return 1
-  endif
-endfunction
-
-function! s:find_name(lnum)
-  for lnum in reverse(range(1, a:lnum))
-    let line = getline(lnum)
-    if empty(line)
-      return ''
-    endif
-    let name = s:extract_name(line, '-', '')
-    if !empty(name)
-      return name
-    endif
-  endfor
-  return ''
-endfunction
-
-function! s:preview_commit()
-  if b:plug_preview < 0
-    let b:plug_preview = !s:is_preview_window_open()
-  endif
-
-  let sha = matchstr(getline('.'), '^  \X*\zs[0-9a-f]\{7,9}')
-  if empty(sha)
-    return
-  endif
-
-  let name = s:find_name(line('.'))
-  if empty(name) || !has_key(g:plugs, name) || !isdirectory(g:plugs[name].dir)
-    return
-  endif
-
-  if exists('g:plug_pwindow') && !s:is_preview_window_open()
-    execute g:plug_pwindow
-    execute 'e' sha
-  else
-    execute 'pedit' sha
-    wincmd P
-  endif
-  setlocal previewwindow filetype=git buftype=nofile nobuflisted modifiable
-  let batchfile = ''
-  try
-    let [sh, shellcmdflag, shrd] = s:chsh(1)
-    let cmd = 'cd '.plug#shellescape(g:plugs[name].dir).' && git show --no-color --pretty=medium '.sha
-    if s:is_win
-      let [batchfile, cmd] = s:batchfile(cmd)
-    endif
-    execute 'silent %!' cmd
-  finally
-    let [&shell, &shellcmdflag, &shellredir] = [sh, shellcmdflag, shrd]
-    if s:is_win && filereadable(batchfile)
-      call delete(batchfile)
-    endif
-  endtry
-  setlocal nomodifiable
-  nnoremap <silent> <buffer> q :q<cr>
-  wincmd p
-endfunction
-
-function! s:section(flags)
-  call search('\(^[x-] \)\@<=[^:]\+:', a:flags)
-endfunction
-
-function! s:format_git_log(line)
-  let indent = '  '
-  let tokens = split(a:line, nr2char(1))
-  if len(tokens) != 5
-    return indent.substitute(a:line, '\s*$', '', '')
-  endif
-  let [graph, sha, refs, subject, date] = tokens
-  let tag = matchstr(refs, 'tag: [^,)]\+')
-  let tag = empty(tag) ? ' ' : ' ('.tag.') '
-  return printf('%s%s%s%s%s (%s)', indent, graph, sha, tag, subject, date)
-endfunction
-
-function! s:append_ul(lnum, text)
-  call append(a:lnum, ['', a:text, repeat('-', len(a:text))])
-endfunction
-
-function! s:diff()
-  call s:prepare()
-  call append(0, ['Collecting changes ...', ''])
-  let cnts = [0, 0]
-  let bar = ''
-  let total = filter(copy(g:plugs), 's:is_managed(v:key) && isdirectory(v:val.dir)')
-  call s:progress_bar(2, bar, len(total))
-  for origin in [1, 0]
-    let plugs = reverse(sort(items(filter(copy(total), (origin ? '' : '!').'(has_key(v:val, "commit") || has_key(v:val, "tag"))'))))
-    if empty(plugs)
-      continue
-    endif
-    call s:append_ul(2, origin ? 'Pending updates:' : 'Last update:')
-    for [k, v] in plugs
-      let branch = s:git_origin_branch(v)
-      if len(branch)
-        let range = origin ? '..origin/'.branch : 'HEAD@{1}..'
-        let cmd = ['git', 'log', '--graph', '--color=never']
-        if s:git_version_requirement(2, 10, 0)
-          call add(cmd, '--no-show-signature')
-        endif
-        call extend(cmd, ['--pretty=format:%x01%h%x01%d%x01%s%x01%cr', range])
-        if has_key(v, 'rtp')
-          call extend(cmd, ['--', v.rtp])
-        endif
-        let diff = s:system_chomp(cmd, v.dir)
-        if !empty(diff)
-          let ref = has_key(v, 'tag') ? (' (tag: '.v.tag.')') : has_key(v, 'commit') ? (' '.v.commit) : ''
-          call append(5, extend(['', '- '.k.':'.ref], map(s:lines(diff), 's:format_git_log(v:val)')))
-          let cnts[origin] += 1
-        endif
-      endif
-      let bar .= '='
-      call s:progress_bar(2, bar, len(total))
-      normal! 2G
-      redraw
-    endfor
-    if !cnts[origin]
-      call append(5, ['', 'N/A'])
-    endif
-  endfor
-  call setline(1, printf('%d plugin(s) updated.', cnts[0])
-        \ . (cnts[1] ? printf(' %d plugin(s) have pending updates.', cnts[1]) : ''))
-
-  if cnts[0] || cnts[1]
-    nnoremap <silent> <buffer> <plug>(plug-preview) :silent! call <SID>preview_commit()<cr>
-    if empty(maparg("\<cr>", 'n'))
-      nmap <buffer> <cr> <plug>(plug-preview)
-    endif
-    if empty(maparg('o', 'n'))
-      nmap <buffer> o <plug>(plug-preview)
-    endif
-  endif
-  if cnts[0]
-    nnoremap <silent> <buffer> X :call <SID>revert()<cr>
-    echo "Press 'X' on each block to revert the update"
-  endif
-  normal! gg
-  setlocal nomodifiable
-endfunction
-
-function! s:revert()
-  if search('^Pending updates', 'bnW')
-    return
-  endif
-
-  let name = s:find_name(line('.'))
-  if empty(name) || !has_key(g:plugs, name) ||
-    \ input(printf('Revert the update of %s? (y/N) ', name)) !~? '^y'
-    return
-  endif
-
-  call s:system('git reset --hard HEAD@{1} && git checkout '.plug#shellescape(g:plugs[name].branch).' --', g:plugs[name].dir)
-  setlocal modifiable
-  normal! "_dap
-  setlocal nomodifiable
-  echo 'Reverted'
-endfunction
-
-function! s:snapshot(force, ...) abort
-  call s:prepare()
-  setf vim
-  call append(0, ['" Generated by vim-plug',
-                \ '" '.strftime("%c"),
-                \ '" :source this file in vim to restore the snapshot',
-                \ '" or execute: vim -S snapshot.vim',
-                \ '', '', 'PlugUpdate!'])
-  1
-  let anchor = line('$') - 3
-  let names = sort(keys(filter(copy(g:plugs),
-        \'has_key(v:val, "uri") && !has_key(v:val, "commit") && isdirectory(v:val.dir)')))
-  for name in reverse(names)
-    let sha = s:git_revision(g:plugs[name].dir)
-    if !empty(sha)
-      call append(anchor, printf("silent! let g:plugs['%s'].commit = '%s'", name, sha))
-      redraw
-    endif
-  endfor
-
-  if a:0 > 0
-    let fn = s:plug_expand(a:1)
-    if filereadable(fn) && !(a:force || s:ask(a:1.' already exists. Overwrite?'))
-      return
-    endif
-    call writefile(getline(1, '$'), fn)
-    echo 'Saved as '.a:1
-    silent execute 'e' s:esc(fn)
-    setf vim
-  endif
-endfunction
-
-function! s:split_rtp()
-  return split(&rtp, '\\\@<!,')
-endfunction
-
-let s:first_rtp = s:escrtp(get(s:split_rtp(), 0, ''))
-let s:last_rtp  = s:escrtp(get(s:split_rtp(), -1, ''))
-
-if exists('g:plugs')
-  let g:plugs_order = get(g:, 'plugs_order', keys(g:plugs))
-  call s:upgrade_specs()
-  call s:define_commands()
-endif
-
-let &cpo = s:cpo_save
-unlet s:cpo_save
diff --git a/nvim/.config/nvim/coc-settings.json b/nvim/.config/nvim/coc-settings.json
deleted file mode 100644
index 22d7cb7..0000000
--- a/nvim/.config/nvim/coc-settings.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "coc.source.OmniSharp.enable" : true,
-  "coc.source.OmniSharp.triggerCharacters": "."
-}
diff --git a/nvim/.config/nvim/colors/111015.vim b/nvim/.config/nvim/colors/111015.vim
deleted file mode 100644
index 9c6f017..0000000
--- a/nvim/.config/nvim/colors/111015.vim
+++ /dev/null
@@ -1,151 +0,0 @@
-" Vim color file
-" 111015
-" Created by  with ThemeCreator (https://github.com/mswift42/themecreator)
-
-hi clear
-
-if exists("syntax on")
-syntax reset
-endif
-
-set t_Co=256
-let g:colors_name = "111015"
-
-
-" Define reusable colorvariables.
-let s:bg="#111015"
-let s:fg="#b1b1b1"
-let s:fg2="#a3a3a3"
-let s:fg3="#959595"
-let s:fg4="#878787"
-let s:bg2="#242328"
-let s:bg3="#37363a"
-let s:bg4="#4a494d"
-let s:keyword="#a3d4e8"
-let s:builtin="#c4cbee"
-let s:const= "#a3d6cc"
-let s:comment="#5d5d5d"
-let s:func="#f1c1bd"
-let s:str="#e6c2db"
-let s:type="#c1d2b1"
-let s:var="#e1c9aa"
-let s:warning="#e81050"
-let s:warning2="#e86310"
-
-exe 'hi Normal guifg='s:fg' guibg='s:bg
-exe 'hi Cursor guifg='s:bg' guibg='s:fg
-exe 'hi CursorLine  guibg='s:bg2
-exe 'hi CursorLineNr guifg='s:str' guibg='s:bg
-exe 'hi CursorColumn  guibg='s:bg2
-exe 'hi ColorColumn  guibg='s:bg2
-exe 'hi LineNr guifg='s:fg2' guibg='s:bg2
-exe 'hi VertSplit guifg='s:fg3' guibg='s:bg3
-exe 'hi MatchParen guifg='s:warning2'  gui=underline'
-exe 'hi StatusLine guifg='s:fg2' guibg='s:bg3' gui=bold'
-exe 'hi Pmenu guifg='s:fg' guibg='s:bg2
-exe 'hi PmenuSel  guibg='s:bg3
-exe 'hi IncSearch guifg='s:bg' guibg='s:keyword
-exe 'hi Search   gui=underline'
-exe 'hi Directory guifg='s:const
-exe 'hi Folded guifg='s:fg4' guibg='s:bg
-exe 'hi WildMenu guifg='s:str' guibg='s:bg
-
-exe 'hi Boolean guifg='s:const
-exe 'hi Character guifg='s:const
-exe 'hi Comment guifg='s:comment
-exe 'hi Conditional guifg='s:keyword
-exe 'hi Constant guifg='s:const
-exe 'hi Todo guibg='s:bg
-exe 'hi Define guifg='s:keyword
-exe 'hi DiffAdd guifg=#fafafa guibg=#123d0f gui=bold'
-exe 'hi DiffDelete guibg='s:bg2
-exe 'hi DiffChange  guibg=#151b3c guifg=#fafafa'
-exe 'hi DiffText guifg=#ffffff guibg=#ff0000 gui=bold'
-exe 'hi ErrorMsg guifg='s:warning' guibg='s:bg2' gui=bold'
-exe 'hi WarningMsg guifg='s:fg' guibg='s:warning2
-exe 'hi Float guifg='s:const
-exe 'hi Function guifg='s:func
-exe 'hi Identifier guifg='s:type'  gui=italic'
-exe 'hi Keyword guifg='s:keyword'  gui=bold'
-exe 'hi Label guifg='s:var
-exe 'hi NonText guifg='s:bg4' guibg='s:bg2
-exe 'hi Number guifg='s:const
-exe 'hi Operator guifg='s:keyword
-exe 'hi PreProc guifg='s:keyword
-exe 'hi Special guifg='s:fg
-exe 'hi SpecialKey guifg='s:fg2' guibg='s:bg2
-exe 'hi Statement guifg='s:keyword
-exe 'hi StorageClass guifg='s:type'  gui=italic'
-exe 'hi String guifg='s:str
-exe 'hi Tag guifg='s:keyword
-exe 'hi Title guifg='s:fg'  gui=bold'
-exe 'hi Todo guifg='s:fg2'  gui=inverse,bold'
-exe 'hi Type guifg='s:type
-exe 'hi Underlined   gui=underline'
-
-" Neovim Terminal Mode
-let g:terminal_color_0 = s:bg
-let g:terminal_color_1 = s:warning
-let g:terminal_color_2 = s:keyword
-let g:terminal_color_3 = s:bg4
-let g:terminal_color_4 = s:func
-let g:terminal_color_5 = s:builtin
-let g:terminal_color_6 = s:fg3
-let g:terminal_color_7 = s:str
-let g:terminal_color_8 = s:bg2
-let g:terminal_color_9 = s:warning2
-let g:terminal_color_10 = s:fg2
-let g:terminal_color_11 = s:var
-let g:terminal_color_12 = s:type
-let g:terminal_color_13 = s:const
-let g:terminal_color_14 = s:fg4
-let g:terminal_color_15 = s:comment
-
-" Ruby Highlighting
-exe 'hi rubyAttribute guifg='s:builtin
-exe 'hi rubyLocalVariableOrMethod guifg='s:var
-exe 'hi rubyGlobalVariable guifg='s:var' gui=italic'
-exe 'hi rubyInstanceVariable guifg='s:var
-exe 'hi rubyKeyword guifg='s:keyword
-exe 'hi rubyKeywordAsMethod guifg='s:keyword' gui=bold'
-exe 'hi rubyClassDeclaration guifg='s:keyword' gui=bold'
-exe 'hi rubyClass guifg='s:keyword' gui=bold'
-exe 'hi rubyNumber guifg='s:const
-
-" Python Highlighting
-exe 'hi pythonBuiltinFunc guifg='s:builtin
-
-" Go Highlighting
-exe 'hi goBuiltins guifg='s:builtin
-let g:go_highlight_array_whitespace_error = 1
-let g:go_highlight_build_constraints      = 1
-let g:go_highlight_chan_whitespace_error  = 1
-let g:go_highlight_extra_types            = 1
-let g:go_highlight_fields                 = 1
-let g:go_highlight_format_strings         = 1
-let g:go_highlight_function_calls         = 1
-let g:go_highlight_function_parameters    = 1
-let g:go_highlight_functions              = 1
-let g:go_highlight_generate_tags          = 1
-let g:go_highlight_operators              = 1
-let g:go_highlight_space_tab_error        = 1
-let g:go_highlight_string_spellcheck      = 1
-let g:go_highlight_types                  = 1
-let g:go_highlight_variable_assignments   = 1
-let g:go_highlight_variable_declarations  = 1
-
-" Javascript Highlighting
-exe 'hi jsBuiltins guifg='s:builtin
-exe 'hi jsFunction guifg='s:keyword' gui=bold'
-exe 'hi jsGlobalObjects guifg='s:type
-exe 'hi jsAssignmentExps guifg='s:var
-
-" Html Highlighting
-exe 'hi htmlLink guifg='s:var' gui=underline'
-exe 'hi htmlStatement guifg='s:keyword
-exe 'hi htmlSpecialTagName guifg='s:keyword
-
-" Markdown Highlighting
-exe 'hi mkdCode guifg='s:builtin
-
-
diff --git a/nvim/.config/nvim/colors/Greymatters.vim b/nvim/.config/nvim/colors/Greymatters.vim
deleted file mode 100644
index 835e5ef..0000000
--- a/nvim/.config/nvim/colors/Greymatters.vim
+++ /dev/null
@@ -1,151 +0,0 @@
-" Vim color file
-" Greymatters
-" Created by  with ThemeCreator (https://github.com/mswift42/themecreator)
-
-hi clear
-
-if exists("syntax on")
-syntax reset
-endif
-
-set t_Co=256
-let g:colors_name = "Greymatters"
-
-
-" Define reusable colorvariables.
-let s:bg="#f9fbfd"
-let s:fg="#2f2f2f"
-let s:fg2="#404040"
-let s:fg3="#505050"
-let s:fg4="#616161"
-let s:bg2="#e5e7e9"
-let s:bg3="#d1d3d5"
-let s:bg4="#bdbfc0"
-let s:keyword="#3f567b"
-let s:builtin="#7b4135"
-let s:const= "#64502f"
-let s:comment="#949494"
-let s:func="#714355"
-let s:str="#305f5e"
-let s:type="#634575"
-let s:var="#3f5b32"
-let s:warning="#fa0c0c"
-let s:warning2="#fa7b0c"
-
-exe 'hi Normal guifg='s:fg' guibg='s:bg
-exe 'hi Cursor guifg='s:bg' guibg='s:fg
-exe 'hi CursorLine  guibg='s:bg2
-exe 'hi CursorLineNr guifg='s:str' guibg='s:bg
-exe 'hi CursorColumn  guibg='s:bg2
-exe 'hi ColorColumn  guibg='s:bg2
-exe 'hi LineNr guifg='s:fg2' guibg='s:bg2
-exe 'hi VertSplit guifg='s:fg3' guibg='s:bg3
-exe 'hi MatchParen guifg='s:warning2'  gui=underline'
-exe 'hi StatusLine guifg='s:fg2' guibg='s:bg3' gui=bold'
-exe 'hi Pmenu guifg='s:fg' guibg='s:bg2
-exe 'hi PmenuSel  guibg='s:bg3
-exe 'hi IncSearch guifg='s:bg' guibg='s:keyword
-exe 'hi Search   gui=underline'
-exe 'hi Directory guifg='s:const
-exe 'hi Folded guifg='s:fg4' guibg='s:bg
-exe 'hi WildMenu guifg='s:str' guibg='s:bg
-
-exe 'hi Boolean guifg='s:const
-exe 'hi Character guifg='s:const
-exe 'hi Comment guifg='s:comment
-exe 'hi Conditional guifg='s:keyword
-exe 'hi Constant guifg='s:const
-exe 'hi Todo guibg='s:bg
-exe 'hi Define guifg='s:keyword
-exe 'hi DiffAdd guifg=#000000 guibg=#bef6dc gui=bold'
-exe 'hi DiffDelete guifg='s:bg2
-exe 'hi DiffChange  guibg=#5b76ef guifg=#ffffff'
-exe 'hi DiffText guifg=#ffffff guibg=#ff0000 gui=bold'
-exe 'hi ErrorMsg guifg='s:warning' guibg='s:bg2' gui=bold'
-exe 'hi WarningMsg guifg='s:fg' guibg='s:warning2
-exe 'hi Float guifg='s:const
-exe 'hi Function guifg='s:func
-exe 'hi Identifier guifg='s:type'  gui=italic'
-exe 'hi Keyword guifg='s:keyword'  gui=bold'
-exe 'hi Label guifg='s:var
-exe 'hi NonText guifg='s:bg4' guibg='s:bg2
-exe 'hi Number guifg='s:const
-exe 'hi Operator guifg='s:keyword
-exe 'hi PreProc guifg='s:keyword
-exe 'hi Special guifg='s:fg
-exe 'hi SpecialKey guifg='s:fg2' guibg='s:bg2
-exe 'hi Statement guifg='s:keyword
-exe 'hi StorageClass guifg='s:type'  gui=italic'
-exe 'hi String guifg='s:str
-exe 'hi Tag guifg='s:keyword
-exe 'hi Title guifg='s:fg'  gui=bold'
-exe 'hi Todo guifg='s:fg2'  gui=inverse,bold'
-exe 'hi Type guifg='s:type
-exe 'hi Underlined   gui=underline'
-
-" Neovim Terminal Mode
-let g:terminal_color_0 = s:bg
-let g:terminal_color_1 = s:warning
-let g:terminal_color_2 = s:keyword
-let g:terminal_color_3 = s:bg4
-let g:terminal_color_4 = s:func
-let g:terminal_color_5 = s:builtin
-let g:terminal_color_6 = s:fg3
-let g:terminal_color_7 = s:str
-let g:terminal_color_8 = s:bg2
-let g:terminal_color_9 = s:warning2
-let g:terminal_color_10 = s:fg2
-let g:terminal_color_11 = s:var
-let g:terminal_color_12 = s:type
-let g:terminal_color_13 = s:const
-let g:terminal_color_14 = s:fg4
-let g:terminal_color_15 = s:comment
-
-" Ruby Highlighting
-exe 'hi rubyAttribute guifg='s:builtin
-exe 'hi rubyLocalVariableOrMethod guifg='s:var
-exe 'hi rubyGlobalVariable guifg='s:var' gui=italic'
-exe 'hi rubyInstanceVariable guifg='s:var
-exe 'hi rubyKeyword guifg='s:keyword
-exe 'hi rubyKeywordAsMethod guifg='s:keyword' gui=bold'
-exe 'hi rubyClassDeclaration guifg='s:keyword' gui=bold'
-exe 'hi rubyClass guifg='s:keyword' gui=bold'
-exe 'hi rubyNumber guifg='s:const
-
-" Python Highlighting
-exe 'hi pythonBuiltinFunc guifg='s:builtin
-
-" Go Highlighting
-exe 'hi goBuiltins guifg='s:builtin
-let g:go_highlight_array_whitespace_error = 1
-let g:go_highlight_build_constraints      = 1
-let g:go_highlight_chan_whitespace_error  = 1
-let g:go_highlight_extra_types            = 1
-let g:go_highlight_fields                 = 1
-let g:go_highlight_format_strings         = 1
-let g:go_highlight_function_calls         = 1
-let g:go_highlight_function_parameters    = 1
-let g:go_highlight_functions              = 1
-let g:go_highlight_generate_tags          = 1
-let g:go_highlight_operators              = 1
-let g:go_highlight_space_tab_error        = 1
-let g:go_highlight_string_spellcheck      = 1
-let g:go_highlight_types                  = 1
-let g:go_highlight_variable_assignments   = 1
-let g:go_highlight_variable_declarations  = 1
-
-" Javascript Highlighting
-exe 'hi jsBuiltins guifg='s:builtin
-exe 'hi jsFunction guifg='s:keyword' gui=bold'
-exe 'hi jsGlobalObjects guifg='s:type
-exe 'hi jsAssignmentExps guifg='s:var
-
-" Html Highlighting
-exe 'hi htmlLink guifg='s:var' gui=underline'
-exe 'hi htmlStatement guifg='s:keyword
-exe 'hi htmlSpecialTagName guifg='s:keyword
-
-" Markdown Highlighting
-exe 'hi mkdCode guifg='s:builtin
-
-
diff --git a/nvim2/.config/nvim/init.lua b/nvim/.config/nvim/init.lua
similarity index 100%
rename from nvim2/.config/nvim/init.lua
rename to nvim/.config/nvim/init.lua
diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim
deleted file mode 100644
index 22df3b8..0000000
--- a/nvim/.config/nvim/init.vim
+++ /dev/null
@@ -1,157 +0,0 @@
-"  _   _         __     ___           
-" | \ | | ___  __\ \   / (_)_ __ ___  
-" |  \| |/ _ \/ _ \ \ / /| | '_ ` _ \ 
-" | |\  |  __/ (_) \ V / | | | | | | |
-" |_| \_|\___|\___/ \_/  |_|_| |_| |_|
-
-
-call plug#begin('~/.config/nvim/plugged')
-	" Misc
-	Plug 'vim-scripts/fountain.vim'
-	Plug 'preservim/nerdtree'
-	Plug 'numToStr/Comment.nvim'
-	Plug 'andweeb/presence.nvim'
-
-	" LS
-	" Plug 'neoclide/coc.nvim', {'branch': 'release'}
-	Plug 'nvim-lua/completion-nvim'
-	Plug 'neovim/nvim-lspconfig'
-
-	" Lang support
-	Plug 'tpope/vim-markdown'
-	Plug 'ap/vim-css-color' 
-	Plug 'axelf4/vim-haskell'
-	Plug 'pantharshit00/vim-prisma'
-	Plug 'mikelue/vim-maven-plugin'
-	Plug 'sheerun/vim-polyglot'
-	Plug 'ngmy/vim-rubocop'
-	Plug 'lervag/vimtex' 
-	Plug 'arakashic/chromatica.nvim'
-	Plug 'slim-template/vim-slim'
-	Plug 'OmniSharp/omnisharp-vim'
-	Plug 'ARM9/arm-syntax-vim'
-	
-	" Themes
-	Plug 'ellisonleao/gruvbox.nvim'
-	Plug 'sainnhe/gruvbox-material'
-	Plug 'projekt0n/github-nvim-theme'
-	Plug 'chriskempson/base16-vim'
-
-	" Lua Line
-	Plug 'nvim-lualine/lualine.nvim'
-	Plug 'kyazdani42/nvim-web-devicons'
-call plug#end() 
-
-set nocompatible
-set showmatch 	
-set ignorecase	
-
-" Mouse
-set mouse=a	
-" map <ScrollWheelUp> <C-Y>
-" map <ScrollWheelDown> <C-E>
-
-set hlsearch
-set autoindent	
-filetype plugin indent on  
-syntax on		
-
-set autoindent
-set noexpandtab 
-set tabstop=4
-set shiftwidth=4
-
-" Dumb shit
-let g:ruby_recommended_style = 0
-
-" Binds
-" Tabs
-vmap <Tab> >gv
-vmap <S-Tab> <gv
-
-" NERDTree
-nmap <silent> <C-D> :NERDTreeToggle<CR> 
-
-set clipboard+=unnamedplus
-
-" Theme
-" set background=dark
-colorscheme base16-tomorrow-night
-let &showbreak = '↳ '
-set laststatus=0 ruler
-set nu
-
-" hi Normal guibg=NONE ctermbg=NONE
-" hi EndOfBuffer guibg=NONE ctermbg=NONE
-" hi TabLine guibg=NONE ctermbg=NONE
-" " hi TabLineSel ctermfg=223 guibg=NONE ctermbg=NONE 
-" hi TabLineFill guibg=NONE ctermbg=NONE
-
-hi StatusLine ctermbg=NONE guibg=NONE
-
-highlight clear LineNr
-highlight LineNr ctermfg=NONE ctermbg=NONE
-
-" Airline
-let g:airline_theme='github_light'
-
-" Color stuff
-set encoding=UTF-8
-autocmd FileType * setlocal formatoptions-=c formatoptions-=r formatoptions-=o
-if (empty($TMUX))
-	if (has("nvim"))
-		let $NVIM_TUI_ENABLE_TRUE_COLOR=1
-	endif
-	if (has("termguicolors"))
-		set termguicolors
-	endif
-endif
-
-" COC
-let g:coc_global_extensions = ['coc-prettier', 'coc-tsserver', 'coc-solargraph', 'coc-sh', 'coc-json', 'coc-html', 'coc-css', 'coc-cmake', 'coc-emmet', 'coc-vimtex']
-" 'coc-clangd'
-" 'coc-pyright'
-
-
-" VIMTEX stuff
-let g:vimtex_view_method = 'zathura'
-
-" Or with a generic interface:
-let g:vimtex_view_general_viewer = 'zathura'
-let g:vimtex_view_general_options = '--unique file:@pdf\#src:@line@tex'
-
-" Most VimTeX mappings rely on localleader and this can be changed with the
-" following line. The default is usually fine and is the symbol "\".
-let maplocalleader = ","
-set title
-
-
-" Lua crap
-lua << END
-require('lualine').setup()
-require('Comment').setup()
-----require('lspconfig').setup({})
-require("presence").setup({
-    -- General options
-    auto_update         = true,                       -- Update activity based on autocmd events (if `false`, map or manually execute `:lua package.loaded.presence:update()`)
-    neovim_image_text   = "Neovim", -- Text displayed when hovered over the Neovim image
-    main_image          = "neovim",                   -- Main image display (either "neovim" or "file")
-    client_id           = "793271441293967371",       -- Use your own Discord application client id (not recommended)
-    log_level           = nil,                        -- Log messages at or above this level (one of the following: "debug", "info", "warn", "error")
-    debounce_timeout    = 10,                         -- Number of seconds to debounce events (or calls to `:lua package.loaded.presence:update(<filename>, true)`)
-    enable_line_number  = false,                      -- Displays the current line number instead of the current project
-    blacklist           = {},                         -- A list of strings or Lua patterns that disable Rich Presence if the current file name, path, or workspace matches
-    buttons             = false,                       -- Configure Rich Presence button(s), either a boolean to enable/disable, a static table (`{{ label = "<label>", url = "<url>" }, ...}`, or a function(buffer: string, repo_url: string|nil): table)
-    file_assets         = {},                         -- Custom file asset definitions keyed by file names and extensions (see default config at `lua/presence/file_assets.lua` for reference)
-    show_time           = true,                       -- Show the timer
-
-    -- Rich Presence text options
-    editing_text        = "Editing %s",               -- Format string rendered when an editable file is loaded in the buffer (either string or function(filename: string): string)
-    file_explorer_text  = "Browsing %s",              -- Format string rendered when browsing a file explorer (either string or function(file_explorer_name: string): string)
-    git_commit_text     = "Committing changes",       -- Format string rendered when committing changes in git (either string or function(filename: string): string)
-    plugin_manager_text = "Managing plugins",         -- Format string rendered when managing plugins (either string or function(plugin_manager_name: string): string)
-    reading_text        = "Reading %s",               -- Format string rendered when a read-only or unmodifiable file is loaded in the buffer (either string or function(filename: string): string)
-    workspace_text      = "Working on %s",            -- Format string rendered when in a git repository (either string or function(project_name: string|nil, filename: string): string)
-    line_number_text    = "Line %s out of %s",        -- Format string rendered when `enable_line_number` is set to true (either string or function(line_number: number, line_count: number): string)
-})
-END
diff --git a/nvim/.config/nvim/lua/custom/chadrc.lua b/nvim/.config/nvim/lua/custom/chadrc.lua
deleted file mode 100644
index e71eeb2..0000000
--- a/nvim/.config/nvim/lua/custom/chadrc.lua
+++ /dev/null
@@ -1,6 +0,0 @@
-              local M = {}
-                M.ui = {
-                  theme = "onedark",
-               }
-              return M
-           
\ No newline at end of file
diff --git a/nvim2/.config/nvim/lua/evim/init.lua b/nvim/.config/nvim/lua/evim/init.lua
similarity index 100%
rename from nvim2/.config/nvim/lua/evim/init.lua
rename to nvim/.config/nvim/lua/evim/init.lua
diff --git a/nvim2/.config/nvim/lua/evim/packer.lua b/nvim/.config/nvim/lua/evim/packer.lua
similarity index 100%
rename from nvim2/.config/nvim/lua/evim/packer.lua
rename to nvim/.config/nvim/lua/evim/packer.lua
diff --git a/nvim2/.config/nvim/lua/evim/remap.lua b/nvim/.config/nvim/lua/evim/remap.lua
similarity index 100%
rename from nvim2/.config/nvim/lua/evim/remap.lua
rename to nvim/.config/nvim/lua/evim/remap.lua
diff --git a/nvim2/.config/nvim/plugin/packer_compiled.lua b/nvim/.config/nvim/plugin/packer_compiled.lua
similarity index 100%
rename from nvim2/.config/nvim/plugin/packer_compiled.lua
rename to nvim/.config/nvim/plugin/packer_compiled.lua

From 5f518c88c4d93874a34d9c8792facea2630962dc Mon Sep 17 00:00:00 2001
From: "E. Almqvist" <elalmqvist@gmail.com>
Date: Thu, 6 Apr 2023 19:05:19 +0200
Subject: [PATCH 7/7] HL-todo thing

---
 nvim/.config/nvim/lua/evim/packer.lua        | 96 +++++++++++---------
 nvim/.config/nvim/plugin/packer_compiled.lua | 10 ++
 2 files changed, 62 insertions(+), 44 deletions(-)

diff --git a/nvim/.config/nvim/lua/evim/packer.lua b/nvim/.config/nvim/lua/evim/packer.lua
index 02ca1c5..9e7c7af 100644
--- a/nvim/.config/nvim/lua/evim/packer.lua
+++ b/nvim/.config/nvim/lua/evim/packer.lua
@@ -1,52 +1,60 @@
 vim.cmd [[packadd packer.nvim]]
 
 return require("packer").startup(function(use)
-        -- Core
-        use "wbthomason/packer.nvim"
-        use("nvim-treesitter/nvim-treesitter", { run = ":TSUpdate" })
-        use {
-                "nvim-telescope/telescope.nvim", tag = "0.1.1",
-                requires = { { "nvim-lua/plenary.nvim" } }
-        }
-        use {
-                "numToStr/Comment.nvim",
-                config = function()
-                        require("Comment").setup()
-                end
-        }
+	-- Core
+	use "wbthomason/packer.nvim"
+	use("nvim-treesitter/nvim-treesitter", { run = ":TSUpdate" })
+	use {
+		"nvim-telescope/telescope.nvim", tag = "0.1.1",
+		requires = { { "nvim-lua/plenary.nvim" } }
+	}
+	use {
+		"numToStr/Comment.nvim",
+		config = function()
+			require("Comment").setup()
+		end
+	}
 
-        -- Themes
-        use "savq/melange-nvim"
-        use "chriskempson/base16-vim"
+	-- Themes
+	use "savq/melange-nvim"
+	use "chriskempson/base16-vim"
 
-        -- LSP
-        use {
-                "VonHeikemen/lsp-zero.nvim",
-                branch = "v2.x",
-                requires = {
-                        -- LSP Support
-                        { "neovim/nvim-lspconfig" }, -- Required
-                        {
-                                -- Optional
-                                "williamboman/mason.nvim",
-                                run = function()
-                                        pcall(vim.cmd, "MasonUpdate")
-                                end,
-                        },
-                        { "williamboman/mason-lspconfig.nvim" }, -- Optional
+	-- LSP
+	use {
+		"VonHeikemen/lsp-zero.nvim",
+		branch = "v2.x",
+		requires = {
+			-- LSP Support
+			{ "neovim/nvim-lspconfig" },             -- Required
+			{
+				-- Optional
+				"williamboman/mason.nvim",
+				run = function()
+					pcall(vim.cmd, "MasonUpdate")
+				end,
+			},
+			{ "williamboman/mason-lspconfig.nvim" },             -- Optional
 
-                        -- Autocompletion
-                        { "hrsh7th/nvim-cmp" },     -- Required
-                        { "hrsh7th/cmp-nvim-lsp" }, -- Required
-                        { "L3MON4D3/LuaSnip" },     -- Required
-                }
-        }
+			-- Autocompletion
+			{ "hrsh7th/nvim-cmp" },                 -- Required
+			{ "hrsh7th/cmp-nvim-lsp" },             -- Required
+			{ "L3MON4D3/LuaSnip" },                 -- Required
+		}
+	}
 
-        -- Misc
-        -- use "vimsence/vimsence"
-        use "andweeb/presence.nvim"
-        use {
-                'nvim-lualine/lualine.nvim',
-                requires = { 'nvim-tree/nvim-web-devicons', opt = true }
-        }
+	-- Misc
+	-- use "vimsence/vimsence"
+	use "andweeb/presence.nvim"
+	use {
+		'nvim-lualine/lualine.nvim',
+		requires = { 'nvim-tree/nvim-web-devicons', opt = true }
+	}
+
+	use {
+		"folke/todo-comments.nvim",
+		requires = "nvim-lua/plenary.nvim",
+		config = function()
+			require("todo-comments").setup({})
+		end
+	}
 end)
diff --git a/nvim/.config/nvim/plugin/packer_compiled.lua b/nvim/.config/nvim/plugin/packer_compiled.lua
index 8a928be..c5a47f2 100644
--- a/nvim/.config/nvim/plugin/packer_compiled.lua
+++ b/nvim/.config/nvim/plugin/packer_compiled.lua
@@ -160,10 +160,20 @@ _G.packer_plugins = {
     loaded = true,
     path = "/home/elal/.local/share/nvim/site/pack/packer/start/telescope.nvim",
     url = "https://github.com/nvim-telescope/telescope.nvim"
+  },
+  ["todo-comments.nvim"] = {
+    config = { "\27LJ\2\n?\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\18todo-comments\frequire\0" },
+    loaded = true,
+    path = "/home/elal/.local/share/nvim/site/pack/packer/start/todo-comments.nvim",
+    url = "https://github.com/folke/todo-comments.nvim"
   }
 }
 
 time([[Defining packer_plugins]], false)
+-- Config for: todo-comments.nvim
+time([[Config for todo-comments.nvim]], true)
+try_loadstring("\27LJ\2\n?\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\18todo-comments\frequire\0", "config", "todo-comments.nvim")
+time([[Config for todo-comments.nvim]], false)
 -- Config for: Comment.nvim
 time([[Config for Comment.nvim]], true)
 try_loadstring("\27LJ\2\n5\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\fComment\frequire\0", "config", "Comment.nvim")