From 96bce82d7bff53f880cdf8963cccff1aa3c2f258 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ji=C5=99=C3=AD=20=C5=A0tefka?= <jiri.stefka@atlas.cz>
Date: Tue, 25 Oct 2022 21:28:05 +0200
Subject: [PATCH 1/2] Basic setup for merlin

---
 init.lua | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/init.lua b/init.lua
index e5fec66..c276592 100644
--- a/init.lua
+++ b/init.lua
@@ -139,6 +139,7 @@ local config = {
     -- enable servers that you already have installed without mason
     servers = {
       -- "pyright"
+      "clangd"
     },
     formatting = {
       format_on_save = false, -- enable or disable auto formatting on save
@@ -292,23 +293,23 @@ local config = {
       --   end,
       -- },
       --
-      { "github/copilot.vim" },
+      -- { "github/copilot.vim" },
       { "puremourning/vimspector" },
       { "lervag/vimtex" },
-      { "normen/vim-pio" },
-      {
-        "iamcco/markdown-preview.nvim",
-        run = function() vim.fn["mkdp#util#install"]() end,
-      },
+      -- { "normen/vim-pio" },
+      -- {
+      --   "iamcco/markdown-preview.nvim",
+      --   run = function() vim.fn["mkdp#util#install"]() end,
+      -- },
       {
         "Pocco81/auto-save.nvim",
         config = function()
           require("auto-save").setup()
         end,
       },
-      { "weirongxu/plantuml-previewer.vim" },
+      -- { "weirongxu/plantuml-previewer.vim" },
       { "aklt/plantuml-syntax" },
-      { "tyru/open-browser.vim" },
+      -- { "tyru/open-browser.vim" },
 
       -- We also support a key value style plugin definition similar to NvChad:
       -- ["ray-x/lsp_signature.nvim"] = {

From 644dab6ed38cd4040292febcd465048a5bf53f31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ji=C5=99=C3=AD=20=C5=A0tefka?= <jiri.stefka@atlas.cz>
Date: Tue, 25 Oct 2022 21:38:59 +0200
Subject: [PATCH 2/2] Update README for merlin

---
 README.md | 40 +++++++++++++++++++++++++++++++++-------
 1 file changed, 33 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index e158509..e0e2efe 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # My [AstroNvim](https://github.com/AstroNvim/AstroNvim) config
 
-## How to install my config
+## How to install my config on merlin
 
 - First you have to install AstroNvim
   - Backup your previous nvim config
@@ -23,18 +23,44 @@
   git clone https://github.com/jiriks74/astronvim_config ~/.config/nvim/lua/user
   ```
 
-  - For NeoVim < 8.0 use `neovim7.2` branch
-
-  ```bash
-  git clone -b neovim7.2 https://github.com/jiriks74/astronvim_config ~/.config/nvim/lua/user
-  ```
-
 - Open nvim and run `:PackerSync`
+  - **This will result in errors as `merlin` kills most of the clone processes**
+  - To make this work you need to press `R` (yes, capital) to download all the
+  failed downloads
+    - You have to do this until all plugins have been successfully downloaded
 
 ```bash
 nvim +PackerSync
 ```
 
+## Updating
+
+```bash
+cd ~/.config/nvim
+git pull
+cd lua/user
+git pull
+```
+
+- To update the plugins you need to first remove all the downloaded plugins
+(or plugin downloading will fail)
+
+```bash
+rm -rf ~/.local/share/nvim
+```
+
+- Then you need to repeat the process as if you were initializing AstroNvim for
+the first time:
+  - Open nvim and run `:PackerSync`
+    - **This will result in errors as `merlin` kills most of the clone processes**
+    - To make this work you need to press `R` (yes, capital) to download all the
+    failed downloads
+      - You have to do this until all plugins have been successfully downloaded
+
+  ```bash
+  nvim +PackerSync
+  ```
+
 ## Useful info
 
 - Folding with treesitter