This commit is contained in:
iceyrazor 2025-06-20 03:11:24 -05:00
parent 7e2e0bdc3a
commit b3e7778019
5 changed files with 106 additions and 19 deletions

View File

@ -144,11 +144,12 @@ general {
# https://wiki.hyprland.org/Configuring/Variables/#variable-types for info about colors # https://wiki.hyprland.org/Configuring/Variables/#variable-types for info about colors
# col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg # col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg
# col.active_border = rgba(cf68e6ee) rgba(8568e6ee) 45deg
col.active_border = rgba(8568e6ee) rgba(cf68e6ee) 45deg col.active_border = rgba(8568e6ee) rgba(cf68e6ee) 45deg
col.active_border = rgba(cf68e6ee) rgba(8568e6ee) 45deg
#33ccff #33ccff
#00ff99 #00ff99
#8568e6 #8568e6
#cf68e6
col.inactive_border = rgba(595959aa) col.inactive_border = rgba(595959aa)
# Set to true enable resizing windows by clicking and dragging on borders and gaps # Set to true enable resizing windows by clicking and dragging on borders and gaps

75
env/.config/nvim/after/plugin/dap.lua vendored Normal file
View File

@ -0,0 +1,75 @@
local ok, dap = pcall(require, 'dap')
if ok then
vim.keymap.set("n", "<Leader>dl", function() dap.step_into() end)
vim.keymap.set("n", "<Leader>dj", function() dap.step_over() end)
vim.keymap.set("n", "<Leader>dk", function() dap.step_out() end)
vim.keymap.set("n", "<Leader>dc", function() dap.continue() end)
vim.keymap.set("n", "<Leader>db", function() dap.toggle_breakpoint() end)
vim.keymap.set("n", "<Leader>db>", function()
dap.set_breakpoint(vim.fn.input('Breakpoint condition: '))
end)
vim.keymap.set("n", "<Leader>dd", function() dap.terminate() end)
vim.keymap.set("n", "<Leader>dr", function() dap.run_last() end)
--vim.keymap.set("n", "<Leader>dt", "<cmd>lua vim.cmd('RustLsp testables')<Cr>")
-- vim.api.nvim_set_hl(namespace, 'DapBreakpoint', { fg='#993939', bg='#31353f' })
-- vim.api.nvim_set_hl(namespace, 'DapLogPoint', { fg='#61afef', bg='#31353f' })
-- vim.api.nvim_set_hl(namespace, 'DapStopped', { fg='#98c379', bg='#31353f' })
-- Reuse current SignColumn background (except for DapStoppedLine)
local sign_column_hl = vim.api.nvim_get_hl(0, { name = 'SignColumn' })
-- if bg or ctermbg aren't found, use bg = 'bg' (which means current Normal) and ctermbg = 'Black'
-- convert to 6 digit hex value starting with #
local sign_column_bg = (sign_column_hl.bg ~= nil) and ('#%06x'):format(sign_column_hl.bg) or 'bg'
local sign_column_ctermbg = (sign_column_hl.ctermbg ~= nil) and sign_column_hl.ctermbg or 'Black'
vim.api.nvim_set_hl(0, 'DapStopped', { fg = '#00ff00', bg = sign_column_bg, ctermbg = sign_column_ctermbg })
vim.api.nvim_set_hl(0, 'DapStoppedLine', { bg = '#2e4d3d', ctermbg = 'Green' })
vim.api.nvim_set_hl(0, 'DapBreakpoint', { fg = '#c23127', bg = sign_column_bg, ctermbg = sign_column_ctermbg })
vim.api.nvim_set_hl(0, 'DapBreakpointRejected', { fg = '#888ca6', bg = sign_column_bg, ctermbg = sign_column_ctermbg })
vim.api.nvim_set_hl(0, 'DapLogPoint', { fg = '#61afef', bg = sign_column_bg, ctermbg = sign_column_ctermbg })
vim.fn.sign_define('DapBreakpoint', { text='', texthl='DapBreakpoint', linehl='DapBreakpoint', numhl='DapBreakpoint' })
vim.fn.sign_define('DapBreakpointCondition', { text='', texthl='DapBreakpoint', linehl='DapBreakpoint', numhl='DapBreakpoint' })
vim.fn.sign_define('DapBreakpointRejected', { text='', texthl='DapBreakpoint', linehl='DapBreakpoint', numhl= 'DapBreakpoint' })
vim.fn.sign_define('DapLogPoint', { text='', texthl='DapLogPoint', linehl='DapLogPoint', numhl= 'DapLogPoint' })
vim.fn.sign_define('DapStopped', { text='', texthl='DapStopped', linehl='DapStopped', numhl= 'DapStopped' })
local ok, dapui = pcall(require, 'dapui')
if ok then
dapui.setup()
dap.listeners.before.attach.dapui_config = function()
dapui.open()
end
dap.listeners.before.launch.dapui_config = function()
dapui.open()
end
dap.listeners.before.event_terminated.dapui_config = function()
dapui.close()
end
dap.listeners.before.event_exited.dapui_config = function()
dapui.close()
end
end
dap.configurations.rust = {
{
name = "Launch",
type = "codelldb",
request = "launch",
program = function()
--return vim.fn.input("Path to executable: ", vim.fn.getcwd() .. "/target/debug/", "file")
if vim.fn.expand("%:t:r") == "main" then
return vim.fn.getcwd() .. "/target/debug/" .. vim.fn.fnamemodify(vim.fn.getcwd(), ':t')
else
return vim.fn.getcwd() .. "/target/debug/" .. vim.fn.fnameescape(vim.fn.expand("%:t:r"))
end
end,
cwd = "${workspaceFolder}",
stopOnEntry = false,
},
}
end

View File

@ -142,6 +142,16 @@ if ok then
"github:mason-org/mason-registry", "github:mason-org/mason-registry",
}, },
}) })
require('mason-nvim-dap').setup({
ensure_installed = {
"codelldb",
},
handlers = {
function(config)
require("mason-nvim-dap").default_setup(config)
end,
}
})
require('mason-lspconfig').setup({ require('mason-lspconfig').setup({
ensure_installed = { ensure_installed = {
--"markdownlint-cli2", --"markdownlint-cli2",
@ -172,6 +182,14 @@ if ok then
end end
} }
}) })
vim.filetype.add({
extension = {
src = "greyscript"
}
})
lsp.greybel.setup({}) lsp.greybel.setup({})
vim.api.nvim_create_autocmd('LspAttach', { vim.api.nvim_create_autocmd('LspAttach', {

View File

@ -22,13 +22,13 @@ vim.o.ignorecase = true
vim.opt.updatetime = 50 vim.opt.updatetime = 50
--vim.opt.colorcolumn = "80" --vim.opt.colorcolumn = "80"
--vim.cmd('colorscheme vim') --vim.cmd('colorscheme vim')
vim.cmd('colorscheme tokyonight') --vim.cmd('colorscheme tokyonight')
vim.cmd('colorscheme eldritch')
vim.api.nvim_set_hl(0, "Normal", { bg = "none" }) vim.api.nvim_set_hl(0, "Normal", { bg = "none" })
vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" }) vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" })
vim.cmd('hi SignColumn ctermbg=0') vim.cmd('hi SignColumn ctermbg=0')
vim.cmd('set signcolumn=no')
vim.cmd('hi Pmenu ctermfg=120') vim.cmd('hi Pmenu ctermfg=120')
vim.cmd('hi Pmenu ctermbg=0') vim.cmd('hi Pmenu ctermbg=0')
@ -43,13 +43,6 @@ vim.opt.termguicolors = true
--vim.api.nvim_set_hl(0, '@lsp.type.comment.cpp', {}) --vim.api.nvim_set_hl(0, '@lsp.type.comment.cpp', {})
vim.filetype.add({
extension = {
src = "greyscript"
}
})
-- make no file extension go to sh type -- make no file extension go to sh type
vim.api.nvim_create_autocmd({"BufRead", "BufNewFile"}, { vim.api.nvim_create_autocmd({"BufRead", "BufNewFile"}, {
pattern = "*", pattern = "*",

View File

@ -19,6 +19,8 @@ return require('packer').startup(function(use)
use { "rose-pine/neovim", as = "rose-pine" } use { "rose-pine/neovim", as = "rose-pine" }
use { "folke/tokyonight.nvim", as = "tokyonight"} use { "folke/tokyonight.nvim", as = "tokyonight"}
use { "eldritch-theme/eldritch.nvim", as = "eldritch" }
use "jbyuki/quickmath.nvim" use "jbyuki/quickmath.nvim"
@ -66,6 +68,7 @@ return require('packer').startup(function(use)
requires = { requires = {
'williamboman/mason.nvim', 'williamboman/mason.nvim',
'williamboman/mason-lspconfig.nvim', 'williamboman/mason-lspconfig.nvim',
"jay-babu/mason-nvim-dap.nvim",
-- Autocompletion -- Autocompletion
'hrsh7th/cmp-nvim-lsp', 'hrsh7th/cmp-nvim-lsp',
'hrsh7th/cmp-buffer', 'hrsh7th/cmp-buffer',
@ -79,20 +82,17 @@ return require('packer').startup(function(use)
} }
} }
use 'folke/trouble.nvim' use 'folke/trouble.nvim'
use 'mfussenegger/nvim-lint' use 'mfussenegger/nvim-lint'
use 'nvimtools/none-ls.nvim' use 'nvimtools/none-ls.nvim'
-- to dap, or not to dap? tis the question -- to dap, or not to dap? tis the question
--use 'mfussenegger/nvim-dap' -- ill trya dap
--use { "rcarriga/nvim-dap-ui", requires = {"mfussenegger/nvim-dap", "nvim-neotest/nvim-nio"} } -- use 'mrcjkb/rustaceanvim'
--[[
use { use 'mfussenegger/nvim-dap'
"williamboman/mason.nvim", use { "rcarriga/nvim-dap-ui", requires = {"mfussenegger/nvim-dap", "nvim-neotest/nvim-nio"} }
"mfussenegger/nvim-dap",
"jay-babu/mason-nvim-dap.nvim",
}
--]]
use({ "iamcco/markdown-preview.nvim", run = "cd app && npm install", setup = function() vim.g.mkdp_filetypes = { "markdown" } end, ft = { "markdown" }, }) use({ "iamcco/markdown-preview.nvim", run = "cd app && npm install", setup = function() vim.g.mkdp_filetypes = { "markdown" } end, ft = { "markdown" }, })