Merge remote-tracking branch 'origin/wsl'

init.lua

@@ -15,8 +15,7 @@ require('lazy').setup(vim.tbl_extend('keep', config.user_lazy_opts(), {
 		{ import = 'plex.plugins.extras.editor' },
 		{ import = 'plex.plugins.extras.org' },
 		{ import = 'plex.plugins.extras.lang.go' },
-		{ import = 'plex.plugins.extras.lang.cpp' },
+		{ import = 'plex.plugins.extras.lang.cpp' }, -- also does C and rust
-		{ import = 'plex.plugins.extras.lang.rust' },
 		{ import = 'plex.plugins.extras.lang.json' },
 		{ import = 'plex.plugins.extras.lang.python' },
 		{ import = 'plex.plugins.extras.lang.yaml' },

lua/plex/config/autocmds.lua

@@ -88,7 +88,7 @@ vim.api.nvim_create_autocmd('BufWritePre', {
 -- Disable conceallevel for specific file-types.
 vim.api.nvim_create_autocmd('FileType', {
 	group = augroup('fix_conceallevel'),
-	pattern = { 'markdown' },
+	pattern = { 'latex', 'tex' },
 	callback = function()
 		vim.opt_local.conceallevel = 0
 	end,

lua/plex/config/keymaps.lua

@@ -344,8 +344,8 @@ map('n', '<leader>"', '<cmd>vsplit<CR>', { desc = 'Split window vertically' })
 map('n', '<leader>wb', '<cmd>buffer#<CR>', { desc = 'Alternate buffer' })
 map('n', '<leader>wc', '<cmd>close<CR>', { desc = 'Close window' })
 map('n', '<leader>wd', '<cmd>bdelete<CR>', { desc = 'Buffer delete' })
-map('n', '<leader>wv', '<cmd>split<CR>', { desc = 'Split window horizontally' })
+map('n', '<leader>w%', '<cmd>split<CR>', { desc = 'Split window horizontally' })
-map('n', '<leader>wg', '<cmd>vsplit<CR>', { desc = 'Split window vertically' })
+map('n', '<leader>w"', '<cmd>vsplit<CR>', { desc = 'Split window vertically' })
 map('n', '<leader>wt', '<cmd>tabnew<CR>', { desc = 'New tab' })
 map('n', '<leader>wtp', '<cmd>tabprevious<CR>', { desc = 'Previous tab' })
 map('n', '<leader>wtn', '<cmd>tabnext<CR>', { desc = 'Next tab' })

lua/plex/plugins/coding.lua

@@ -337,7 +337,7 @@ return {
 				desc = 'Debugging: Toggle breakpoint',
 			},
 			{
-				'<leader>db',
+				'<leader>dc',
 				'<cmd>lua require\'dap\'.continue()<CR>',
 				mode = { 'n', 'x' },
 				desc = 'Debugging: Start or continue debug session',
@@ -355,10 +355,30 @@ return {
 				desc = 'Debugging: Step over code',
 			},
 			{
-				'<leader>dm',
+				'<leader>dr',
 				'<cmd>lua require\'dap\'.repl.open()<CR>',
 				mode = { 'n', 'x' },
-				desc = 'Debugging: Menu',
+				desc = 'Debugging: repl Menu',
+			},
+			{
+				'<leader>dms',
+				function()
+					local widgets = require('dap.ui.widgets')
+					local my_sidebar = widgets.sidebar(widgets.scopes)
+					my_sidebar.open()
+				end,
+				mode = { 'n', 'x' },
+				desc = 'Debugging: Menu scopes',
+			},
+			{
+				'<leader>dmf',
+				function()
+					local widgets = require('dap.ui.widgets')
+					local my_sidebar = widgets.sidebar(widgets.frames)
+					my_sidebar.open()
+				end,
+				mode = { 'n', 'x' },
+				desc = 'Debugging: Menu frames',
 			},
 		},
 	},

lua/plex/plugins/extras/lang/cpp.lua

@@ -1,7 +1,7 @@
 return {
 	{
 		'mfussenegger/nvim-dap',
-		optional = true,
+		-- optional = true,
 		dependencies = {
 			'mfussenegger/nvim-dap-python',
 		},
@@ -10,65 +10,55 @@ return {
 		-- 	{ '<leader>dPt', function() require('dap-python').test_method() end, desc = 'Debug Method' },
 		-- 	{ '<leader>dPc', function() require('dap-python').test_class() end,  desc = 'Debug Class' },
 		-- },
-		config = function()
+		opts = function()
 			local dap = require('dap')
-			dap.adapters.lldb = {
+			dap.adapters.cppdbg = {
+				id = 'cppdbg',
 				type = 'executable',
-				command = '/usr/bin/lldb-vscode', -- adjust as needed, must be absolute path
+				command = '/home/cscherr/.local/share/nvim/nvim-dap/debuggers/cpptools/extension/debugAdapters/bin/OpenDebugAD7',
-				name = 'lldb'
-			}
-			dap.configurations.c= {
-				{
-					name = 'Launch',
-					type = 'lldb',
-					request = 'launch',
-					program = function()
-						return vim.fn.input('Path to executable: ', vim.fn.getcwd() .. '/', 'file')
-					end,
-					cwd = '${workspaceFolder}',
-					stopOnEntry = false,
-					args = {},
-
-					-- 💀
-					-- if you change `runInTerminal` to true, you might need to change the yama/ptrace_scope setting:
-					--
-					--    echo 0 | sudo tee /proc/sys/kernel/yama/ptrace_scope
-					--
-					-- Otherwise you might get the following error:
-					--
-					--    Error on launch: Failed to attach to the target process
-					--
-					-- But you should be aware of the implications:
-					-- https://www.kernel.org/doc/html/latest/admin-guide/LSM/Yama.html
-					-- runInTerminal = false,
-				},
 			}
 			dap.configurations.cpp = {
 				{
-					name = 'Launch',
+					name = "Launch file",
-					type = 'lldb',
+					type = "cppdbg",
-					request = 'launch',
+					request = "launch",
 					program = function()
 						return vim.fn.input('Path to executable: ', vim.fn.getcwd() .. '/', 'file')
 					end,
 					cwd = '${workspaceFolder}',
-					stopOnEntry = false,
+					stopAtEntry = true,
-					args = {},
+					setupCommands = {
+						{
+							text = '-enable-pretty-printing',
+							description = 'enable pretty printing',
+							ignoreFailures = false
+						},
+					},
+
+				},
+				{
+					name = 'Attach to gdbserver :1234',
+					type = 'cppdbg',
+					request = 'launch',
+					MIMode = 'gdb',
+					miDebuggerServerAddress = 'localhost:1234',
+					miDebuggerPath = '/usr/bin/gdb',
+					cwd = '${workspaceFolder}',
+					program = function()
+						return vim.fn.input('Path to executable: ', vim.fn.getcwd() .. '/', 'file')
+					end,
+					setupCommands = {
+						{
+							text = '-enable-pretty-printing',
+							description = 'enable pretty printing',
+							ignoreFailures = false
+						},
+					},
 
-					-- 💀
-					-- if you change `runInTerminal` to true, you might need to change the yama/ptrace_scope setting:
-					--
-					--    echo 0 | sudo tee /proc/sys/kernel/yama/ptrace_scope
-					--
-					-- Otherwise you might get the following error:
-					--
-					--    Error on launch: Failed to attach to the target process
-					--
-					-- But you should be aware of the implications:
-					-- https://www.kernel.org/doc/html/latest/admin-guide/LSM/Yama.html
-					-- runInTerminal = false,
 				},
 			}
+			dap.configurations.c = dap.configurations.cpp
+			dap.configurations.rust = dap.configurations.cpp
 		end,
 	},
 }

lua/plex/plugins/extras/org/neorg.lua

@@ -1,7 +1,7 @@
 return {
 	{
 		"nvim-neorg/neorg",
-		enabled = false,
+		enabled = true,
 		lazy = true,
 		build = ":Neorg sync-parsers",
 		dependencies = { "nvim-lua/plenary.nvim" },