Merge new modular config

This commit is contained in:
smashblu 2024-09-22 19:16:16 -07:00
parent 270d774c6f
commit efd0b9e719
9 changed files with 99 additions and 835 deletions

View file

@ -0,0 +1,20 @@
return {
{ -- Catppuccin
'catppuccin/nvim',
name = 'catppuccin',
priority = 1000, -- Make sure to load this before all the other start plugins.
opts = {
transparent_background = true,
},
init = function()
-- Load the colorscheme here.
-- Like many other themes, this one has different styles, and you could load
-- any other, such as 'tokyonight-storm', 'tokyonight-moon', or 'tokyonight-day'.
vim.cmd.colorscheme 'catppuccin-mocha'
-- You can configure highlights by doing something like:
vim.cmd.hi 'Comment gui=none'
end,
},
}
-- vim: ts=2 sts=2 sw=2 et

View file

@ -0,0 +1,17 @@
return {
{ -- Markview
'OXY2DEV/markview.nvim',
lazy = false, -- Recommended
-- ft = "markdown" -- If you decide to lazy-load anyway
dependencies = {
-- You will not need this if you installed the
-- parsers manually
-- Or if the parsers are in your $RUNTIMEPATH
'nvim-treesitter/nvim-treesitter',
'nvim-tree/nvim-web-devicons',
},
opts = {
hybrid_modes = { 'n' },
},
},
}

View file

@ -0,0 +1,7 @@
return {
{ -- https://github.com/pmizio/typescript-tools.nvim
'pmizio/typescript-tools.nvim',
dependencies = { 'nvim-lua/plenary.nvim', 'neovim/nvim-lspconfig' },
opts = {},
},
}

View file

@ -179,6 +179,14 @@ return {
-- But for many setups, the LSP (`ts_ls`) will work just fine
-- ts_ls = {},
--
cssls = {},
html = {},
biome = {},
ltex = {},
marksman = {},
tsserver = {},
xmlformatter = {},
yamlls = {},
lua_ls = {
-- cmd = {...},

View file

@ -20,7 +20,6 @@ require('lazy').setup({
-- Use `opts = {}` to force a plugin to be loaded.
--
-- modular approach: using `require 'path/name'` will
-- include a plugin definition from file lua/path/name.lua
@ -36,7 +35,7 @@ require('lazy').setup({
require 'kickstart/plugins/cmp',
require 'kickstart/plugins/tokyonight',
-- require 'kickstart/plugins/tokyonight',
require 'kickstart/plugins/todo-comments',
@ -44,6 +43,14 @@ require('lazy').setup({
require 'kickstart/plugins/treesitter',
-- Load custom plugins
require 'custom/plugins/catppuccin',
require 'custom/plugins/typescript-tools',
require 'custom/plugins/markview',
-- The following two comments only work if you have downloaded the kickstart repo, not just copy pasted the
-- init.lua. If you want these files, they are in the repository, so you can just download them and
-- place them in the correct locations.

View file

@ -7,7 +7,7 @@
vim.opt.number = true
-- You can also add relative line numbers, to help with jumping.
-- Experiment for yourself to see if you like it!
-- vim.opt.relativenumber = true
vim.opt.relativenumber = true
-- Enable mouse mode, can be useful for resizing splits for example!
vim.opt.mouse = 'a'
@ -60,6 +60,10 @@ vim.opt.inccommand = 'split'
vim.opt.cursorline = true
-- Minimal number of screen lines to keep above and below the cursor.
vim.opt.scrolloff = 10
vim.opt.scrolloff = 12
-- Set spell check on with English language
vim.opt.spelllang = 'en_us'
vim.opt.spell = true
-- vim: ts=2 sts=2 sw=2 et