From 3c26384e30b99d60a7d951506a1154e3baf20a2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ji=C5=99=C3=AD=20=C5=A0tefka?= <jiri.stefka.js@gmail.com>
Date: Sun, 30 Oct 2022 00:09:36 +0200
Subject: [PATCH] Revert "Merge branch 'merlin' into main"

This reverts commit b0f1dd9656085e6a359178137a0dc7f4de805a10, reversing
changes made to e6d978fc38fd74b5bfa54d1057f0579fc146c615.
---
 README.md | 42 +++++++++---------------------------------
 init.lua  | 14 +++++++++++++-
 2 files changed, 22 insertions(+), 34 deletions(-)

diff --git a/README.md b/README.md
index 782423f..ae91ebc 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,8 @@
 # My [AstroNvim](https://github.com/AstroNvim/AstroNvim) config
 
-## How to install my config on merli
+## README for the merlin server at FIT VUT can be found [here](https://github.com/jiriks74/astronvim_config/tree/merlin)
+
+## How to install my config
 
 - First you have to install AstroNvim
   - Backup your previous nvim config
@@ -23,44 +25,18 @@
   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
diff --git a/init.lua b/init.lua
index 2eac822..c766ca3 100644
--- a/init.lua
+++ b/init.lua
@@ -142,7 +142,6 @@ 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
@@ -306,13 +305,20 @@ local config = {
       { "github/copilot.vim" },
       { "puremourning/vimspector" },
       { "lervag/vimtex" },
+      { "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" },
       { "aklt/plantuml-syntax" },
+      { "tyru/open-browser.vim" },
 
       -- We also support a key value style plugin definition similar to NvChad:
       -- ["ray-x/lsp_signature.nvim"] = {
@@ -321,6 +327,12 @@ local config = {
       --     require("lsp_signature").setup()
       --   end,
       -- },
+      -- ["weirongxu/plantuml-previewer.vim"] = {
+      --   requires = { {"aklt/plantuml-syntax"} },
+      --   -- depends = "aklt/plantuml-syntax",
+      --   requires = { {"tyru/open-browser.vim"} },
+      --   -- depends = "tyru/open-browser.vim",
+      -- },
 
     },
     -- All other entries override the require("<key>").setup({...}) call for default plugins