diff --git a/.gitignore b/.gitignore
index 5527336695..144e07def0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@ sources_forked/yankring/doc/tags
 sources_non_forked/tlib/doc/tags
 sources_non_forked/ctrlp.vim/doc/tags*
 my_plugins/
+my_configs/
 my_configs.vim
 tags
 .DS_Store
diff --git a/README.md b/README.md
index 6477280b76..aa292c3dbb 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,4 @@
+
 ![VIM](https://dnp4pehkvoo6n.cloudfront.net/43c5af597bd5c1a64eb1829f011c208f/as/Ultimate%20Vimrc.svg)
 
 # The Ultimate vimrc
@@ -60,8 +61,7 @@ If you have vim aliased as `vi` instead of `vim`, make sure to either alias it:
 
 ## How to update to latest version?
 
-Just do a git rebase!
-
+Just do a git rebase! Python 3 is required.
 
     cd ~/.vim_runtime
     git reset --hard
@@ -107,6 +107,8 @@ I recommend reading the docs of these plugins to understand them better. Each pl
 * [vim-indent-guides](https://github.com/nathanaelkane/vim-indent-guides) Is a plugin for visually displaying indent levels in Vim
 * [editorconfig-vim](https://github.com/editorconfig/editorconfig-vim) EditorConfig helps maintain consistent coding styles for multiple developers working on the same project across various editors and IDEs
 * [copilot.vim](https://github.com/github/copilot.vim) Plugin for GitHub Copilot (AI autocompletion FTW 😅)
+* [vim-terraform](https://github.com/hashivim/vim-terraform) Plugin for syntax highlighting, indentation and more for HCL and Terraform-related files
+* [vim-wayland-clipboard](https://github.com/jasonccox/vim-wayland-clipboard) Plugin that allows Vim to integrate with the Wayland clipboard when using the `+` register
 
 
 ## Included color schemes
@@ -148,7 +150,10 @@ For instance, my `my_configs.vim` looks like this:
 
 	~/.vim_runtime > cat my_configs.vim
 	map <leader>ct :cd ~/Desktop/Todoist/todoist<cr>
-	map <leader>cw :cd ~/Desktop/Wedoist/wedoist<cr> 
+	map <leader>cw :cd ~/Desktop/Wedoist/wedoist<cr>
+
+To further structure your own stuff or to enable integration in *dotfile* managers like [chezmoi](https://chezmoi.io)
+place `.vim` files with `vimrc` matching syntax in the `~/.vim_runtime/my_configs/` directory. 
 
 You can also install your plugins, for instance, via pathogen you can install [vim-rails](https://github.com/tpope/vim-rails):
 
@@ -201,6 +206,7 @@ map <leader>bd :Bclose<cr>
 " Close all buffers
 map <leader>ba :1,1000 bd!<cr>
 ```	
+
 Useful mappings for managing tabs:
 ```vim	
 map <leader>tn :tabnew<cr>
@@ -256,7 +262,7 @@ vnoremap $e <esc>`>a`<esc>`<i`<esc>
 
 ### Insert mode mappings
 
-Quickly insert parenthesis/brackets/etc.:
+Quickly insert parenthesis/brackets/etc., disabled by default for Shell, PHP, and Perl and enabled by default for other files, can be toggled on and of by pressing `<leader>u`:
 ```vim
 inoremap $1 ()<esc>i
 inoremap $2 []<esc>i
@@ -289,7 +295,8 @@ cnoremap <C-N> <Down>
 
 Write the file as sudo (works only on Unix). Super useful when you open a file and you don't have permissions to save your changes. [Vim tip](http://vim.wikia.com/wiki/Su-write):
 
-    :W 
+    :W
+    :Wq
 
 ### Plugin related mappings
 
@@ -367,6 +374,7 @@ nmap <silent> <leader>a <Plug>(ale_next_wrap)
 nnoremap <leader>v :.GBrowse!<CR>
 xnoremap <leader>v :'<'>GBrowse!<CR>
 ```
+[copilot.vim](https://github.com/github/copilot.vim) is disabled by default. Setup with `:Copilot setup`. To enable it by default, add `let g:copilot_enabled = v:true` in `my_configs.vim`. To toggle it on and off, press `<leader>gc`
 ### Spell checking
 Pressing `<leader>ss` will toggle spell checking:
 ```vim
@@ -416,3 +424,4 @@ Maintaining this Vim configuration isn't my day job. Daily I am the founder/CEO
 
 PS: Using Vim isn't a requirement 😄
 
+
diff --git a/install_awesome_parameterized.sh b/install_awesome_parameterized.sh
index 1ca2ba5f95..5dacb4eaf3 100755
--- a/install_awesome_parameterized.sh
+++ b/install_awesome_parameterized.sh
@@ -6,6 +6,7 @@ cd $1
 
 VIMRC="\" DO NOT EDIT THIS FILE
 \" Add your own customizations in $1/my_configs.vim
+\" See $1/README.md \"How to include your own stuff\" for further options.
 
 set runtimepath+=$1
 
@@ -14,10 +15,20 @@ source $1/vimrcs/filetypes.vim
 source $1/vimrcs/plugins_config.vim
 source $1/vimrcs/extended.vim
 
-try
-  source $1/my_configs.vim
-catch
-endtry"
+let files = glob(\"$1/my_configs/*.vim\", 1, 1)
+if empty(files)
+  try
+    source $1/my_configs.vim
+  catch
+  endtry
+else
+  for file in files
+    try
+      execute 'source' fnameescape(file)
+    catch
+    endtry
+  endfor
+endif"
 
 if [ "$2" = "--all" ]; then
     USERS=$(ls -l /home | awk '{if(NR>1)print $9}')
diff --git a/install_awesome_vimrc.sh b/install_awesome_vimrc.sh
index 2946697722..56c7bb6962 100755
--- a/install_awesome_vimrc.sh
+++ b/install_awesome_vimrc.sh
@@ -5,6 +5,7 @@ cd ~/.vim_runtime
 
 echo '" DO NOT EDIT THIS FILE
 " Add your own customizations in ~/.vim_runtime/my_configs.vim
+" See ~/.vim_runtime/README.md "How to include your own stuff" for further options.
 
 set runtimepath+=~/.vim_runtime
 
@@ -12,9 +13,20 @@ source ~/.vim_runtime/vimrcs/basic.vim
 source ~/.vim_runtime/vimrcs/filetypes.vim
 source ~/.vim_runtime/vimrcs/plugins_config.vim
 source ~/.vim_runtime/vimrcs/extended.vim
-try
-  source ~/.vim_runtime/my_configs.vim
-catch
-endtry' > ~/.vimrc
+
+let files=glob("~/.vim_runtime/my_configs/*.vim", 1, 1)
+if empty(files)
+  try
+    source ~/.vim_runtime/my_configs.vim
+  catch
+  endtry
+else
+  for file in files
+    try
+      execute 'source' fnameescape(file)
+    catch
+    endtry
+  endfor
+endif' > ~/.vimrc
 
 echo "Installed the Ultimate Vim configuration successfully! Enjoy :-)"
diff --git a/sources_forked/vim-peepopen/plugin/peepopen.vim b/sources_forked/vim-peepopen/plugin/peepopen.vim
index eadb413eac..d5492ac3a1 100644
--- a/sources_forked/vim-peepopen/plugin/peepopen.vim
+++ b/sources_forked/vim-peepopen/plugin/peepopen.vim
@@ -47,7 +47,7 @@ noremap <unique> <script> <Plug>PeepOpen <SID>Launch
 noremap <SID>Launch :call <SID>LaunchPeepOpenViaVim()<CR>
 
 if !hasmapto('<Plug>PeepOpen')
-  map! <unique> <silent> <Leader>p <Plug>PeepOpen
+  cmap <unique> <silent> <Leader>p <Plug>PeepOpen
 endif
 
 let &cpo = s:save_cpo
diff --git a/sources_non_forked/vim-snipmate/doc/snipMate.txt b/sources_non_forked/vim-snipmate/doc/SnipMate.txt
similarity index 100%
rename from sources_non_forked/vim-snipmate/doc/snipMate.txt
rename to sources_non_forked/vim-snipmate/doc/SnipMate.txt
diff --git a/sources_non_forked/vim-terraform/.editorconfig b/sources_non_forked/vim-terraform/.editorconfig
new file mode 100644
index 0000000000..beffa3084e
--- /dev/null
+++ b/sources_non_forked/vim-terraform/.editorconfig
@@ -0,0 +1,11 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+trim_trailing_whitespace = false
diff --git a/sources_non_forked/vim-terraform/.gitignore b/sources_non_forked/vim-terraform/.gitignore
new file mode 100644
index 0000000000..8652beb276
--- /dev/null
+++ b/sources_non_forked/vim-terraform/.gitignore
@@ -0,0 +1,3 @@
+/doc/tags
+/vader.vim
+terraform-providers/
diff --git a/sources_non_forked/vim-terraform/.travis.yml b/sources_non_forked/vim-terraform/.travis.yml
new file mode 100644
index 0000000000..ee36642e5e
--- /dev/null
+++ b/sources_non_forked/vim-terraform/.travis.yml
@@ -0,0 +1,4 @@
+language: vim
+
+script: |
+  make
diff --git a/sources_non_forked/vim-terraform/CHANGELOG.md b/sources_non_forked/vim-terraform/CHANGELOG.md
new file mode 100644
index 0000000000..a7c9b56c70
--- /dev/null
+++ b/sources_non_forked/vim-terraform/CHANGELOG.md
@@ -0,0 +1,21 @@
+# vim-terraform CHANGELOG
+
+## Version 1.2.1 (February 5, 2015)
+
+-   Block indentation fix (thanks imkira@github)
+
+## Version 1.2.0 (December 12, 2014)
+
+-   Add Kevin Le's syntax highlighting
+
+## Version 1.1.0 (December 11, 2014)
+
+-   Remove syntax highlighting; see README.md
+
+## Version 1.0.1 (December 10, 2014)
+
+-   Make this work without the JSON plugin
+
+## Version 1.0.0 (December 10, 2014)
+
+-   Initial release
diff --git a/sources_non_forked/vim-terraform/CODE_OF_CONDUCT.md b/sources_non_forked/vim-terraform/CODE_OF_CONDUCT.md
new file mode 100644
index 0000000000..bc6ec6d0f4
--- /dev/null
+++ b/sources_non_forked/vim-terraform/CODE_OF_CONDUCT.md
@@ -0,0 +1,45 @@
+# Contributor Code of Conduct
+
+As contributors and maintainers of this project, and in the interest of
+fostering an open and welcoming community, we pledge to respect all people who
+contribute through reporting issues, posting feature requests, updating
+documentation, submitting pull requests or patches, and other activities.
+
+We are committed to making participation in this project a harassment-free
+experience for everyone, regardless of level of experience, gender, gender
+identity and expression, sexual orientation, disability, personal appearance,
+body size, race, ethnicity, age, religion, or nationality.
+
+Examples of unacceptable behavior by participants include:
+
+-   The use of sexualized language or imagery
+
+-   Personal attacks
+
+-   Trolling or insulting/derogatory comments
+
+-   Public or private harassment
+
+-   Publishing other's private information, such as physical or electronic
+    addresses, without explicit permission
+
+-   Other unethical or unprofessional conduct.
+
+Project maintainers have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct. By adopting this Code of Conduct, project
+maintainers commit themselves to fairly and consistently applying these
+principles to every aspect of managing this project. Project maintainers who do
+not follow or enforce the Code of Conduct may be permanently removed from the
+project team.
+
+This code of conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community.
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by opening an issue or contacting one or more of the project
+maintainers.
+
+This Code of Conduct is adapted from the [Contributor
+Covenant](http://contributor-covenant.org), version 1.2.0, available at
+<http://contributor-covenant.org/version/1/2/0/>
diff --git a/sources_non_forked/vim-terraform/CONTRIBUTING.md b/sources_non_forked/vim-terraform/CONTRIBUTING.md
new file mode 100644
index 0000000000..d642088cde
--- /dev/null
+++ b/sources_non_forked/vim-terraform/CONTRIBUTING.md
@@ -0,0 +1,35 @@
+# Contributing To My Vim Plugins
+
+I'm not a Vim wizard by any means, nor am I too proud to accept
+contributions that improve my code, so if you think you have a problem,
+improvement, or other contribution towards the betterment of Vim-kind,
+please file an issue or, where appropriate, a pull request.
+
+Before filing an issue, please read this article by my friends and
+former colleagues at Viget:
+
+<https://viget.com/extend/tips-for-writing-better-bug-reports>
+
+Keep in mind that I'm not paid to write Vim plugins, so I'm doing this
+in my spare time, which means it might take me a while to respond. If
+you're not satisfied with my response to your problem with my free (as
+in beer and in speech) software, I will give you triple your $0.00 back.
+
+When filing a pull request, please explain what you're changing and why.
+Please limit your changes to the specific thing you're fixing; it's
+probably easiest for both of us if you isolate your change in a topic
+branch that I can merge without pulling in other stuff. Please do not
+update CHANGELOG, versions, etc.; I'll take care of that. I'll also add
+you to the Credits list with my thanks.
+
+All of my Vim plugins use the ISC license. If you submit a pull request,
+I'll assume you are OK with any code you add being placed under that
+same ISC license. If this is not the case for any reason, please let me
+know why you can't tolerate the ISC license. I am 99.99% likely to
+reject your change in that case, but I'll let you have your say.
+
+This project is intended to be a safe, welcoming space for collaboration, and
+contributors are expected to adhere to the [Contributor
+Covenant](http://contributor-covenant.org) code of conduct.
+
+Thanks for contributing!
diff --git a/sources_non_forked/vim-terraform/LICENSE b/sources_non_forked/vim-terraform/LICENSE
new file mode 100644
index 0000000000..9f7428e11f
--- /dev/null
+++ b/sources_non_forked/vim-terraform/LICENSE
@@ -0,0 +1,13 @@
+Copyright (c) 2014-2016 Mark Cornick <mark@markcornick.com>
+
+Permission to use, copy, modify, and/or distribute this software for any purpose
+with or without fee is hereby granted, provided that the above copyright notice
+and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED 'AS IS' AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
+THIS SOFTWARE.
diff --git a/sources_non_forked/vim-terraform/Makefile b/sources_non_forked/vim-terraform/Makefile
new file mode 100644
index 0000000000..066558e77f
--- /dev/null
+++ b/sources_non_forked/vim-terraform/Makefile
@@ -0,0 +1,16 @@
+.PHONY: test test_deps
+.ONESHELL:
+.DEFAULTGOAL := test
+SHELL := /bin/bash
+TERM := xterm
+HOME := /dev/null
+VIMINIT :=
+
+test: test_deps
+	bash -c 'vim -Nu <( echo "set rtp+=vader.vim,.,./after | filetype plugin indent on | syntax enable") -c "silent Vader! test/*"'
+
+test_deps:
+	command -v git; \
+	RETVAL=$$?; \
+	if [ $$RETVAL != 0 ]; then echo "$$(tput bold)\`git\` executable was not found on the PATH. Please install \`git\`.$$(tput sgr0)"; exit 1; fi; \
+	if [ ! -d vader.vim ]; then	git clone https://github.com/junegunn/vader.vim.git; fi
diff --git a/sources_non_forked/vim-terraform/README.md b/sources_non_forked/vim-terraform/README.md
new file mode 100644
index 0000000000..1d3a10b3f5
--- /dev/null
+++ b/sources_non_forked/vim-terraform/README.md
@@ -0,0 +1,89 @@
+[![](https://img.shields.io/badge/Supports%20Terraform%20Version-%3E%3D1.0.0-blue.svg)](https://github.com/hashicorp/terraform/blob/v1.0.0/CHANGELOG.md)
+
+## Call For Maintainers
+
+This plugin, along with others like it, is now maintained by the
+[HashiVim](http://hashivim.github.io/) organization, which is looking for
+additional maintainers and contributors.
+See the HashiVim home page for further information.
+
+---
+
+## Overview: vim-terraform
+
+This plugin adds a `:Terraform` command that runs terraform, with tab completion
+of subcommands.
+It also provides syntax highlighting, indentation and more for HCL and
+Terraform-related files.
+
+---
+
+## Installation
+
+With [Vim packages](http://vimhelp.appspot.com/repeat.txt.html#packages):
+
+    git clone https://github.com/hashivim/vim-terraform.git ~/.vim/pack/plugins/start/vim-terraform
+
+If you prefer to use a plugin manager, go ahead.
+</details>
+
+---
+
+## Usage
+
+Settings are documented in the [help](doc).
+
+---
+
+## Updating vim-terraform
+
+Note, this is only for maintainers of the `vim-terraform` project.
+
+When a new version of Terraform drops, you can run the following where x.x.x is
+a version such as 0.11.11
+
+    ./update_automagic.sh x.x.x
+
+At this point, add the modified files to a git branch and open a pull request.
+
+    git checkout -b "feature/update-to-terraform-$VERSION"
+    git add $FILE
+    git commit -m "Message about update"
+    git push
+
+Add another maintainer to the pull request and await confirmation.
+
+---
+
+## Running tests
+
+To run the test suite and verify functionality
+
+    make
+
+---
+
+## Credits
+
+Syntax highlighting and indentation by Kevin Le (@bkad) based on prior work by
+Larry Gilbert (@L2G).
+The rest originally written by Mark Cornick <https://www.markcornick.com/> and
+contributors listed below.
+Licensed under the ISC license.
+
+Thanks to the following contributors:
+
+- michael j talarczyk (@mijit)
+- Koji Nakayama (@knakayama)
+- Kris (@kostecky)
+- Okumura Takahiro (@hfm)
+- Paul Forman (@pforman)
+- Lowe Schmidt (@lsc)
+- Mario Kozjak (@mkozjak)
+
+The `:TerraformFmt` command is adapted from
+[vim-hclfmt](https://github.com/fatih/vim-hclfmt/blob/master/autoload/fmt.vim).
+
+This project is intended to be a safe, welcoming space for collaboration, and
+contributors are expected to adhere to the [Contributor
+Covenant](http://contributor-covenant.org) code of conduct.
diff --git a/sources_non_forked/vim-terraform/autoload/hcl.vim b/sources_non_forked/vim-terraform/autoload/hcl.vim
new file mode 100644
index 0000000000..dfdca0bb8e
--- /dev/null
+++ b/sources_non_forked/vim-terraform/autoload/hcl.vim
@@ -0,0 +1,16 @@
+let s:cpo_save = &cpoptions
+set cpoptions&vim
+
+function! hcl#align() abort
+  let p = '^.*=[^>]*$'
+  if exists(':Tabularize') && getline('.') =~# '^.*=' && (getline(line('.')-1) =~# p || getline(line('.')+1) =~# p)
+    let column = strlen(substitute(getline('.')[0:col('.')],'[^=]','','g'))
+    let position = strlen(matchstr(getline('.')[0:col('.')],'.*=\s*\zs.*'))
+    Tabularize/=.*/l1
+    normal! 0
+    call search(repeat('[^=]*=',column).'\s\{-\}'.repeat('.',position),'ce',line('.'))
+  endif
+endfunction
+
+let &cpoptions = s:cpo_save
+unlet s:cpo_save
diff --git a/sources_non_forked/vim-terraform/autoload/terraform.vim b/sources_non_forked/vim-terraform/autoload/terraform.vim
new file mode 100644
index 0000000000..6ebfb0663f
--- /dev/null
+++ b/sources_non_forked/vim-terraform/autoload/terraform.vim
@@ -0,0 +1,69 @@
+let s:cpo_save = &cpoptions
+set cpoptions&vim
+
+" Ensure no conflict with arguments from the environment
+let $TF_CLI_ARGS_fmt=''
+
+function! terraform#fmt() abort
+  silent execute 'w !'.g:terraform_binary_path.' fmt -check -'
+  if v:shell_error == 0
+    return
+  endif
+
+  " Save the view.
+  let curw = winsaveview()
+
+  " Make a fake change so that the undo point is right.
+  normal! ix
+  normal! "_x
+
+  " Execute `terraform fmt`, redirecting stderr to a temporary file.
+  let tmpfile = tempname()
+  let shellredir_save = &shellredir
+  let &shellredir = '>%s 2>'.tmpfile
+  silent execute '%!'.g:terraform_binary_path.' fmt -no-color -'
+  let &shellredir = shellredir_save
+
+  " If there was an error, undo any changes and show stderr.
+  if v:shell_error != 0
+    silent undo
+    let output = readfile(tmpfile)
+    echo join(output, "\n")
+  endif
+
+  " Delete the temporary file, and restore the view.
+  call delete(tmpfile)
+  call winrestview(curw)
+endfunction
+
+function! terraform#commands(ArgLead, CmdLine, CursorPos) abort
+  let commands = [
+    \ 'init',
+    \ 'validate',
+    \ 'plan',
+    \ 'apply',
+    \ 'destroy',
+    \ 'console',
+    \ 'fmt',
+    \ 'force-unlock',
+    \ 'get',
+    \ 'graph',
+    \ 'import',
+    \ 'login',
+    \ 'logout',
+    \ 'output',
+    \ 'providers',
+    \ 'refresh',
+    \ 'show',
+    \ 'state',
+    \ 'taint',
+    \ 'test',
+    \ 'untaint',
+    \ 'version',
+    \ 'workspace'
+  \ ]
+  return join(commands, "\n")
+endfunction
+
+let &cpoptions = s:cpo_save
+unlet s:cpo_save
diff --git a/sources_non_forked/vim-terraform/doc/hcl.txt b/sources_non_forked/vim-terraform/doc/hcl.txt
new file mode 100644
index 0000000000..9c9f20086e
--- /dev/null
+++ b/sources_non_forked/vim-terraform/doc/hcl.txt
@@ -0,0 +1,21 @@
+*hcl.txt*  basic vim/hcl integration
+
+Author:  HashiVim <https://github.com/hashivim>
+License: ISC license
+Repo:    https://github.com/hashivim/vim-terraform
+
+
+                                      Type |gO| to see the table of contents.
+==============================================================================
+SETTINGS                                                 *hcl-settings*
+
+*g:hcl_align*
+    Allow vim-terraform to align settings automatically with Tabularize.
+    Default: 0
+
+*g:hcl_fold_sections*
+    Allow vim-terraform to automatically fold (hide until unfolded) sections of
+    hcl code.
+    Default: 0
+
+ vim:tw=78:et:ft=help:norl:
diff --git a/sources_non_forked/vim-terraform/doc/terraform.txt b/sources_non_forked/vim-terraform/doc/terraform.txt
new file mode 100644
index 0000000000..c291c41190
--- /dev/null
+++ b/sources_non_forked/vim-terraform/doc/terraform.txt
@@ -0,0 +1,41 @@
+*terraform.txt*  basic vim/terraform integration
+
+Author:  HashiVim <https://github.com/hashivim>
+License: ISC license
+Repo:    https://github.com/hashivim/vim-terraform
+
+
+                                      Type |gO| to see the table of contents.
+==============================================================================
+COMMANDS                                                 *terraform-commands*
+
+These commands are only available if terraform is in your PATH.
+
+                                                                 *:Terraform*
+`:Terraform` [args]         Invoke an arbitrary terraform command.
+
+                                                               *:TerraformFmt*
+`:TerraformFmt`             Invoke `terraform fmt` on a current buffer.
+
+==============================================================================
+SETTINGS                                                 *terraform-settings*
+
+*g:terraform_align*
+    Allow vim-terraform to align settings automatically with Tabularize.
+    Default: 0
+
+*g:terraform_binary_path*
+    Allow vim-terraform to use a custom path for the terraform binary.
+    Default: terraform
+
+*g:terraform_fmt_on_save*
+    Allow vim-terraform to automatically format *.tf and *.tfvars files with
+    terraform fmt. You can also do this manually with the `:TerraformFmt` command.
+    Default: 0
+
+*g:terraform_fold_sections*
+    Allow vim-terraform to automatically fold (hide until unfolded) sections of
+    terraform code.
+    Default: 0
+
+ vim:tw=78:et:ft=help:norl:
diff --git a/sources_non_forked/vim-terraform/ftdetect/hcl.vim b/sources_non_forked/vim-terraform/ftdetect/hcl.vim
new file mode 100644
index 0000000000..978a828b50
--- /dev/null
+++ b/sources_non_forked/vim-terraform/ftdetect/hcl.vim
@@ -0,0 +1,7 @@
+" vint: -ProhibitAutocmdWithNoGroup
+" By default, Vim associates .tf files with TinyFugue - tell it not to.
+silent! autocmd! filetypedetect BufRead,BufNewFile *.tf
+autocmd BufRead,BufNewFile *.hcl,*.tfbackend set filetype=hcl
+autocmd BufRead,BufNewFile .terraformrc,terraform.rc set filetype=hcl
+autocmd BufRead,BufNewFile *.tf,*.tofu,*.tfvars,*.tftest.hcl,*.tofutest.hcl set filetype=terraform
+autocmd BufRead,BufNewFile *.tfstate,*.tfstate.backup set filetype=json
diff --git a/sources_non_forked/vim-terraform/ftplugin/hcl.vim b/sources_non_forked/vim-terraform/ftplugin/hcl.vim
new file mode 100644
index 0000000000..5e055e7ed8
--- /dev/null
+++ b/sources_non_forked/vim-terraform/ftplugin/hcl.vim
@@ -0,0 +1,39 @@
+" hcl.vim - basic vim/hcl integration
+" Maintainer: HashiVim <https://github.com/hashivim>
+
+if exists('b:did_ftplugin') || v:version < 700 || &compatible
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpoptions
+set cpoptions&vim
+
+" j is a relatively recent addition; silence warnings when setting it.
+setlocal formatoptions-=t formatoptions+=croql
+silent! setlocal formatoptions+=j
+let b:undo_ftplugin = 'setlocal formatoptions<'
+
+if !has('patch-7.4.1142')
+  " Include hyphens as keyword characters so that a keyword appearing as
+  " part of a longer name doesn't get partially highlighted.
+  setlocal iskeyword+=-
+  let b:undo_ftplugin .= ' iskeyword<'
+endif
+
+if get(g:, 'hcl_fold_sections', 0)
+  setlocal foldmethod=syntax
+  let b:undo_ftplugin .= ' foldmethod<'
+endif
+
+" Set the commentstring
+setlocal commentstring=#\ %s
+let b:undo_ftplugin .= ' commentstring<'
+
+if get(g:, 'hcl_align', 0) && exists(':Tabularize')
+  inoremap <buffer> <silent> = =<Esc>:call hcl#align()<CR>a
+  let b:undo_ftplugin .= '|iunmap <buffer> ='
+endif
+
+let &cpoptions = s:cpo_save
+unlet s:cpo_save
diff --git a/sources_non_forked/vim-terraform/ftplugin/terraform.vim b/sources_non_forked/vim-terraform/ftplugin/terraform.vim
new file mode 100644
index 0000000000..01497b06ee
--- /dev/null
+++ b/sources_non_forked/vim-terraform/ftplugin/terraform.vim
@@ -0,0 +1,56 @@
+" terraform.vim - basic vim/terraform integration
+" Maintainer: HashiVim <https://github.com/hashivim>
+
+if exists('b:did_ftplugin') || v:version < 700 || &compatible
+  finish
+endif
+
+" Have only kept the terraform versions of these options for backwards
+" compatibility.
+if get(g:, 'terraform_fold_sections', 0)
+  let s:hcl_fold_sections_save = get(g:, 'hcl_fold_sections', 0)
+  let g:hcl_fold_sections=1
+end
+
+if get(g:, 'terraform_align', 0)
+  let s:hcl_align_save = get(g:, 'hcl_align', 0)
+  let g:hcl_align=1
+end
+
+runtime! ftplugin/hcl.vim
+
+if exists('s:hcl_align_save')
+  let g:hcl_align = s:hcl_align_save
+end
+if exists('s:hcl_fold_sections_save')
+  let g:hcl_fold_sections = s:hcl_fold_sections_save
+end
+
+if !exists('g:terraform_binary_path')
+  let g:terraform_binary_path='terraform'
+endif
+
+if !executable(g:terraform_binary_path)
+  finish
+endif
+
+let s:cpo_save = &cpoptions
+set cpoptions&vim
+
+command! -nargs=+ -complete=custom,terraform#commands -buffer Terraform
+  \ execute '!'.g:terraform_binary_path.' '.<q-args>.' -no-color'
+
+command! -nargs=0 -buffer TerraformFmt call terraform#fmt()
+let b:undo_ftplugin .= '|delcommand Terraform|delcommand TerraformFmt'
+
+if get(g:, 'terraform_fmt_on_save', 0)
+  augroup vim.terraform.fmt
+    autocmd!
+    autocmd BufWritePre *.tf call terraform#fmt()
+    autocmd BufWritePre *.tfvars call terraform#fmt()
+    autocmd BufWritePre *.tftest.hcl call terraform#fmt()
+  augroup END
+endif
+
+let &cpoptions = s:cpo_save
+unlet s:cpo_save
diff --git a/sources_non_forked/vim-terraform/indent/hcl.vim b/sources_non_forked/vim-terraform/indent/hcl.vim
new file mode 100644
index 0000000000..f96d8c64ca
--- /dev/null
+++ b/sources_non_forked/vim-terraform/indent/hcl.vim
@@ -0,0 +1,64 @@
+" Only load this file if no other indent file was loaded
+if exists('b:did_indent')
+  finish
+endif
+let b:did_indent = 1
+
+let s:cpo_save = &cpoptions
+set cpoptions&vim
+
+setlocal nolisp
+setlocal autoindent shiftwidth=2 tabstop=2 softtabstop=2 expandtab
+setlocal indentexpr=HclIndent(v:lnum)
+setlocal indentkeys+=<:>,0=},0=)
+let b:undo_indent = 'setlocal lisp< autoindent< shiftwidth< tabstop< softtabstop<'
+  \ . ' expandtab< indentexpr< indentkeys<'
+
+let &cpoptions = s:cpo_save
+unlet s:cpo_save
+
+if exists('*HclIndent')
+  finish
+endif
+
+let s:cpo_save = &cpoptions
+set cpoptions&vim
+
+function! HclIndent(lnum)
+  " Beginning of the file should have no indent
+  if a:lnum == 0
+    return 0
+  endif
+
+  " Usual case is to continue at the same indent as the previous non-blank line.
+  let prevlnum = prevnonblank(a:lnum-1)
+  let thisindent = indent(prevlnum)
+
+  " If that previous line is a non-comment ending in [ { (, increase the
+  " indent level.
+  let prevline = getline(prevlnum)
+  if prevline !~# '^\s*\(#\|//\)' && prevline =~# '[\[{\(]\s*$'
+    let thisindent += &shiftwidth
+  endif
+
+  " If the current line ends a block, decrease the indent level.
+  let thisline = getline(a:lnum)
+  if thisline =~# '^\s*[\)}\]]'
+    let thisindent -= &shiftwidth
+  endif
+
+  " If the previous line starts a block comment /*, increase by one
+  if prevline =~# '/\*'
+    let thisindent += 1
+  endif
+
+  " If the previous line ends a block comment */, decrease by one
+  if prevline =~# '\*/'
+    let thisindent -= 1
+  endif
+
+  return thisindent
+endfunction
+
+let &cpoptions = s:cpo_save
+unlet s:cpo_save
diff --git a/sources_non_forked/vim-terraform/indent/terraform.vim b/sources_non_forked/vim-terraform/indent/terraform.vim
new file mode 100644
index 0000000000..ee0810816e
--- /dev/null
+++ b/sources_non_forked/vim-terraform/indent/terraform.vim
@@ -0,0 +1,5 @@
+" Only load this file if no other indent file was loaded
+if exists('b:did_indent')
+  finish
+endif
+runtime! indent/hcl.vim
diff --git a/sources_non_forked/vim-terraform/syntax/hcl.vim b/sources_non_forked/vim-terraform/syntax/hcl.vim
new file mode 100644
index 0000000000..6718856a0e
--- /dev/null
+++ b/sources_non_forked/vim-terraform/syntax/hcl.vim
@@ -0,0 +1,75 @@
+" Forked from Larry Gilbert's syntax file
+" github.com/L2G/vim-syntax-terraform
+if exists('b:current_syntax')
+  finish
+endif
+
+let s:cpo_save = &cpoptions
+set cpoptions&vim
+
+" Identifiers are made up of alphanumeric characters, underscores, and
+" hyphens.
+if has('patch-7.4.1142')
+    syn iskeyword a-z,A-Z,48-57,_,-
+endif
+
+syn case match
+
+" A block is introduced by a type, some number of labels - which are either
+" strings or identifiers - and an opening curly brace.  Match the type.
+syn match hclBlockType /^\s*\zs\K\k*\ze\s\+\(\("\K\k*"\|\K\k*\)\s\+\)*{/
+
+" An attribute name is an identifier followed by an equals sign.
+syn match hclAttributeAssignment /\(\K\k*\.\)*\K\k*\s\+=\s/ contains=hclAttributeName
+syn match hclAttributeName /\<\K\k*\>/ contained
+
+syn keyword hclValueBool true false
+
+syn keyword hclTodo         contained TODO FIXME XXX BUG
+syn region  hclComment      start="#" end="$" contains=hclTodo,@Spell
+syn region  hclComment      start="//" end="$" contains=hclTodo,@Spell
+syn region  hclComment      start="/\*" end="\*/" contains=hclTodo,@Spell
+
+" misc.
+syn match hclValueDec      "\<[0-9]\+\([kKmMgG]b\?\)\?\>"
+syn match hclValueHexaDec  "\<0x[0-9a-f]\+\([kKmMgG]b\?\)\?\>"
+syn match hclBraces        "[\[\]]"
+
+" skip \" and \\ in strings.
+syn region hclValueString   start=/"/ skip=/\\\\\|\\"/ end=/"/ contains=hclStringInterp
+syn region hclStringInterp  matchgroup=hclBraces start=/\(^\|[^$]\)\$\zs{/ end=/}/ contained contains=ALLBUT,hclAttributeName
+syn region hclHereDocText   start=/<<-\?\z([a-z0-9A-Z]\+\)/ end=/^\s*\z1/ contains=hclStringInterp
+
+" Functions.
+syn match hclFunction "[a-z0-9_]\+(\@="
+
+" HCL2
+syn keyword hclRepeat         for in
+syn keyword hclConditional    if
+syn keyword hclValueNull      null
+
+" enable block folding
+syn region hclBlockBody matchgroup=hclBraces start="{" end="}" fold transparent
+
+hi def link hclComment           Comment
+hi def link hclTodo              Todo
+hi def link hclBraces            Delimiter
+hi def link hclAttributeName     Identifier
+hi def link hclBlockType         Type
+hi def link hclValueBool         Boolean
+hi def link hclValueDec          Number
+hi def link hclValueHexaDec      Number
+hi def link hclValueString       String
+hi def link hclHereDocText       String
+hi def link hclFunction          Function
+hi def link hclRepeat            Repeat
+hi def link hclConditional       Conditional
+hi def link hclValueNull         Constant
+
+" synchronize
+syntax sync ccomment hclComment
+
+let b:current_syntax = 'hcl'
+
+let &cpoptions = s:cpo_save
+unlet s:cpo_save
diff --git a/sources_non_forked/vim-terraform/syntax/terraform.vim b/sources_non_forked/vim-terraform/syntax/terraform.vim
new file mode 100644
index 0000000000..cf12253501
--- /dev/null
+++ b/sources_non_forked/vim-terraform/syntax/terraform.vim
@@ -0,0 +1,11 @@
+if exists('b:current_syntax')
+  finish
+endif
+runtime! syntax/hcl.vim
+unlet b:current_syntax
+
+syn keyword terraType           string bool number object tuple list map set any
+
+hi def link terraType           Type
+
+let b:current_syntax = 'terraform'
diff --git a/sources_non_forked/vim-terraform/test/syntax.vader b/sources_non_forked/vim-terraform/test/syntax.vader
new file mode 100644
index 0000000000..07ac5356bd
--- /dev/null
+++ b/sources_non_forked/vim-terraform/test/syntax.vader
@@ -0,0 +1,52 @@
+Before:
+  silent! set filetype=terraform
+
+Given terraform (user maps):
+  resource "aws_subnet" "dmz" {
+    cidr_block = "${var.dmz_subnet["${count.index}"]}" # Comment
+  }
+
+Execute (syntax is good):
+  AssertEqual 'hclStringInterp', SyntaxOf('count.index')
+
+  " Check it closed the string and went back to normal mode properly.
+  AssertEqual 'hclComment', SyntaxOf('Comment')
+
+
+Given terraform (heredoc syntax);
+provisioner "local-exec" {
+  command = <<CMD
+echo ${aws_instance.web.private_ip} >> private_ips.txt && \
+my_command
+CMD # Comment
+
+  tags = {}
+  }
+}
+;
+
+Execute (syntax is good):
+  AssertEqual 'hclStringInterp', SyntaxOf('aws_instance')
+  AssertEqual 'hclHereDocText', SyntaxOf('my_command')
+
+  " Closing CMD is still here doc
+  AssertEqual 'hclHereDocText', SyntaxOf('CMD', 2)
+
+  " block should be closed
+  AssertEqual 'hclComment', SyntaxOf('Comment')
+
+  " tags should reset syntax
+  AssertEqual '', SyntaxOf("tags")
+
+
+Given terraform (nested strings):
+  Name = "${var.environment == "staging" ? "sgn-stg-${var.application}" : "sgn-prd-${var.application}"}" # Comment
+  Other = "foo"
+
+Execute (syntax is good):
+  AssertEqual 'hclStringInterp', SyntaxOf('var.environment')
+  AssertEqual 'hclComment', SyntaxOf('Comment')
+  AssertEqual '', SyntaxAt(2, 1)
+
+Execute ("Cleanup"):
+  silent! unset filetype
diff --git a/sources_non_forked/vim-terraform/test/terraform_align.vader b/sources_non_forked/vim-terraform/test/terraform_align.vader
new file mode 100644
index 0000000000..13f8166521
--- /dev/null
+++ b/sources_non_forked/vim-terraform/test/terraform_align.vader
@@ -0,0 +1,25 @@
+Before:
+  silent! set filetype=terraform
+  silent! let g:terraform_align=1
+
+Given ("That g:terraform_align=1"):
+  You should never see me!
+
+Execute ("File syntax is set for terraform"):
+  AssertEqual "terraform", &ft
+
+Execute ("terraform_align is enabled"):
+  AssertEqual 1, g:terraform_align
+
+Execute ("We display the correct number of spaces when pressing tab"):
+  AssertEqual 2, &tabstop
+
+Execute ("We insert the correct number of spaces when pressing tab"):
+  AssertEqual 2, &softtabstop
+
+Execute ("Number of spaces for indentation"):
+  AssertEqual 2, &shiftwidth
+
+Execute ("Cleanup"):
+  silent! let g:terraform_align=0
+  silent! unset filetype
diff --git a/sources_non_forked/vim-terraform/test/terraform_fold_sections.vader b/sources_non_forked/vim-terraform/test/terraform_fold_sections.vader
new file mode 100644
index 0000000000..9200962053
--- /dev/null
+++ b/sources_non_forked/vim-terraform/test/terraform_fold_sections.vader
@@ -0,0 +1,16 @@
+Before:
+  silent! set filetype=terraform
+  silent! let g:terraform_fold_sections=1
+
+Given ("That g:terraform_fold_sections=1"):
+  You should never see me!
+
+Execute ("File syntax is set for terraform"):
+  AssertEqual "terraform", &ft
+
+Execute ("terraform_fold_sections is enabled"):
+  AssertEqual 1, g:terraform_fold_sections
+
+Execute ("Cleanup"):
+  silent! let g:terraform_fold_sections=0
+  silent! unset filetype
diff --git a/sources_non_forked/vim-terraform/update_automagic.sh b/sources_non_forked/vim-terraform/update_automagic.sh
new file mode 100755
index 0000000000..5c79ecee53
--- /dev/null
+++ b/sources_non_forked/vim-terraform/update_automagic.sh
@@ -0,0 +1,42 @@
+#!/bin/bash
+set -euo pipefail
+
+function usage {
+  echo -e "
+    USAGE EXAMPLES:
+
+        ./$(basename "$0") 0.8.7
+        ./$(basename "$0") 0.9.2
+    "
+}
+
+if [ $# -ne 1 ]; then
+  usage
+  exit 1
+fi
+
+VERSION=${1}
+
+PLATFORM=$(uname | tr "[:upper:]" "[:lower:]")
+
+echo "+) Acquiring terraform-${VERSION}"
+if [ ! -f "terraform_${VERSION}_${PLATFORM}_amd64.zip" ]; then
+  curl -O "https://releases.hashicorp.com/terraform/${VERSION}/terraform_${VERSION}_${PLATFORM}_amd64.zip"
+fi
+
+echo "+) Extracting terraform-${VERSION}.tar.gz"
+rm -f terraform
+unzip "terraform_${VERSION}_${PLATFORM}_amd64.zip"
+
+echo "+) Running update_commands.rb"
+./update_commands.rb
+
+echo "+) Updating the badge in the README.md"
+sed -i "/img.shields.io/c\[\![](https://img.shields.io/badge/Supports%20Terraform%20Version-%3E%3D${VERSION}-blue.svg)](https://github.com/hashicorp/terraform/blob/v${VERSION}/CHANGELOG.md)" README.md
+
+echo "+) Cleaning up after ourselves"
+rm -f "terraform_${VERSION}_${PLATFORM}_amd64.zip"
+rm -f terraform
+rm -rf "terraform-${VERSION}"
+
+git status
diff --git a/sources_non_forked/vim-terraform/update_commands.rb b/sources_non_forked/vim-terraform/update_commands.rb
new file mode 100755
index 0000000000..f394e1c015
--- /dev/null
+++ b/sources_non_forked/vim-terraform/update_commands.rb
@@ -0,0 +1,42 @@
+#!/usr/bin/env ruby
+
+# Use this script to update the commands auto-completed in autoload/terraform.vim.
+
+require 'open3'
+
+command_re = /^\s{2}([a-z0-9]\S*)/
+plugin_file = 'autoload/terraform.vim'
+
+# Create the list of commands.
+
+if File.file?('./terraform')
+    stdout, stderr, _status = Open3.capture3('./terraform -help')
+else
+    stdout, stderr, _status = Open3.capture3('terraform -help')
+end
+
+output = if stderr == ''
+           stdout.split("\n")
+         else
+           stderr.split("\n")
+         end
+commands = output.collect do |l|
+  match = command_re.match(l)
+  "    \\ '#{match[1]}'" if match
+end.reject(&:nil?).join(",\n")
+
+# Read in the existing plugin file.
+plugin = File.open(plugin_file, 'r').readlines
+
+# Replace the commands lines with our new list.
+first = plugin.index { |l| /^  let commands = \[/.match(l) } + 1
+last = plugin.index { |l| /^  \\ \]\n/.match(l) }
+plugin.slice!(first, last - first)
+commands.split("\n").reverse_each do |r|
+  plugin.insert(first, r)
+end
+
+# Write the plugin file back out.
+File.open(plugin_file, 'w') do |f|
+  f.puts plugin
+end
diff --git a/sources_non_forked/vim-wayland-clipboard/CHANGELOG.md b/sources_non_forked/vim-wayland-clipboard/CHANGELOG.md
new file mode 100644
index 0000000000..a7beef110c
--- /dev/null
+++ b/sources_non_forked/vim-wayland-clipboard/CHANGELOG.md
@@ -0,0 +1,21 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+
+## [0.2.1] - 2022-02-18
+### Fixed
+- Don't print control characters on screen from system calls to `wl-copy`/`wl-paste`.
+
+## [0.2.0] - 2021-04-30
+### Added
+- Make `ctrl-r+` and friends work in insert mode.
+### Fixed
+- Corrected check for `clipboard` feature.
+
+## [0.1.0] - 2021-04-27
+### Added
+- Start maintaining versions and a changelog.
diff --git a/sources_non_forked/vim-wayland-clipboard/LICENSE b/sources_non_forked/vim-wayland-clipboard/LICENSE
new file mode 100644
index 0000000000..ea64429ad2
--- /dev/null
+++ b/sources_non_forked/vim-wayland-clipboard/LICENSE
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2021 Jason Cox
+
+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.
diff --git a/sources_non_forked/vim-wayland-clipboard/README.md b/sources_non_forked/vim-wayland-clipboard/README.md
new file mode 100644
index 0000000000..7f59196c07
--- /dev/null
+++ b/sources_non_forked/vim-wayland-clipboard/README.md
@@ -0,0 +1,89 @@
+# vim-wayland-clipboard
+
+**[jasoncarloscox.com/creations/vim-wayland-clipboard](https://jasoncarloscox.com/creations/vim-wayland-clipboard/)**
+
+This plugin allows Vim to integrate with the Wayland clipboard when using the `+` register. This means you can yank text into the `+` register and paste it in other Wayland programs, or copy text in other Wayland programs and paste it in Vim from the `+` register. Operators and counts work, too!
+
+When running Vim outside of Wayland, the `+` register continues to work as normal.
+
+## Requirements
+
+For this plugin to work, you need [wl-clipboard](https://github.com/bugaevc/wl-clipboard) installed, and Vim must be compiled with the `+eval` feature.
+
+## Installation
+
+Use Vim8's built-in packages:
+
+1. `mkdir -p ~/.vim/pack/vim-wayland-clipboard/start/`
+2. `git clone https://github.com/jasonccox/vim-wayland-clipboard.git ~/.vim/pack/vim-wayland-clipboard/start/vim-wayland-clipboard`
+
+Or use a package manager. For example, with [vim-plug](https://github.com/junegunn/vim-plug):
+
+```vimscript
+Plug 'jasonccox/vim-wayland-clipboard'
+```
+
+## Usage and Features
+
+Just use `"+y`, `"+p`, `<C-R>+`, and friends as you always do. Specifically, here's what's supported:
+
+- Any yank command that starts with `"+` (e.g. `"+yy` or `"+yiw`) in insert and visual modes.
+- Pasting in normal and visual modes with `"+p` or `"+P`.
+- Pasting in insert mode with `<C-R>+`, `<C-R><C-R>+`, `<C-R><C-O>+`, or `<C-R><C-P>+`.
+- Yanking and pasting (`p` and `P` in normal and visual modes) with `clipboard=unnamedplus` or `g:wayland_clipboard_unnamedplus = 1`.
+
+If you need more functionality, consider checking out [vim-fakeclip](https://github.com/kana/vim-fakeclip).
+
+## Notes
+
+### Passing extra arguments to `wl-copy` or `wl-paste`
+
+If you want to pass extra arguments to `wl-copy`, set `g:wayland_clipboard_copy_args` to a list of strings, one per argument. For example, to copy to the primary clipboard and only allow the contents to be pasted once, you could do the following:
+
+```vimscript
+let g:wayland_clipboard_copy_args = ['--primary', '--paste-once']
+```
+
+To pass extra arguments to `wl-paste`, use `g:wayland_clipboard_paste_args` in the same way.
+
+### Using a different clipboard backend
+
+If you want a different backend to manage your clipboard operations, there are the `g:wayland_clipboard_copy_command`
+and `g:wayland_clipboard_paste_command` variables, which can be used together with the aforementioned
+`g:wayland_clipboard_copy_args` and `g:wayland_clipboard_paste_args`.
+
+As an example, a *KDE Plasma 6* user might want to integrate the Klipper D-Bus service, usually loaded
+at the startup by the desktop environment itself:
+
+```vimscript
+let g:wayland_clipboard_copy_command = 'qdbus6'
+let g:wayland_clipboard_paste_command = 'qdbus6'
+
+let g:wayland_clipboard_copy_args = ['org.kde.klipper', '/klipper', 'setClipboardContents']
+let g:wayland_clipboard_paste_args = ['org.kde.klipper', '/klipper', 'getClipboardContents']
+```
+
+Of course, this would work the same under *KDE Plasma 5*, just replace *qdbus6* with *qdbus*,
+the arguments can stay the same:
+
+```vimscript
+let g:wayland_clipboard_copy_command = 'qdbus'
+let g:wayland_clipboard_paste_command = 'qdbus'
+
+let g:wayland_clipboard_copy_args = ['org.kde.klipper', '/klipper', 'setClipboardContents']
+let g:wayland_clipboard_paste_args = ['org.kde.klipper', '/klipper', 'getClipboardContents']
+```
+
+### Clobbering the `w` Register
+
+On Vim builds without `clipboard`, or if Xwayland isn't running, the `+` register doesn't work for yanking. My solution is to map `"+` to `"w` and send the `w` register to the Wayland clipboard as well. (This only occurs when the `clipboard` feature is missing or the X `$DISPLAY` environment vairable is empty.) If you use the `w` register for other things and don't want it to clobber your system clipboard, put `let g:wayland_clipboard_no_plus_to_w = 1` in your `vimrc` to disable this feature.
+
+### Non-recursive Mappings
+
+This plugin uses mappings of `"+p`, `<C-R>+`, `"+`, etc. to do its job. As a result, it won't work with existing *non-recursive* mappings that run these commands, e.g. `nnoremap <Leader>p "+p`. If you have mappings like these, you'll need to use their recursive counterparts instead for the plugin to work.
+
+## Contributing
+
+Contributions are welcome! You can send questions, bug reports, patches, etc. by email to [~jcc/public-inbox@lists.sr.ht](https://lists.sr.ht/~jcc/public-inbox). (Don't know how to contribute via email? Check out the interactive tutorial at [git-send-email.io](https://git-send-email.io), or [email me](mailto:me@jasoncarloscox.com) for help.)
+
+GitHub issues and pull requests are fine, too.
diff --git a/sources_non_forked/vim-wayland-clipboard/plugin/wayland_clipboard.vim b/sources_non_forked/vim-wayland-clipboard/plugin/wayland_clipboard.vim
new file mode 100644
index 0000000000..65d210f593
--- /dev/null
+++ b/sources_non_forked/vim-wayland-clipboard/plugin/wayland_clipboard.vim
@@ -0,0 +1,119 @@
+" wayland-clipboard.vim - Integrate with Wayland's clipboard when using the '+'
+" register. Requires wl-clipboard and the +eval and +clipboard Vim features.
+"
+" This script was inspired by
+" https://www.reddit.com/r/Fedora/comments/ax9p9t/vim_and_system_clipboard_under_wayland/
+" but uses an autocmd to allow yanking with operators to work.
+
+" Early exit checks {{{
+
+" only load this script once
+if exists('g:loaded_wayland_clipboard')
+    finish
+endif
+let g:loaded_wayland_clipboard = 1
+
+" only run this in Vim on Wayland -- Vim on X has native clipboard support,
+" and Neovim already works with wl-copy by default
+if has('nvim') || empty($WAYLAND_DISPLAY)
+    finish
+endif
+
+" }}}
+
+" Yanking {{{
+
+" The '+' register doesn't work for yanking if:
+" - vim was built without 'clipboard'.
+" - x11 / xwayland is unavailable.
+" (https://github.com/vim/vim/blob/93197fde0f1db09b1e495cf3eb14a8f42c318b80/src/register.c#L247)
+"
+" My solution is to map '"+' to '"w' and send the 'w' register to the
+" Wayland clipboard as well.
+"
+" This variable controls whether '"+' gets mapped to '"w'. It's on by default
+" if the 'clipboard' feature isn't available, or if $DISPLAY isn't set,
+" but the user can turn it off always if desired.
+let s:plus_to_w = (!has('clipboard') || empty($DISPLAY)) && !exists('g:wayland_clipboard_no_plus_to_w')
+
+" remap '"+' to '"w' -- this will only apply to yanking since '"+p' and '"+P'
+" are also remapped below
+if s:plus_to_w
+    nnoremap "+ "w
+    vnoremap "+ "w
+endif
+
+let s:copy_command = exists('g:wayland_clipboard_copy_command') ? g:wayland_clipboard_copy_command : 'wl-copy'
+let s:copy_args = exists('g:wayland_clipboard_copy_args') ? g:wayland_clipboard_copy_args : []
+
+function! s:unnamedplus()
+    return &clipboard =~ 'unnamedplus'
+        \ || (exists('g:wayland_clipboard_unnamedplus') && g:wayland_clipboard_unnamedplus)
+endfunction
+
+" pass register contents to wl-copy if the '+' (or 'w') register was used
+function! s:WaylandYank()
+    if v:event['regname'] == '+' ||
+                \ (v:event['regname'] == 'w' && s:plus_to_w) ||
+                \ (v:event['regname'] == '' && s:unnamedplus())
+        let job = job_start([s:copy_command] + s:copy_args, {
+            \   "in_io": "pipe", "out_io": "null", "err_io": "null",
+            \   "stoponexit": "",
+            \ })
+        call ch_sendraw(job, getreg(v:event['regname']))
+        call ch_close(job)
+    endif
+endfunction
+
+" run s:WaylandYank() after every time text is yanked
+augroup waylandyank
+    autocmd!
+    autocmd TextYankPost * call s:WaylandYank()
+augroup END
+
+" }}}
+
+" Pasting {{{
+
+" remap paste commands to first pull in clipboard contents with wl-paste
+
+let s:paste_command = exists('g:wayland_clipboard_paste_command') ? g:wayland_clipboard_paste_command : 'wl-paste --no-newline'
+let s:paste_args = exists('g:wayland_clipboard_paste_args') ? g:wayland_clipboard_paste_args : []
+let s:paste_args_str = empty(s:paste_args) ? '' : ' ' . join(s:paste_args)
+
+function! s:clipboard_to_unnamed()
+    silent let @"=substitute(system(s:paste_command . s:paste_args_str), "\r", '', 'g')
+endfunction
+
+function! s:put(p, fallback)
+    if a:fallback
+        return a:p
+    endif
+
+    call s:clipboard_to_unnamed()
+    return '""' . a:p
+endfunction
+
+function! s:ctrl_r(cr)
+    call s:clipboard_to_unnamed()
+    return a:cr . '"'
+endfunction
+
+nnoremap <expr> <silent> "+p <SID>put('p', v:false)
+nnoremap <expr> <silent> "+P <SID>put('P', v:false)
+nnoremap <expr> <silent> p <SID>put('p', !<SID>unnamedplus())
+nnoremap <expr> <silent> P <SID>put('P', !<SID>unnamedplus())
+
+vnoremap <expr> <silent> "+p <SID>put('p', v:false)
+vnoremap <expr> <silent> "+P <SID>put('P', v:false)
+vnoremap <expr> <silent> p <SID>put('p', !<SID>unnamedplus())
+vnoremap <expr> <silent> P <SID>put('P', !<SID>unnamedplus())
+
+inoremap <expr> <silent> <C-R>+ <SID>ctrl_r("\<C-R>")
+inoremap <expr> <silent> <C-R><C-R>+ <SID>ctrl_r("\<C-R>\<C-R>")
+inoremap <expr> <silent> <C-R><C-O>+ <SID>ctrl_r("\<C-R>\<C-O>")
+inoremap <expr> <silent> <C-R><C-P>+ <SID>ctrl_r("\<C-R>\<C-P>")
+
+" }}}
+
+" vim:foldmethod=marker:foldlevel=0
diff --git a/update_plugins.py b/update_plugins.py
index c2e8e72405..8f637b7086 100644
--- a/update_plugins.py
+++ b/update_plugins.py
@@ -56,6 +56,8 @@
 editorconfig-vim https://github.com/editorconfig/editorconfig-vim
 dracula https://github.com/dracula/vim
 copilot.vim https://github.com/github/copilot.vim
+vim-terraform https://github.com/hashivim/vim-terraform
+vim-wayland-clipboard https://github.com/jasonccox/vim-wayland-clipboard
 """.strip()
 
 GITHUB_ZIP = "%s/archive/master.zip"
diff --git a/vimrcs/basic.vim b/vimrcs/basic.vim
index 349d328145..f987670396 100644
--- a/vimrcs/basic.vim
+++ b/vimrcs/basic.vim
@@ -50,12 +50,17 @@ nmap <leader>w :w!<cr>
 
 " :W sudo saves the file
 " (useful for handling the permission-denied error)
-command! W execute 'w !sudo tee % > /dev/null' <bar> edit!
+command! W execute 'w !sudo tee "%" > /dev/null' <bar> edit!
+command! Wq execute 'w !sudo tee "%" > /dev/null' <bar> edit! <bar> q
 
 
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " => VIM user interface
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" Add lines of hybrid number to the left
+set number
+set relativenumber
+
 " Set 7 lines to the cursor - when moving vertically using j/k
 set so=7
 
@@ -173,6 +178,21 @@ set nowb
 set noswapfile
 
 
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" => Clipboard
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" Let yanks/deletes go to both internal default register and system clipboard
+set clipboard=unnamedplus,unnamed
+
+
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" => Mouse
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" Enable click to move the cursor, scroll, select, resize splits with ,k for manual toggling
+set mouse=a
+nnoremap <silent> <leader>k :if &mouse ==# 'a' \| set mouse= \| else \| set mouse=a \| endif<CR>
+
+
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " => Text, tab and indent related
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
diff --git a/vimrcs/extended.vim b/vimrcs/extended.vim
index 8b1284fd78..6076a1f32b 100644
--- a/vimrcs/extended.vim
+++ b/vimrcs/extended.vim
@@ -87,14 +87,49 @@ vnoremap $$ <esc>`>a"<esc>`<i"<esc>
 vnoremap $q <esc>`>a'<esc>`<i'<esc>
 vnoremap $e <esc>`>a`<esc>`<i`<esc>
 
-" Map auto complete of (, ", ', [
-inoremap $1 ()<esc>i
-inoremap $2 []<esc>i
-inoremap $3 {}<esc>i
-inoremap $4 {<esc>o}<esc>O
-inoremap $q ''<esc>i
-inoremap $e ""<esc>i
+" Map auto complete of (, ", ', [ except for shell, php, and perl with ,u for manual toggling
+let b:pair_maps_enabled = 1
+
+function! EnablePairMaps()
+  inoremap $1 ()<esc>i
+  inoremap $2 []<esc>i
+  inoremap $3 {}<esc>i
+  inoremap $4 {<esc>o}<esc>O
+  inoremap $q ''<esc>i
+  inoremap $e ""<esc>i
+  let b:pair_maps_enabled = 1
+endfunction
+
+function! DisablePairMaps()
+  if b:pair_maps_enabled
+    if mapcheck('$1', 'i') !=# ''
+      iunmap $1
+    endif
+    if mapcheck('$2', 'i') !=# ''
+      iunmap $2
+    endif
+    if mapcheck('$3', 'i') !=# ''
+      iunmap $3
+    endif
+    if mapcheck('$4', 'i') !=# ''
+      iunmap $4
+    endif
+    if mapcheck('$q', 'i') !=# ''
+      iunmap $q
+    endif
+    if mapcheck('$e', 'i') !=# ''
+      iunmap $e
+    endif
+    let b:pair_maps_enabled = 0
+  endif
+endfunction
+
+augroup PairMapsByFiletype
+  autocmd!
+  autocmd FileType sh,bash,zsh,ps,php,pl,pm,cgi,plx,pod,t call DisablePairMaps()
+augroup END
 
+nnoremap <leader>u :if get(b:, 'pair_maps_enabled', 0) \| call DisablePairMaps() \| else \| call EnablePairMaps() \| endif<CR>
 
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " => General abbreviations
diff --git a/vimrcs/filetypes.vim b/vimrcs/filetypes.vim
index 0f764f3780..271999f55b 100644
--- a/vimrcs/filetypes.vim
+++ b/vimrcs/filetypes.vim
@@ -60,7 +60,7 @@ au FileType gitcommit call setpos('.', [0, 1, 1, 0])
 " => Shell section
 """"""""""""""""""""""""""""""
 if exists('$TMUX') 
-    if has('nvim')
+    if has('nvim') || has('termguicolors')
         set termguicolors
     else
         set term=screen-256color 
diff --git a/vimrcs/plugins_config.vim b/vimrcs/plugins_config.vim
index a0978c14dc..72851e038d 100644
--- a/vimrcs/plugins_config.vim
+++ b/vimrcs/plugins_config.vim
@@ -193,3 +193,20 @@ let g:EditorConfig_exclude_patterns = ['fugitive://.*']
 " Copy the link to the line of a Git repository to the clipboard
 nnoremap <leader>v :.GBrowse!<CR>
 xnoremap <leader>v :GBrowse!<CR>
+
+
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" => Copilot
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" Default to disabled
+let g:copilot_enabled = v:false
+
+function! ToggleCopilot()
+  if g:copilot_enabled
+    let g:copilot_enabled = v:false
+  else
+    let g:copilot_enabled = v:true
+  endif
+endfunction
+
+nnoremap <leader>gc :call ToggleCopilot()<CR>