diff --git a/flake.lock b/flake.lock index c93e40d..0bfcf0a 100644 --- a/flake.lock +++ b/flake.lock @@ -59,11 +59,11 @@ ] }, "locked": { - "lastModified": 1771744638, - "narHash": "sha256-EDLi+YAsEEAmMeZe1v6GccuGRbCkpSZp/+A6g+pivR8=", + "lastModified": 1772020340, + "narHash": "sha256-aqBl3GNpCadMoJ/hVkWTijM1Aeilc278MjM+LA3jK6g=", "owner": "nix-community", "repo": "home-manager", - "rev": "cb6c151f5c9db4df0b69d06894dc8484de1f16a0", + "rev": "36e38ca0d9afe4c55405fdf22179a5212243eecc", "type": "github" }, "original": { @@ -101,11 +101,11 @@ ] }, "locked": { - "lastModified": 1771520882, - "narHash": "sha256-9SeTZ4Pwr730YfT7V8Azb8GFbwk1ZwiQDAwft3qAD+o=", + "lastModified": 1771992996, + "narHash": "sha256-Y/ijH/unOPxzUicbla6yT/14RJgubUWnY2I2A6Ast2Q=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "6a7fdcd5839ec8b135821179eea3b58092171bcf", + "rev": "3bfa436c1975674ca465ce34586467be301ff509", "type": "github" }, "original": { @@ -190,11 +190,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1771714954, - "narHash": "sha256-nhZJPnBavtu40/L2aqpljrfUNb2rxmWTmSjK2c9UKds=", + "lastModified": 1771903837, + "narHash": "sha256-sdaqdnsQCv3iifzxwB22tUwN/fSHoN7j2myFW5EIkGk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "afbbf774e2087c3d734266c22f96fca2e78d3620", + "rev": "e764fc9a405871f1f6ca3d1394fb422e0a0c3951", "type": "github" }, "original": { @@ -257,11 +257,11 @@ ] }, "locked": { - "lastModified": 1771889317, - "narHash": "sha256-YV17Q5lEU0S9ppw08Y+cs4eEQJBuc79AzblFoHORLMU=", + "lastModified": 1772048434, + "narHash": "sha256-/wA0OaH6kZ/pFA+nXR/tvg5oupOmEDmMS5us79JT60o=", "owner": "Mic92", "repo": "sops-nix", - "rev": "b027513c32e5b39b59f64626b87fbe168ae02094", + "rev": "334daa7c273dd8bf7a0cd370e4e16022b64e55e9", "type": "github" }, "original": { diff --git a/modules/home/nvim.nix b/modules/home/nvim.nix index 4fdf39e..758964a 100644 --- a/modules/home/nvim.nix +++ b/modules/home/nvim.nix @@ -63,7 +63,8 @@ in bullets-vim nvim-dap nvim-nio - nvim-dap-ui + # nvim-dap-ui + nvim-dap-view nvim-dap-virtual-text nvim-dap-go nvim-dap-python diff --git a/modules/nvim/lua/base.lua b/modules/nvim/lua/base.lua index 1ef4409..d3f2d86 100644 --- a/modules/nvim/lua/base.lua +++ b/modules/nvim/lua/base.lua @@ -36,7 +36,6 @@ vim.opt.foldopen = vim.opt.foldopen - 'block' vim.opt.foldlevel = 99 vim.opt.lazyredraw = true vim.opt.listchars = 'eol:¬,tab:▸ ,trail:·' -vim.opt.fillchars = 'vert:|,fold: ' vim.opt.list = true vim.opt.laststatus = 3 vim.opt.scrolloff = 8 diff --git a/modules/nvim/lua/keymaps.lua b/modules/nvim/lua/keymaps.lua index fdd9cfc..9e47649 100644 --- a/modules/nvim/lua/keymaps.lua +++ b/modules/nvim/lua/keymaps.lua @@ -123,11 +123,12 @@ vim.keymap.set('n', "dr", function() require("dap").repl.toggle() end) vim.keymap.set('n', "ds", function() require("dap").session() end) vim.keymap.set('n', "dt", function() require("dap").terminate() end) vim.keymap.set('n', "dw", function() require("dap.ui.widgets").hover() end) +vim.keymap.set('n', "dv", function() require("dap-view").toggle() end) vim.keymap.set('n', "", function() require("dap").continue() end) -vim.keymap.set('n', "", function() require("dap").step_into() end) -vim.keymap.set('n', "", function() require("dap").step_over() end) -vim.keymap.set('n', "", function() require("dap").step_out() end) +vim.keymap.set('n', "", function() require("dap").step_into() end) +vim.keymap.set('n', "", function() require("dap").step_over() end) +vim.keymap.set('n', "", function() require("dap").step_out() end) -- Tmux Navigator diff --git a/modules/nvim/lua/plugins.lua b/modules/nvim/lua/plugins.lua index 723be53..b9a8a1c 100644 --- a/modules/nvim/lua/plugins.lua +++ b/modules/nvim/lua/plugins.lua @@ -337,10 +337,10 @@ require('lint').linters_by_ft = { require("trouble").setup() require("todo-comments").setup() -require("dapui").setup() +require("dap-view").setup() require("nvim-dap-virtual-text").setup() -local dap, dapui = require("dap"), require("dapui") +local dap, dapui = require("dap"), require("dap-view") dap.listeners.before.attach.dapui_config = function() dapui.open() end @@ -363,19 +363,19 @@ dap.adapters.codelldb = { } } -dap.configurations.zig = { - { - name = "Launch Zig Program", - type = "codelldb", - request = "launch", - program = function() - -- Prompts for the executable path when you start debugging - return vim.fn.input('Path to executable: ', vim.fn.getcwd() .. '/zig-out/bin/', 'file') - end, - cwd = "${workspaceFolder}", - stopOnEntry = false, - }, -} +-- dap.configurations.zig = { +-- { +-- name = "Launch Zig Program", +-- type = "codelldb", +-- request = "launch", +-- program = function() +-- -- Prompts for the executable path when you start debugging +-- return vim.fn.input('Path to executable: ', vim.fn.getcwd() .. '/zig-out/bin/', 'file') +-- end, +-- cwd = "${workspaceFolder}", +-- stopOnEntry = false, +-- }, +-- } if _G.is_mac then workspaces = {