diff --git a/config/.config/nvim/lua/custom/chadrc.lua b/config/.config/nvim/lua/custom/chadrc.lua deleted file mode 100755 index deb2784..0000000 --- a/config/.config/nvim/lua/custom/chadrc.lua +++ /dev/null @@ -1,21 +0,0 @@ ----@type ChadrcConfig -local M = {} - --- Path to overriding theme and highlights files -local highlights = require "custom.highlights" - -M.ui = { - theme_toggle = { "onedark", "one_light" }, - theme = "onedark", - hl_override = highlights.override, - hl_add = highlights.add, - - transparency = false, -} - -M.plugins = require "custom.plugins" - --- check core.mappings for table structure -M.mappings = require "custom.mappings" - -return M diff --git a/config/.config/nvim/lua/custom/highlights.lua b/config/.config/nvim/lua/custom/highlights.lua deleted file mode 100755 index 0b0f1e8..0000000 --- a/config/.config/nvim/lua/custom/highlights.lua +++ /dev/null @@ -1,22 +0,0 @@ --- To find any highlight groups: " Telescope highlights" --- Each highlight group can take a table with variables fg, bg, bold, italic, etc --- base30 variable names can also be used as colors - -local M = {} - ----@type HLTable -M.override = { - CursorLine = { - bg = "black2", - }, - Comment = { - italic = true, - }, -} - ----@type HLTable -M.add = { - NvimTreeOpenedFolderName = { fg = "green", bold = true }, -} - -return M diff --git a/config/.config/nvim/lua/custom/init.lua b/config/.config/nvim/lua/custom/init.lua deleted file mode 100755 index 288db8a..0000000 --- a/config/.config/nvim/lua/custom/init.lua +++ /dev/null @@ -1,7 +0,0 @@ -local autocmd = vim.api.nvim_create_autocmd - --- Auto resize panes when resizing nvim window --- autocmd("VimResized", { --- pattern = "*", --- command = "tabdo wincmd =", --- }) diff --git a/config/.config/nvim/lua/custom/mappings.lua b/config/.config/nvim/lua/custom/mappings.lua deleted file mode 100755 index f5e2bc5..0000000 --- a/config/.config/nvim/lua/custom/mappings.lua +++ /dev/null @@ -1,12 +0,0 @@ ----@type MappingsConfig -local M = {} - -M.general = { - n = { - [";"] = { ":", "enter command mode", opts = { nowait = true } }, - }, -} - --- more keybinds! - -return M diff --git a/config/.config/nvim/lua/custom/plugins/init.lua b/config/.config/nvim/lua/custom/plugins/init.lua deleted file mode 100755 index 5f78b1c..0000000 --- a/config/.config/nvim/lua/custom/plugins/init.lua +++ /dev/null @@ -1,49 +0,0 @@ -local overrides = require "custom.plugins.overrides" - ----@type {[PluginName]: NvPluginConfig|false} -local plugins = { - - -- ["goolord/alpha-nvim"] = { disable = false } -- enables dashboard - - -- Override plugin definition options - ["neovim/nvim-lspconfig"] = { - config = function() - require "plugins.configs.lspconfig" - require "custom.plugins.lspconfig" - end, - }, - - -- overrde plugin configs - ["nvim-treesitter/nvim-treesitter"] = { - override_options = overrides.treesitter, - }, - - ["williamboman/mason.nvim"] = { - override_options = overrides.mason, - }, - - ["nvim-tree/nvim-tree.lua"] = { - override_options = overrides.nvimtree, - }, - - -- Install a plugin - ["max397574/better-escape.nvim"] = { - event = "InsertEnter", - config = function() - require("better_escape").setup() - end, - }, - - -- code formatting, linting etc - ["jose-elias-alvarez/null-ls.nvim"] = { - after = "nvim-lspconfig", - config = function() - require "custom.plugins.null-ls" - end, - }, - - -- remove plugin - -- ["hrsh7th/cmp-path"] = false, -} - -return plugins diff --git a/config/.config/nvim/lua/custom/plugins/lspconfig.lua b/config/.config/nvim/lua/custom/plugins/lspconfig.lua deleted file mode 100755 index d4d3c2f..0000000 --- a/config/.config/nvim/lua/custom/plugins/lspconfig.lua +++ /dev/null @@ -1,13 +0,0 @@ -local on_attach = require("plugins.configs.lspconfig").on_attach -local capabilities = require("plugins.configs.lspconfig").capabilities - -local lspconfig = require "lspconfig" - -local servers = { "html", "cssls", "tsserver", "clangd" } - -for _, lsp in ipairs(servers) do - lspconfig[lsp].setup { - on_attach = on_attach, - capabilities = capabilities, - } -end diff --git a/config/.config/nvim/lua/custom/plugins/null-ls.lua b/config/.config/nvim/lua/custom/plugins/null-ls.lua deleted file mode 100755 index cfdb3e0..0000000 --- a/config/.config/nvim/lua/custom/plugins/null-ls.lua +++ /dev/null @@ -1,25 +0,0 @@ -local present, null_ls = pcall(require, "null-ls") - -if not present then - return -end - -local b = null_ls.builtins - -local sources = { - - -- webdev stuff - b.formatting.deno_fmt, -- choosed deno for ts/js files cuz its very fast! - b.formatting.prettier.with { filetypes = { "html", "markdown", "css" } }, -- so prettier works only on these filetypes - - -- Lua - b.formatting.stylua, - - -- cpp - b.formatting.clang_format, -} - -null_ls.setup { - debug = true, - sources = sources, -} diff --git a/config/.config/nvim/lua/custom/plugins/overrides.lua b/config/.config/nvim/lua/custom/plugins/overrides.lua deleted file mode 100755 index e4225cb..0000000 --- a/config/.config/nvim/lua/custom/plugins/overrides.lua +++ /dev/null @@ -1,44 +0,0 @@ -local M = {} - -M.treesitter = { - ensure_installed = { - "vim", - "lua", - "html", - "css", - "javascript", - "c", - }, -} - -M.mason = { - ensure_installed = { - -- lua stuff - "lua-language-server", - "stylua", - - -- web dev stuff - "css-lsp", - "html-lsp", - "typescript-language-server", - "deno", - }, -} - --- git support in nvimtree -M.nvimtree = { - git = { - enable = true, - }, - - renderer = { - highlight_git = true, - icons = { - show = { - git = true, - }, - }, - }, -} - -return M diff --git a/spacevim.sh b/spacevim.sh index c330985..f485c30 100755 --- a/spacevim.sh +++ b/spacevim.sh @@ -1,22 +1,14 @@ #!/bin/bash echo "Installing Spacevim!" -[ -d $HOME/.vim ] && mv "$HOME/.vim" "$HOME/vim_bk" -[ -f $HOME/.vimrc ] && mv "$HOME/.vimrc" "$HOME/vimrc_bk" -curl -sLf https://spacevim.org/install.sh | bash -s -- --install vim echo "Install Neovim" -trash ~/.local/share/nvim ~/.config/nvim #removes spacevim's symlink mkdir -v ~/bin -if [[ $(lsb_release -cs) != noble ]]; then - trash ~/bin/nvim - curl -L https://github.com/neovim/neovim/releases/latest/download/nvim.appimage -o ~/bin/nvim - chmod u+x ~/bin/nvim -else - sudo apt install neovim -fi +trash ~/bin/nvim +curl -L https://github.com/neovim/neovim/releases/download/v0.11.2/nvim-linux-x86_64.appimage -o ~/bin/nvim +chmod u+x ~/bin/nvim echo "Install NvChad" -git clone https://github.com/NvChad/NvChad ~/.config/nvim --depth 1 +git clone https://github.com/NvChad/starter ~/.config/nvim #echo "Install Lunar Vim" #source: https://www.lunarvim.org/docs/installation