upd

README.md

@@ -0,0 +1,9 @@
+**This repo is supposed to used as config by NvChad users!**
+
+- The main nvchad repo (NvChad/NvChad) is used as a plugin by this repo.
+- So you just import its modules , like `require "nvchad.options" , require "nvchad.mappings"`
+- So you can delete the .git from this repo ( when you clone it locally ) or fork it :)
+
+# Credits
+
+1) Lazyvim starter https://github.com/LazyVim/starter as nvchad's starter was inspired by Lazyvim's . It made a lot of things easier!

init.lua

@@ -1,10 +1,10 @@
-vim.g.base46_cache = vim.fn.stdpath "data" .. "/nvchad/base46/"
+vim.g.base46_cache = vim.fn.stdpath "data" .. "/base46/"
 vim.g.mapleader = " "
 
 -- bootstrap lazy and all plugins
 local lazypath = vim.fn.stdpath "data" .. "/lazy/lazy.nvim"
 
-if not vim.loop.fs_stat(lazypath) then
+if not vim.uv.fs_stat(lazypath) then
   local repo = "https://github.com/folke/lazy.nvim.git"
   vim.fn.system { "git", "clone", "--filter=blob:none", repo, "--branch=stable", lazypath }
 end
@@ -20,77 +20,18 @@ require("lazy").setup({
     lazy = false,
     branch = "v2.5",
     import = "nvchad.plugins",
-    config = function()
-      require "options"
-    end,
   },
 
   { import = "plugins" },
 }, lazy_config)
 
--- load plugins' setup
-require("todo-comments").setup({})
-
 -- load theme
 dofile(vim.g.base46_cache .. "defaults")
 dofile(vim.g.base46_cache .. "statusline")
 
+require "options"
 require "nvchad.autocmds"
 
--- shell
-vim.opt.shell = "/bin/fish"
-
--- Disable inline diagnostics (virtual text)
-vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with(
-    vim.lsp.diagnostic.on_publish_diagnostics, {
-        virtual_text = false,
-    }
-)
-
--- Function to show diagnostics in a floating window on hover
-local function show_diagnostics_on_hover()
-    local opts = {
-        focusable = false,
-        close_events = { "BufLeave", "CursorMoved", "InsertEnter", "FocusLost" },
-        border = 'rounded',
-        source = 'always',
-        prefix = ' ',
-    }
-    vim.api.nvim_command('autocmd CursorHold * lua vim.diagnostic.open_float(nil, ' .. vim.inspect(opts) .. ')')
-end
-
--- Call the function to set up the autocmd
-show_diagnostics_on_hover()
-
 vim.schedule(function()
   require "mappings"
 end)
-
--- enables remote clipboard 
--- vim.g.clipboard = {
---   name = 'OSC 52',
---   copy = {
---     ['+'] = require('vim.ui.clipboard.osc52').copy('+'),
---     ['*'] = require('vim.ui.clipboard.osc52').copy('*'),
---   },
---   paste = {
---     ['+'] = require('vim.ui.clipboard.osc52').paste('+'),
---     ['*'] = require('vim.ui.clipboard.osc52').paste('*'),
---   },
--- }
-
--- Ruff and pyright cross-compatibility
-vim.api.nvim_create_autocmd("LspAttach", {
-  group = vim.api.nvim_create_augroup('lsp_attach_disable_ruff_hover', { clear = true }),
-  callback = function(args)
-    local client = vim.lsp.get_client_by_id(args.data.client_id)
-    if client == nil then
-      return
-    end
-    if client.name == 'ruff' then
-      -- Disable hover in favor of Pyright
-      client.server_capabilities.hoverProvider = false
-    end
-  end,
-  desc = 'LSP: Disable hover capability from Ruff',
-})

lua/chadrc.lua

