Merge pull request 'test' (#1) from test into master

Reviewed-on: https://codeberg.org/philw/nvim/pulls/1

5 files changed, 307 insertions, 168 deletions

diff --git a/README.md b/README.md
index 77b2080..fdb43f7 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 
 ### Installation
 
-Run checkhealth in your Neovim
+Run checkhealth in your nvim to satisfy it's requirements
 
 ```vim
 :checkhealth
@@ -13,21 +13,11 @@ Run checkhealth in your Neovim
 Make sure you analyzed the output properly:
 
 - Your neovim must be >= 0.7.0 to run this config
-- You need to setup [Packer](https://github.com/wbthomason/packer.nvim)
 
 ```vim
 git clone --depth 1 https://github.com/wbthomason/packer.nvim\
  ~/.local/share/nvim/site/pack/packer/start/packer.nvim
 ```
-
-- You should install global python provider
-
-```python
-pip install pynvim
-```
-
-- You should install clipboard tool (I use xclip but you can use something diffrent)
-
 ### Installation
 
 > Easy way
@@ -35,12 +25,12 @@ pip install pynvim
 You can just clone this repo to your .config folder
 
 ```bash
-git clone https://github.com/dsrcr/nvim ~/.config
+git clone https://codeberg.com/philw/nvim ~/.config
 ```
 
-> Recommended way
+> My way
 
-I use gnu-stow to manage my dotfiles, so I encourage you to use it too.
+I use ![gnu-stow](https://www.gnu.org/software/stow/) to manage my ![dotfiles](https://codeberg.org/philw/rice), so I encourage you to use it too.
 
 Use your package manage of choice to get stow, for example:
 
@@ -55,22 +45,14 @@ In order to do this you need an empty nvim directory in your .config folder
 ```bash
 cd ~/.config
 mkdir nvim
-cd ~/yourDirectory
-git clone https://github.com/dsrcr/nvim
-stow -d ~/yourDirectory -t ~/.config/nvim nvim/
+cd ~/dir
+git clone https://codeberg.org/philw/nvim
+stow -d ~/dir -t ~/.config/nvim nvim/
 
 ```
+Or use my ![script](https://codeberg.org/philw/scripts)
 
-The last step is running this command in your neovim
-
-```vim
-:PackerSync
-```
-
-This command should pull everything you need
-
-In the next step you will encounter a lot of errors, but don't worry about it.
-Packer needs to pull specific plugins and then you need to install Treesitter's support for specific filetypes eg. lua, rust.... etc.
+Everything should set up automatically. There is no need for additional setup(if there is report an error).
 
 ```bash
 :TSUpdate
diff --git a/init.lua b/init.lua
index 45e6811..3afc76a 100644
--- a/init.lua
+++ b/init.lua
@@ -1,8 +1,239 @@
---Open this file if you want to add new plugins
-require("config.packer")
+---@diagnostic disable: undefined-global
+local option = vim.opt
+local keymap = vim.keymap
+vim.g.loaded_netrw = 1
+vim.g.loaded_netrwPlugin = 1
+vim.g.rustfmt_autosave = 1
+vim.g.mkdp_auto_start = 1
 
--- Here you can find stuff related to lsp
-require("config.lsp")
+--Basic Editor Setup
+option.nu = true
+option.tabstop = 2
+option.softtabstop = 2
+option.shiftwidth = 2
+option.expandtab = true
+option.smartindent = true
+option.ruler = false
+option.wrap = false
+option.swapfile = false
+option.hlsearch = false
+option.incsearch = true
+option.updatetime = 50
+option.laststatus = 0
+option.signcolumn = "number"
+option.autoindent = true
+option.clipboard = "unnamedplus"
+option.termguicolors = true
+option.fillchars = 'eob: '
+option.autoindent = true
 
--- And there goes editor customization
-require("config.editor")
+vim.cmd([[
+augroup RunPfOnSave
+autocmd!
+autocmd BufWritePost *.js,*.ts,*.jsx,*json,*.tsx,*.css,*.html,*.yaml,*.md silent! !prettier --write %
+autocmd BufWritePost *.tex silent! :VimtexCompile
+autocmd BufWritePost *.md silent! :MarkdownPreview
+autocmd BufWritePost *.php silent! !php-cs-fixer fix %
+augroup END
+]])
+
+-- Gui options
+vim.o.guifont = "Fira Code:h7"
+vim.g.vimtex_view_method = "zathura"
+vim.g.vimtex_compiler_method = "latexrun"
+vim.g.gitgutter_set_sign_backgrounds = 1
+
+
+local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
+if not vim.loop.fs_stat(lazypath) then
+  vim.fn.system({
+    "git",
+    "clone",
+    "--filter=blob:none",
+    "https://github.com/folke/lazy.nvim.git",
+    "--branch=stable", -- latest stable release
+    lazypath,
+  })
+end
+
+vim.opt.rtp:prepend(lazypath)
+require("lazy").setup({
+  "nvim-lua/plenary.nvim",
+  'chriskempson/base16-vim',
+  "airblade/vim-gitgutter",
+  "lervag/vimtex",
+  "nvim-tree/nvim-tree.lua",
+  "norcalli/nvim-colorizer.lua",
+  "nvim-treesitter/nvim-treesitter",
+  "neovim/nvim-lspconfig",
+  "williamboman/mason.nvim",
+  "nvim-tree/nvim-web-devicons",
+  "williamboman/mason-lspconfig.nvim",
+  {
+    "iamcco/markdown-preview.nvim",
+    cmd = { "MarkdownPreviewToggle", "MarkdownPreview", "MarkdownPreviewStop" },
+    build = "cd app && yarn install",
+    init = function()
+      vim.g.mkdp_filetypes = { "markdown" }
+    end,
+    ft = { "markdown" },
+  },
+  'nvimdev/lspsaga.nvim',
+  config = function()
+    require('lspsaga').setup({})
+  end,
+  'nvim-telescope/telescope.nvim',
+  tag = '0.1.5',
+  dependencies = { 'nvim-lua/plenary.nvim' },
+  {
+    'nvim-telescope/telescope-fzf-native.nvim',
+    build =
+    'cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release && cmake --build build --config Release && cmake --install build --prefix build',
+    keys = {
+      { "<leader>/", false },
+      { "<leader>f", "<cmd>Telescope find_files<cr>", desc = "Find Files" },
+      { "<leader>g", "<cmd>Telescope live_grep<cr>",  desc = "Grep" },
+      { "<leader>b", "<cmd>Telescope buffers<cr>",    desc = "Grep" },
+      { "<leader>s", "<cmd>Telescope buffers<cr>",    desc = "Grep" },
+    }
+  },
+  {
+    'windwp/nvim-autopairs',
+    event = "InsertEnter",
+    opts = {}
+  },
+  {
+    'numToStr/Comment.nvim',
+    opts = {},
+    lazy = false,
+  },
+
+  'ms-jpq/coq_nvim',
+  { 'ms-jpq/coq.artifacts', branch = "artifacts" },
+})
+
+require("colorizer").setup()
+vim.api.nvim_create_autocmd('InsertEnter', {
+  command = 'COQnow --shut-up'
+})
+
+vim.api.nvim_create_autocmd("BufWritePre", {
+  callback = function()
+    vim.lsp.buf.format()
+  end,
+})
+
+local lsp_servers = {
+  clangd = {},
+  lua_ls = {},
+  rust_analyzer = {
+    imports = {
+      granularity = {
+        group = 'module',
+      },
+      prefix = 'self',
+    },
+    cargo = {
+      buildScripts = {
+        enable = true,
+      },
+    },
+    procMacro = {
+      enable = true,
+    },
+  },
+}
+
+
+require('lspsaga').setup({})
+
+require("mason").setup()
+require("mason-lspconfig").setup {
+  ensure_installed = lsp_servers,
+  automatic_installation = true,
+}
+
+local server_maps = function(opts)
+  vim.keymap.set("n", "<leader>d", vim.lsp.buf.definition, opts) -- goto def
+  vim.keymap.set("n", "<leader>k", vim.lsp.buf.hover, opts)      -- see docs
+end
+
+for lsp, settings in pairs(lsp_servers) do
+  require("lspconfig")[lsp].setup(coq.lsp_ensure_capabilities({
+    on_attach = function(_, buffer)
+      server_maps({ buffer = buffer })
+    end,
+    settings = settings,
+  }))
+end
+
+require("nvim-tree").setup({
+  sort = {
+    sorter = "case_sensitive",
+  },
+  view = {
+    width = 30,
+  },
+  renderer = {
+    group_empty = true,
+  },
+  filters = {
+    dotfiles = true,
+  },
+})
+
+vim.cmd.colorscheme("base16-brewer")
+vim.cmd([[
+highlight GitGutterAdd ctermbg=none guibg=none
+highlight GitGutterDelete guibg=none ctermbg=none
+highlight GitGutterChange guibg=none ctermbg=none
+highlight GitGutterChangeAdd guibg=none ctermbg=none
+highlight GitGutterChangeDelete guibg=none ctermbg=none
+highlight NonText guifg=none
+highlight EndOfBuffer ctermfg=none ctermbg=none
+highlight Normal ctermbg=none guibg=none
+highlight signcolumn ctermbg=none guibg=none
+highlight StatusLine ctermbg=none guibg=none
+highlight DiagnosticError ctermbg=none guibg=none
+highlight DiagnosticWarn ctermbg=none guibg=none
+highlight DiagnosticInfo ctermbg=none guibg=none
+highlight DiagnosticHint ctermbg=none guibg=none
+highlight Pmenu ctermbg=none guibg=none
+
+highlight DiagnosticVirtualError ctermbg=none guibg=none
+highlight DiagnosticVirtualWarn ctermbg=none guibg=none
+highlight DiagnosticVirtualInfo ctermbg=none guibg=none
+highlight DiagnosticVirtualHint ctermbg=none guibg=none
+
+highlight LineNr ctermbg=none guibg=none
+highlight StatusLineNc ctermbg=none guibg=none
+highlight StatusLineNc ctermfg=none guifg=none
+highlight StatusLine ctermbg=none guibg=none
+highlight StatusLine ctermfg=none guifg=none
+
+highlight NvimTreeWinSeparator ctermfg=none guifg=none
+highlight CursorColumn ctermfg=none guifg=none
+highlight CursorLine ctermbg=none guibg=none
+
+highlight VertSplit ctermbg=none guibg=none
+
+highlight DiagnosticVirtualTextError ctermbg=none guibg=none
+highlight DiagnosticVirtualTextWarn ctermbg=none guibg=none
+highlight DiagnosticVirtualTextInfo ctermbg=none guibg=none
+highlight DiagnosticVirtualTextHint ctermbg=none guibg=none
+]])
+
+--Keybinds
+vim.g.mapleader = " "
+keymap.set("n", "<leader>e", vim.cmd.NvimTreeToggle)
+keymap.set("n", "<leader>z", [[:%s/\<<C-r><C-w>\>/<C-r><C-w>/gI<Left><Left><Left>]])
+keymap.set("n", "<leader>a", "ggVG")
+keymap.set("n", "<leader>y", "cc")
+keymap.set("n", "<C-c>", "yy")
+keymap.set("n", "<C-v>", "p")
+keymap.set("n", "<C-z>", "u")
+keymap.set("v", "J", ":m '>+1<CR>gv=gv")
+keymap.set("v", "K", ":m '<-2<CR>gv=gv")
+keymap.set("n", "<leader>ca", "<cmd>Lspsaga code_action<cr>")
+keymap.set("n", "<leader>f", "<cmd>Telescope find_files<cr>")
+keymap.set("n", "<leader>g", "<cmd>Telescope live_grep<cr>")
diff --git a/lua/config/editor.lua b/lua/config/editor.lua
index eec0e08..0649006 100644
--- a/lua/config/editor.lua
+++ b/lua/config/editor.lua
@@ -1,10 +1,6 @@
-local js_based_languages = { "typescript", "javascript", "typescriptreact", "javascriptreact" }
 local option = vim.opt
 local keymap = vim.keymap
 
-local telescope = require("telescope.builtin")
-local autotag = require("nvim-ts-autotag").setup()
-
 --Basic Editor Setup
 option.nu = true
 option.tabstop = 2
@@ -21,13 +17,15 @@ option.laststatus = 0
 option.signcolumn = "number"
 option.autoindent = true
 option.clipboard = "unnamedplus"
-option.termguicolors = true
+option.termguicolors = false
+option.fillchars = 'eob: '
 
 -- Setup Editor Theme
-vim.cmd.colorscheme("tokyonight")
 vim.cmd([[
 highlight GitGutterAdd ctermbg=none
 highlight GitGutterAdd guibg=none
+highlight NonText guifg=none
+highlight EndOfBuffer ctermfg=none ctermbg=none
 highlight Normal ctermbg=none
 highlight Normal guibg=none
 highlight signcolumn ctermbg=none
@@ -62,7 +60,6 @@ highlight DiagnosticVirtualTextHint ctermbg=none
 highlight DiagnosticVirtualTextHint guibg=none
 ]])
 
-
 -- run specific commands after different file extensions
 vim.cmd([[
 augroup RunPfOnSave
@@ -83,21 +80,7 @@ vim.g.gitgutter_set_sign_backgrounds = 1
 --Keybinds
 vim.g.mapleader = " "
 keymap.set("n", "<leader>e", vim.cmd.Ex)
-keymap.set("n", "<leader>f", telescope.find_files, {})
-keymap.set("n", "<leader>fg", telescope.live_grep, {})
-keymap.set("n", "<leader>fb", telescope.buffers, {})
-keymap.set("n", "<leader>fh", telescope.help_tags, {})
 keymap.set("n", "<leader>s", [[:%s/\<<C-r><C-w>\>/<C-r><C-w>/gI<Left><Left><Left>]])
 keymap.set("n", "<leader>a", "ggVG")
 keymap.set("v", "J", ":m '>+1<CR>gv=gv")
 keymap.set("v", "K", ":m '<-2<CR>gv=gv")
-
---Treesitter
-require("nvim-treesitter.configs").setup({
-        ensure_installed = { "javascript", "typescript", "rust", "c", "lua", "vim" },
-        sync_install = false,
-        auto_install = true,
-        highlight = {
-                enable = true,
-        },
-})
diff --git a/lua/config/lsp.lua b/lua/config/lsp.lua
index ca341d5..7fd0ddb 100644
--- a/lua/config/lsp.lua
+++ b/lua/config/lsp.lua
@@ -1,64 +1,64 @@
 -- local lsp = require('lsp-zero')
 
-local lsp_zero = require("lsp-zero")
-local cmp = require("cmp")
-require("luasnip.loaders.from_vscode").lazy_load()
+--local lsp_zero = require("lsp-zero")
+--local cmp = require("cmp")
+--require("luasnip.loaders.from_vscode").lazy_load()
 
-lsp_zero.preset("recommended")
-lsp_zero.setup()
-lsp_zero.on_attach(function(client_id, bufnr)
-        lsp_zero.default_keymaps({ buffer = bufnr })
-end)
+--lsp_zero.preset("recommended")
+--lsp_zero.setup()
+--lsp_zero.on_attach(function(client_id, bufnr)
+--      lsp_zero.default_keymaps({ buffer = bufnr })
+--end)
 
-require("mason").setup({})
-require("mason-lspconfig").setup({
-        ensure_installed = { "clangd", "rust_analyzer" },
-        handlers = {
-                lsp_zero.default_setup,
-        },
-})
+--require("mason").setup({})
+--require("mason-lspconfig").setup({
+--      ensure_installed = { "clangd", "rust_analyzer" },
+--      handlers = {
+--              lsp_zero.default_setup,
+--      },
+--})
 
-cmp.setup({
-        snippet = {
-                expand = function(args)
-                        require("luasnip").lsp_expand(args.body)
-                end,
-        },
-        window = {},
-        mapping = cmp.mapping.preset.insert({
-                ["<C-b>"] = cmp.mapping.scroll_docs(-4),
-                ["<C-f>"] = cmp.mapping.scroll_docs(4),
-                ["<C-Space>"] = cmp.mapping.complete(),
-                ["<C-e>"] = cmp.mapping.abort(),
-                ["<CR>"] = cmp.mapping.confirm({ select = true }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
-        }),
-        sources = cmp.config.sources({
-                { name = "nvim_lsp" },
-                { name = "luasnip" },
-        }, {
-                { name = "buffer" },
-        }),
-})
+--cmp.setup({
+--      snippet = {
+--              expand = function(args)
+--                      require("luasnip").lsp_expand(args.body)
+--              end,
+--      },
+--      window = {},
+--      mapping = cmp.mapping.preset.insert({
+--              ["<C-b>"] = cmp.mapping.scroll_docs(-4),
+--              ["<C-f>"] = cmp.mapping.scroll_docs(4),
+--              ["<C-Space>"] = cmp.mapping.complete(),
+--              ["<C-e>"] = cmp.mapping.abort(),
+--              ["<CR>"] = cmp.mapping.confirm({ select = true }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
+--      }),
+--      sources = cmp.config.sources({
+--              { name = "nvim_lsp" },
+--              { name = "luasnip" },
+--      }, {
+--              { name = "buffer" },
+--      }),
+--})
 
-function PrintDiagnostics(opts, bufnr, line_nr, client_id)
-        bufnr = bufnr or 0
-        line_nr = line_nr or (vim.api.nvim_win_get_cursor(0)[1] - 1)
-        opts = opts or { ["lnum"] = line_nr }
+--function PrintDiagnostics(opts, bufnr, line_nr, client_id)
+--      bufnr = bufnr or 0
+--      line_nr = line_nr or (vim.api.nvim_win_get_cursor(0)[1] - 1)
+--      opts = opts or { ["lnum"] = line_nr }
+--
+--      local line_diagnostics = vim.diagnostic.get(bufnr, opts)
+--      if vim.tbl_isempty(line_diagnostics) then
+--              return
+--      end
+--
+--      local diagnostic_message = ""
+--      for i, diagnostic in ipairs(line_diagnostics) do
+--              diagnostic_message = diagnostic_message .. string.format("%d: %s", i, diagnostic.message or "")
+--              print(diagnostic_message)
+--              if i ~= #line_diagnostics then
+--                      diagnostic_message = diagnostic_message .. "\n"
+--              end
+--      end
+--      vim.api.nvim_echo({ { diagnostic_message, "Normal" } }, false, {})
+--end
 
-        local line_diagnostics = vim.diagnostic.get(bufnr, opts)
-        if vim.tbl_isempty(line_diagnostics) then
-                return
-        end
-
-        local diagnostic_message = ""
-        for i, diagnostic in ipairs(line_diagnostics) do
-                diagnostic_message = diagnostic_message .. string.format("%d: %s", i, diagnostic.message or "")
-                print(diagnostic_message)
-                if i ~= #line_diagnostics then
-                        diagnostic_message = diagnostic_message .. "\n"
-                end
-        end
-        vim.api.nvim_echo({ { diagnostic_message, "Normal" } }, false, {})
-end
-
-vim.cmd([[ autocmd! CursorHold * lua PrintDiagnostics() ]])
+--vim.cmd([[ autocmd! CursorHold * lua PrintDiagnostics() ]])
diff --git a/lua/config/packer.lua b/lua/config/packer.lua
deleted file mode 100644
index 07a600a..0000000
--- a/lua/config/packer.lua
+++ /dev/null
@@ -1,57 +0,0 @@
-vim.cmd([[packadd packer.nvim]])
-return require("packer").startup(function(use)
-  use("wbthomason/packer.nvim")
-  use("nvim-treesitter/nvim-treesitter")
-  use("neovim/nvim-lspconfig")
-  use("lukas-reineke/indent-blankline.nvim")
-  use("lervag/vimtex")
-  use("folke/tokyonight.nvim")
-  use("airblade/vim-gitgutter")
-  use("jose-elias-alvarez/null-ls.nvim")
-  use("windwp/nvim-ts-autotag")
-  use({
-    "nvim-telescope/telescope.nvim",
-    tag = "0.1.4",
-    requires = { { "nvim-lua/plenary.nvim" } },
-  })
-  use({
-    "VonHeikemen/lsp-zero.nvim",
-    requires = {
-      { "neovim/nvim-lspconfig" },
-      { "williamboman/mason.nvim" },
-      { "williamboman/mason-lspconfig.nvim" },
-      { "hrsh7th/nvim-cmp" },
-      { "hrsh7th/cmp-buffer" },
-      { "hrsh7th/cmp-path" },
-      { "saadparwaiz1/cmp_luasnip" },
-      { "hrsh7th/cmp-nvim-lsp" },
-      { "hrsh7th/cmp-nvim-lua" },
-      { "rafamadriz/friendly-snippets" },
-    },
-  })
-  use({
-    "L3MON4D3/LuaSnip",
-    tag = "v2.*",
-    run = "make install_jsregexp",
-  })
-  use({
-    "numToStr/Comment.nvim",
-    config = function()
-      require("Comment").setup()
-    end,
-  })
-  use({
-    "iamcco/markdown-preview.nvim",
-    run = "cd app && npm install",
-    setup = function()
-      vim.g.mkdp_filetypes = { "markdown" }
-    end,
-    ft = { "markdown" },
-  })
-  use({
-    "windwp/nvim-autopairs",
-    config = function()
-      require("nvim-autopairs").setup({})
-    end,
-  })
-end)