lot of updates.

This commit is contained in:
Dan Chadwick
2024-10-20 12:25:10 -04:00
parent 914f9ea767
commit 7623c0265c
12 changed files with 189 additions and 97 deletions

BIN
lua/plugins/.DS_Store vendored Normal file

Binary file not shown.

View File

@@ -0,0 +1,55 @@
return {
'catppuccin/nvim',
priority = 1000,
name = "catppuccin",
config = function()
require("catppuccin").setup({
flavour = "macchiato", -- latte, frappe, macchiato, mocha
background = { -- :h background
light = "latte",
dark = "mocha",
},
transparent_background = false, -- disables setting the background color.
show_end_of_buffer = false, -- shows the '~' characters after the end of buffers
term_colors = false, -- sets terminal colors (e.g. `g:terminal_color_0`)
dim_inactive = {
enabled = false, -- dims the background color of inactive window
shade = "dark",
percentage = 0.15, -- percentage of the shade to apply to the inactive window
},
no_italic = false, -- Force no italic
no_bold = false, -- Force no bold
no_underline = false, -- Force no underline
styles = { -- Handles the styles of general hi groups (see `:h highlight-args`):
comments = { "italic" }, -- Change the style of comments
conditionals = { "italic" },
loops = {},
functions = {},
keywords = {},
strings = {},
variables = {},
numbers = {},
booleans = {},
properties = {},
types = {},
operators = {},
-- miscs = {}, -- Uncomment to turn off hard-coded styles
},
color_overrides = {},
custom_highlights = {},
default_integrations = true,
integrations = {
cmp = true,
gitsigns = true,
nvimtree = true,
treesitter = true,
notify = false,
mini = {
enabled = true,
indentscope_color = "",
},
-- For more plugins integrations please scroll down (https://github.com/catppuccin/nvim#integrations)
},
})
end
}

View File

@@ -0,0 +1,3 @@
return {
"tpope/vim-commentary"
}

View File

@@ -9,7 +9,7 @@ return {
"williamboman/mason-lspconfig.nvim",
config = function()
require("mason-lspconfig").setup({
ensure_installed = { "lua_ls", "phpactor" }
ensure_installed = { "lua_ls", "phpactor", "rust_analyzer" }
})
end
},
@@ -24,6 +24,9 @@ return {
lspconfig.phpactor.setup({
capabilities = capabilities
})
lspconfig.rust_analyzer.setup({
capabilities = capabilities
})
vim.keymap.set("n", 'K', vim.lsp.buf.hover, {})
vim.keymap.set('n', 'gd', vim.lsp.buf.definition, {})
vim.keymap.set({ 'n' }, '<leader>ca', vim.lsp.buf.code_action, {})

View File

@@ -1,7 +1,7 @@
return {
'nvim-lualine/lualine.nvim',
dependencies = {
'nvim-tree/nvim-web-devicons'
dependencies = {
'nvim-tree/nvim-web-devicons'
},
config = function()
require('lualine'). setup({

View File

@@ -1,73 +0,0 @@
return {
'rose-pine/neovim',
name = 'rose-pine',
config = function()
require("rose-pine").setup({
variant = "moon", -- auto, main, moon, or dawn
dark_variant = "main", -- main, moon, or dawn
dim_inactive_windows = false,
extend_background_behind_borders = true,
enable = {
terminal = true,
legacy_highlights = true, -- Improve compatibility for previous versions of Neovim
migrations = true, -- Handle deprecated options automatically
},
styles = {
bold = false,
italic = false,
transparency = false,
},
groups = {
border = "muted",
link = "iris",
panel = "surface",
error = "love",
hint = "iris",
info = "foam",
note = "pine",
todo = "rose",
warn = "gold",
git_add = "foam",
git_change = "rose",
git_delete = "love",
git_dirty = "rose",
git_ignore = "muted",
git_merge = "iris",
git_rename = "pine",
git_stage = "iris",
git_text = "rose",
git_untracked = "subtle",
h1 = "iris",
h2 = "foam",
h3 = "rose",
h4 = "gold",
h5 = "pine",
h6 = "foam",
},
highlight_groups = {
-- Comment = { fg = "foam" },
-- VertSplit = { fg = "muted", bg = "muted" },
},
before_highlight = function(group, highlight, palette)
-- Disable all undercurls
-- if highlight.undercurl then
-- highlight.undercurl = false
-- end
--
-- Change palette colour -- if highlight.fg == palette.pine then
-- highlight.fg = palette.foam
-- end
end,
})
vim.cmd("colorscheme rose-pine")
end
}

View File

@@ -29,5 +29,11 @@ return {
-- load_extension, somewhere after setup function:
require("telescope").load_extension("ui-select")
end
},
{
"nvim-telescope/telescope-dap.nvim",
config = function()
require('telescope').load_extension('dap')
end
}
}

View File

@@ -4,7 +4,7 @@ return {
config = function()
local configs = require("nvim-treesitter.configs")
configs.setup({
ensure_installed = { "php", "lua", "vim", "javascript", "html", "yaml" },
ensure_installed = { "php", "lua", "vim", "javascript", "html", "yaml", "twig" },
sync_install = false,
highlight = { enable = true },
indent = { enable = true },

29
lua/plugins/xdebug.lua Normal file
View File

@@ -0,0 +1,29 @@
return {
{
'mfussenegger/nvim-dap',
},
{
"jay-babu/mason-nvim-dap.nvim",
config = function()
require("mason-nvim-dap").setup({
ensure_installed = { "php-debug-adapter" }
})
end
},
{
'theHamsta/nvim-dap-virtual-text',
config = function()
require("nvim-dap-virtual-text").setup()
end
},
{
"rcarriga/nvim-dap-ui",
dependencies = {
"mfussenegger/nvim-dap",
"nvim-neotest/nvim-nio"
},
config = function()
require("dapui").setup()
end
}
}