Revert "Merge branch 'merlin' into main"
This reverts commitb0f1dd9656
, reversing changes made toe6d978fc38
.
This commit is contained in:
parent
b0f1dd9656
commit
3c26384e30
2 changed files with 22 additions and 34 deletions
42
README.md
42
README.md
|
@ -1,6 +1,8 @@
|
||||||
# My [AstroNvim](https://github.com/AstroNvim/AstroNvim) config
|
# 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
|
- First you have to install AstroNvim
|
||||||
- Backup your previous nvim config
|
- Backup your previous nvim config
|
||||||
|
@ -23,44 +25,18 @@
|
||||||
git clone https://github.com/jiriks74/astronvim_config ~/.config/nvim/lua/user
|
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`
|
- 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
|
```bash
|
||||||
nvim +PackerSync
|
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
|
## Useful info
|
||||||
|
|
||||||
- Folding with treesitter
|
- Folding with treesitter
|
||||||
|
|
14
init.lua
14
init.lua
|
@ -142,7 +142,6 @@ local config = {
|
||||||
-- enable servers that you already have installed without mason
|
-- enable servers that you already have installed without mason
|
||||||
servers = {
|
servers = {
|
||||||
-- "pyright"
|
-- "pyright"
|
||||||
"clangd"
|
|
||||||
},
|
},
|
||||||
formatting = {
|
formatting = {
|
||||||
format_on_save = false, -- enable or disable auto formatting on save
|
format_on_save = false, -- enable or disable auto formatting on save
|
||||||
|
@ -306,13 +305,20 @@ local config = {
|
||||||
{ "github/copilot.vim" },
|
{ "github/copilot.vim" },
|
||||||
{ "puremourning/vimspector" },
|
{ "puremourning/vimspector" },
|
||||||
{ "lervag/vimtex" },
|
{ "lervag/vimtex" },
|
||||||
|
{ "normen/vim-pio" },
|
||||||
|
{
|
||||||
|
"iamcco/markdown-preview.nvim",
|
||||||
|
run = function() vim.fn["mkdp#util#install"]() end,
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"Pocco81/auto-save.nvim",
|
"Pocco81/auto-save.nvim",
|
||||||
config = function()
|
config = function()
|
||||||
require("auto-save").setup()
|
require("auto-save").setup()
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
|
{ "weirongxu/plantuml-previewer.vim" },
|
||||||
{ "aklt/plantuml-syntax" },
|
{ "aklt/plantuml-syntax" },
|
||||||
|
{ "tyru/open-browser.vim" },
|
||||||
|
|
||||||
-- We also support a key value style plugin definition similar to NvChad:
|
-- We also support a key value style plugin definition similar to NvChad:
|
||||||
-- ["ray-x/lsp_signature.nvim"] = {
|
-- ["ray-x/lsp_signature.nvim"] = {
|
||||||
|
@ -321,6 +327,12 @@ local config = {
|
||||||
-- require("lsp_signature").setup()
|
-- require("lsp_signature").setup()
|
||||||
-- end,
|
-- 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
|
-- All other entries override the require("<key>").setup({...}) call for default plugins
|
||||||
|
|
Loading…
Reference in a new issue