Add nvim-dap-disasm to view disassembly during debug

after/ftplugin/dap-view-term.lua

@@ -1 +0,0 @@
-vim.o.signcolumn = 'no'

init.lua

@@ -1,5 +1,3 @@
-vim.loader.enable()
-
 vim.g.mapleader = ' '
 vim.g.maplocalleader = ' '
 
@@ -13,7 +11,7 @@ end
 pcall(function() require('local') end)
 
 local lazypath = vim.fn.stdpath('data') .. '/lazy/lazy.nvim'
-if not vim.uv.fs_stat(lazypath) then
+if not vim.loop.fs_stat(lazypath) then
   vim.fn.system({ 'git', 'clone', '--filter=blob:none',
     'https://github.com/folke/lazy.nvim.git', '--branch=stable', lazypath })
 end

lua/plugins/colorscheme.lua

@@ -36,7 +36,6 @@ local kanagawa = {
     -- Don't lighlight TODO specially in comments
     for _, todo_group in pairs({
       'confTodo',
-      'mojoTodo',
       'ps1CommentTodo',
       'pythonTodo',
       'zshTodo',

lua/plugins/debugger.lua

@@ -30,11 +30,23 @@ return {
 
     -- UI plugins
     require('dap-view').setup({
-      auto_toggle = true,
+      winbar = {
+        sections = {
+          "console", "watches", "scopes", "exceptions",
+          "breakpoints", "threads", "disassembly", "repl",
+        },
+        -- Must be one of the sections declared above
+        default_section = "console",
+      }
     })
     require('nvim-dap-virtual-text').setup({})
     require('dap-disasm').setup({
       dapview_register = true,
+      -- dapview = {
+      --   keymap = "D",
+      --   label = "Disassembly [D]",
+      --   short_label = "󰒓 [D]",
+      -- },
     })
 
     vim.api.nvim_create_autocmd({ "FileType" }, {

lua/plugins/treesitter.lua

@@ -98,10 +98,5 @@ return {
         },
       },
     })
-
-    -- Keymaps
-    vim.keymap.set('n', '<leader>fm', function()
-      vim.o.foldmethod = 'expr'
-    end, {})
   end
 }

lua/plugins/utilities.lua

@@ -33,18 +33,8 @@ local noice = {
 
 return {
   -- noice,
-  {
+  { 'echasnovski/mini.comment',  opts = { options = { ignore_blank_line = true } } },
-    'echasnovski/mini.comment',
+  { 'tpope/vim-unimpaired', lazy = false },
-    opts = {
-      options = {
-        ignore_blank_line = true,
-      }
-    },
-  },
-  {
-    'tpope/vim-unimpaired',
-    lazy = false,
-  },
   { 'stevearc/dressing.nvim' },
   { 'kevinhwang91/nvim-bqf' },
 }

plugin/commands.lua

@@ -52,7 +52,7 @@ vim.api.nvim_create_user_command('Remove', function(opts)
     end
   end
   -- Actually remove the file using the selected callback.
-  vim.uv.fs_unlink(path, callback)
+  vim.loop.fs_unlink(path, callback)
 end, { bang = true })
 
 -- :Move the file associated with the current buffer
@@ -62,7 +62,7 @@ vim.api.nvim_create_user_command('Move', function(opts)
   if vim.fn.isdirectory(dest) ~= 0 then
     dest = vim.fn.resolve(dest .. '/' .. vim.fn.expand('%:t'))
   end
-  vim.uv.fs_rename(source, dest, function(err, success)
+  vim.loop.fs_rename(source, dest, function(err, success)
     if success then
       vim.schedule(function()
         vim.cmd.edit(dest)
@@ -87,7 +87,7 @@ vim.api.nvim_create_user_command('Rename', function(opts)
     dest = vim.fn.resolve(dir .. '/' .. opts.args)
   end
   local buffer = vim.api.nvim_get_current_buf()
-  vim.uv.fs_rename(source, dest, function(err, success)
+  vim.loop.fs_rename(source, dest, function(err, success)
     if not success then
       error(err)
     else

plugin/mappings.lua

@@ -29,7 +29,7 @@ vim.keymap.set('', '<leader>p', '"+p', opts)
 vim.keymap.set('', '<leader>P', '"+P', opts)
 
 -- Undo neovim's default mapping of Y to y$
-vim.keymap.del('n', 'Y')
+vim.cmd.unmap('Y')
 
 -- Make nvim :terminal more like vim :terminal
 vim.keymap.set('t', '<C-w>N', '<C-\\><C-n>', opts)
@@ -50,10 +50,3 @@ vim.keymap.set('v', '<leader>rg', ":'<,'>Rg<CR>", opts)
 
 -- Mapping to toggle checkboxes
 vim.keymap.set('n', '<leader><CR>', ':CheckboxToggle<CR>', opts)
-
--- Format whole file using internal algorithm
-vim.keymap.set('n', '<leader>gw', function()
-  local view = vim.fn.winsaveview()
-  vim.cmd('normal! gggwG')
-  vim.fn.winrestview(view)
-end, { desc = 'Format whole file with gw' })

plugin/settings.lua

@@ -91,7 +91,7 @@ vim.opt.foldlevel = 20
 vim.opt.foldmethod = 'expr'
 vim.opt.foldexpr = 'nvim_treesitter#foldexpr()'
 vim.opt.foldtext = ''
-vim.opt.fillchars = { fold = ' ' }
+vim.opt.fillchars = 'fold: '
 
 -- Enable all mouse features
 vim.opt.mouse = 'a'