@@ -1,69 +1,26 @@
--- This file  needs to have same structure as nvconfig.lua
+-- This file needs to have same structure as nvconfig.lua 
--- https://github.com/NvChad/NvChad/blob/v2.5/lua/nvconfig.lua
+-- https://github.com/NvChad/ui/blob/v3.0/lua/nvconfig.lua
+-- Please read that file to know all available options :( 
 
 ---@type ChadrcConfig
 local M = {}
 
-M.ui = {
+M.base46 = {
-  -- theme = "nightowl",
+	theme = "ayu_dark",
-  theme = "decay",
   transparency = true,
-  statusline = {
+  theme_toggle = { "ayu_dark", "ayu_light" },
-    theme = "minimal",
-  },
-  hl_override = {
-    Include = {
-      italic = true,
-    },
-    -- for, while loops
-    Repeat = {
-      italic = true,
-    },
-    -- if statements
-    Conditional = {
-      italic = true,
-    },
-    -- class, with, as keywords
-    ["@keyword"] = {
-      italic = true,
-    },
-    -- conditions
-    ["@keyword.conditional"] = {
-      italic = true,
-    },
-    -- repeat
-    ["@keyword.repeat"] = {
-      italic = true,
-    },
-    -- function keyword
-    ["@keyword.function"] = {
-      italic = true,
-    },
-    -- return, yield keywords
-    ["@keyword.return"] = {
-      bold = true,
-    },
-    -- function names
-    ["@function"] = {
-      italic = false,
-    },
-    -- symbolic
-    ["@operator"] = {
-      bold = true,
-    },
-    -- logical keywords
-    ["@keyword.operator"] = {
-      italic = true,
-    },
-    -- function parameters
-    ["@parameter"] = {
-      italic = true,
 
-    ["@variable"] = {
+	hl_override = {
-        italic = false,
+		Comment = { italic = true },
-      },
+		["@comment"] = { italic = true },
-    },
+	},
-  },
+}
+
+M.nvdash = { load_on_startup = true }
+M.ui = {
+      tabufline = {
+         lazyload = false
+     }
 }
 
 return M

lua/configs/conform.lua

@@ -1,13 +1,9 @@
 local options = {
   formatters_by_ft = {
     lua = { "stylua" },
-    python = { "black" },
     css = { "prettier" },
     html = { "prettier" },
-    go = { "goimports", "gofmt" },
+    nix = { "alejandra" },
-    bash = {"beautysh"},
-    sh = {"beautysh"},
-    zsh = {"beautysh"},
   },
 
   -- format_on_save = {
@@ -17,4 +13,4 @@ local options = {
   -- },
 }
 
-require("conform").setup(options)
+return options

lua/configs/dashboard.lua

@@ -1,47 +0,0 @@
-local header = {
-  [[]],
-  [[]],
-  [[]],
-  [[ ███╗   ██╗ ███████╗ ██████╗  ██╗   ██╗ ██╗ ███╗   ███╗]],
-  [[ ████╗  ██║ ██╔════╝██╔═══██╗ ██║   ██║ ██║ ████╗ ████║]],
-  [[ ██╔██╗ ██║ █████╗  ██║   ██║ ██║   ██║ ██║ ██╔████╔██║]],
-  [[ ██║╚██╗██║ ██╔══╝  ██║   ██║ ╚██╗ ██╔╝ ██║ ██║╚██╔╝██║]],
-  [[ ██║ ╚████║ ███████╗╚██████╔╝  ╚████╔╝  ██║ ██║ ╚═╝ ██║]],
-  [[ ╚═╝  ╚═══╝ ╚══════╝ ╚═════╝    ╚═══╝   ╚═╝ ╚═╝     ╚═╝]],
-  [[]],
-  [[]],
-  [[]],
-}
-
-local footer = {
-  [[]],
-  [[]],
-  'Don\'t know how to exit? Refer to the link below.',
-  'https://stackoverflow.com/questions/11828270/how-do-i-exit-vim',
-}
-
-local options = {
-  theme = 'hyper',
-  disable_move = false,
-  shortcut_type = 'letter',
-  shuffle_letter = true,
-  change_to_vcs_root = false,
-  config = {
-    header = header,
-    shortcut = {
-      {
-        desc = "😎 Skill Issue.",
-      },
-    },
-    footer = footer,
-  },
-  hide = {
-    statusline = true,
-    tabline = true,
-    winbar = true,
-  },
-  preview = {
-
-  },
-}
-require("dashboard").setup(options)

lua/configs/lspconfig.lua

@@ -1,76 +1,71 @@
--- EXAMPLE 
+local nvlsp = require "nvchad.configs.lspconfig"
-local on_attach = require("nvchad.configs.lspconfig").on_attach
-local on_init = require("nvchad.configs.lspconfig").on_init
-local capabilities = require("nvchad.configs.lspconfig").capabilities
-
 local lspconfig = require "lspconfig"
+
+nvlsp.defaults() -- loads nvchad's defaults
+
 local servers = { "html", "cssls", "clangd" }
-local util = require "lspconfig/util"
 
 -- lsps with default config
 for _, lsp in ipairs(servers) do
   lspconfig[lsp].setup {
-    on_attach = on_attach,
+    on_attach = nvlsp.on_attach,
-    on_init = on_init,
+    on_init = nvlsp.on_init,
-    capabilities = capabilities,
+    capabilities = nvlsp.capabilities,
   }
 end
 
--- typescript
+lspconfig.basedpyright.setup {
-lspconfig.ts_ls.setup {
+  on_attach = nvlsp.on_attach,
-  on_attach = on_attach,
+  -- on_init = nvlsp.on_init,
-  on_init = on_init,
+  capabilities = nvlsp.capabilities,
-  capabilities = capabilities,
-}
-
--- python
-lspconfig.basedpyright.setup{
-  on_attach = on_attach,
-  on_init = on_init,
-  capabilities = capabilities,
-  filetypes = { "python" },
   settings = {
-    basedpyright = {
+    pyright = {
-      typeCheckingMode = "standard",
+      disableOrganizeImports = true,
-    }
+    },
-  }
+    python = {
-}
+      analysis = {
-
+        ignore = { '*' }
-lspconfig.gopls.setup {
+      },
-  on_attach = on_attach,
+    },
-  capabilities = capabilities,
-  cmd = {"gopls"},
-  filetypes = { "go", "gomod", "gowork", "gotmpl" },
-  root_dir = util.root_pattern("go.work", "go.mod", ".git"),
-  settings = {
-    gopls = {
-      completeUnimported = true,
-      usePlaceholders = true,
-      analyses = {
-        unusedParameters = true,
-      }
-    }
-  }
-}
-
----- ruff_lsp and pyright compatibility
--- local on_attach = function(client, bufnr)
---   if client.name == 'ruff_lsp' then
---     -- hover in favor of Pyright
---     client.server_capabilities.hoverProvider = false
---   end
--- end
---
-lspconfig.ruff.setup{
-  on_attach = on_attach,
-  on_init = on_init,
-  capabilities = capabilities,
-  init_options = {
-    settings = {
-
-    }
   },
 }
 
+lspconfig.ruff.setup {
+  on_attach = nvlsp.on_attach,
+  -- on_init = nvlsp.on_init,
+  capabilities = nvlsp.capabilities,
+  settings = {
+  }
+}
 
+lspconfig.rust_analyzer.setup {
+  on_attach = nvlsp.on_attach,
+  -- on_init = nvlsp.on_init,
+  capabilities = nvlsp.capabilities,
+  settings = {
+  }
+}
 
+lspconfig.bashls.setup {
+  on_attach = nvlsp.on_attach,
+  -- on_init = nvlsp.on_init,
+  capabilities = nvlsp.capabilities,
+  settings = {
+  }
+}
+
+lspconfig.ts_ls.setup {
+  on_attach = nvlsp.on_attach,
+  -- on_init = nvlsp.on_init,
+  capabilities = nvlsp.capabilities,
+  settings = {
+  }
+}
+
+lspconfig.rnix.setup {
+  on_attach = nvlsp.on_attach,
+  capabilities = nvlsp.capabilities,
+  settings = {
+
+  }
+}

lua/configs/rust.lua

@@ -1,13 +0,0 @@
-local bufnr = vim.api.nvim_get_current_buf()
-vim.keymap.set("n", "<leader>a", function()
-  vim.cmd.RustLsp "codeAction" -- supports rust-analyzer's grouping
-  -- or vim.lsp.buf.codeAction() if you don't want grouping.
-end, { silent = true, buffer = bufnr })
-vim.keymap.set(
-  "n",
-  "K", -- Override Neovim's built-in hover keymap with rustaceanvim's hover actions
-  function()
-    vim.cmd.RustLsp { "hover", "actions" }
-  end,
-  { silent = true, buffer = bufnr }
-)

lua/mappings.lua

@@ -3,16 +3,14 @@ require "nvchad.mappings"
 -- add yours here
 
 local map = vim.keymap.set
-local keymap = vim.api.nvim_set_keymap
 
 map("n", ";", ":", { desc = "CMD enter command mode" })
 map("i", "jk", "<ESC>")
--- map("n", "<leader>gh", ":Neogit <cr>")
-map("n", "<leader>md", ":MarkdownPreviewToggle <cr>")
-map("n", "<leader>tl", ":TodoLocList <cr>")
-map("n", "<leader>td", ":TodoQuickFix <cr>")
-map("n", "<leader>cr", ":!python3 % <cr>")
-
-
 
 -- map({ "n", "i", "v" }, "<C-s>", "<cmd> w <cr>")
+
+-- custom
+map("n", "<leader>ss", ":lua vim.diagnostic.open_float(nil,{focus=false}) <cr>")
+map("n", "<leader>sd", ":lua vim.diagnostic.setqflist() <cr>")
+
+-- vim.cmd [[autocmd CursorHold,CursorHoldI * lua vim.diagnostic.open_float(nil, {focus=false})]]

lua/options.lua

@@ -1,10 +1,10 @@
 require "nvchad.options"
 
 -- add yours here!
-vim.opt.foldmethod = "expr"
-vim.opt.foldexpr = "nvim_treesitter#foldexpr()"
 
--- vim.opt.spelllang = "en_us"
+-- Show line diagnostics automatically in hover window
--- vim.opt.spell = true
+-- vim.o.updatetime = 250
+-- vim.cmd [[autocmd CursorHold,CursorHoldI * lua vim.diagnostic.open_float(nil, {focus=false})]]
+
 -- local o = vim.o
 -- o.cursorlineopt ='both' -- to enable cursorline!

lua/plugins/init.lua

@@ -2,138 +2,59 @@ return {
   {
     "stevearc/conform.nvim",
     -- event = 'BufWritePre', -- uncomment for format on save
-    config = function()
+    opts = require "configs.conform",
-      require "configs.conform"
-    end,
   },
 
+  -- These are some examples, uncomment them if you want to see them work!
   {
     "neovim/nvim-lspconfig",
     config = function()
-      require("nvchad.configs.lspconfig").defaults()
       require "configs.lspconfig"
     end,
   },
 
+  -- test new blink
+  { import = "nvchad.blink.lazyspec" },
+
   {
-    "williamboman/mason.nvim",
+  	"nvim-treesitter/nvim-treesitter",
-    opts = {
+  	opts = {
-      ensure_installed = {
+  		ensure_installed = {
-        "lua-language-server",
+  			"vim", "lua", "vimdoc",
-        "stylua",
+       "html", "css", "python",
-        "html-lsp",
+        "rust",
-        "css-lsp",
+  		},
-        "prettier",
+  	},
-        "basedpyright", "mypy", "black", "ruff-lsp",
-        "goimports", "gofumpt", "gomodifytags", "impl", "delve",
-        "typescript-language-server",
-        "clangd",
-      },
-    },
   },
 
   {
-    "nvim-treesitter/nvim-treesitter",
+    "kdheepak/lazygit.nvim",
-    opts = {
+      lazy = true,
-      ensure_installed = {
+      cmd = {
-        "vim",
+          "LazyGit",
-        "lua",
+          "LazyGitConfig",
-        "vimdoc",
+          "LazyGitCurrentFile",
-        "html",
+          "LazyGitFilter",
-        "css",
+          "LazyGitFilterCurrentFile",
-        "python",
+      },
-        "typescript",
+      -- optional for floating window border decoration
-        "go",
+      dependencies = {
-        "gomod",
+          "nvim-lua/plenary.nvim",
-        "gowork",
+      },
-        "gosum",
+      -- setting the keybinding for LazyGit with 'keys' is recommended in
+      -- order to load the plugin when the command is run for the first time
+      keys = {
+          { "<leader>lg", "<cmd>LazyGit<cr>", desc = "LazyGit" }
       },
-    },
-  },
-
-  {
-    "kylechui/nvim-surround",
-    version = "*", -- Use for stability; omit to use `main` branch for the latest features
-    event = "VeryLazy",
-    config = function()
-      require("nvim-surround").setup{}
-    end,
   },
 
   {
     "iamcco/markdown-preview.nvim",
     cmd = { "MarkdownPreviewToggle", "MarkdownPreview", "MarkdownPreviewStop" },
+    build = "cd app && yarn install",
+    init = function()
+      vim.g.mkdp_filetypes = { "markdown" }
+    end,
     ft = { "markdown" },
-    build = function()
-      vim.fn["mkdp#util#install"]()
-    end,
-  },
-
-  {
-    "lewis6991/gitsigns.nvim",
-    opts = {
-      current_line_blame = true,
-    },
-  },
-
-  {
-    'nvimdev/dashboard-nvim',
-    event = 'VimEnter',
-    config = function()
-      require "configs.dashboard"
-    end,
-    dependencies = { {'nvim-tree/nvim-web-devicons'}}
-  },
-
-  -- {
-  --   "nvim-telescope/telescope.nvim",
-  --   tag = "0.1.5",
-  --   dependencies = {
-  --     'nvim-lua/plenary.nvim',
-  --     'jonarrien/telescope-cmdline.nvim',
-  --   },
-  --   keys = {
-  --     { ':', '<cmd>Telescope cmdline<cr>', desc = 'Cmdline' }
-  --   },
-  --   opts = {
-  --     ...,
-  --     extensions = {
-  --       cmdline = {
-  --       },
-  --     },
-  --     ...
-  --   },
-  --   config = function(_, opts)
-  --     require("telescope").setup(opts)
-  --     require("telescope").load_extension('cmdline')
-  --   end,
-  -- },
-  {
-    "folke/todo-comments.nvim",
-    dependencies = { "nvim-lua/plenary.nvim" },
-    opts = {}
-  },
-
-  {
-    "kdheepak/lazygit.nvim",
-    cmd = {
-      "LazyGit",
-      "LazyGitConfig",
-      "LazyGitCurrentFile",
-      "LazyGitFilter",
-      "LazyGitFilterCurrentFile",
-    },
-    -- optional for floating window border decoration
-    dependencies = { "nvim-lua/plenary.nvim", },
-    -- setting the keybinding for LazyGit with 'keys' is recommended in
-    -- order to load the plugin when the command is run for the first time
-    keys = {
-      { "<leader>lg", "<cmd>LazyGit<cr>", desc = "LazyGit" }
-    }
-  },
-  {
-    'mrcjkb/rustaceanvim',
-    version = '^6', -- Recommended
-    lazy = false, -- This plugin is already lazy
   },
 }