jj, fish, better kanata, etc

programs/nvim/config.lua

@@ -16,16 +16,6 @@ vim.filetype.add({
   }
 })
 
-require("onedark").setup {
-    style = "deep",
-    highlights = {
-        ["@lsp.type.comment"] = {fg = '#77B767'},
-        ["@comment.documentation.rust"] = {fg = '#77B767'},
-        ["@comment.documentation"] = {fg = '#77B767'},
-        ["@comment"] = {fg = '#426639'}
-    }
-}
-require("onedark").load()
 
 local cmp = require("cmp")
 cmp.setup {
@@ -90,18 +80,12 @@ local esc = vim.api.nvim_replace_termcodes(
 local api = require('Comment.api')
 
 vim.keymap.set("n", "<C-_>", ":lua require('Comment.api').toggle.linewise.current()<CR> j", { remap = true })
+vim.keymap.set("i", "<C-_>", "<c-o>:lua require('Comment.api').toggle.linewise.current()<CR>", { remap = true })
 vim.keymap.set("x", "<C-_>", function()
     vim.api.nvim_feedkeys(esc, 'nx', false)
     api.toggle.linewise(vim.fn.visualmode())
 end, { remap = true })
 
--- indent and dedent using tab/shift-ta
-vim.keymap.set("n", "<tab>", ">>_")
-vim.keymap.set("n", "<s-tab>", "<<_")
-vim.keymap.set("i", "<s-tab>", "<c-d>")
-vim.keymap.set("v", "<Tab>", ">gv")
-vim.keymap.set("v", "<S-Tab>", "<gv")
-
 vim.keymap.set('n', 'gr', (function() builtin.lsp_references({jump_type="vsplit"}) end), {})
 vim.keymap.set('n', 'gd', (function() builtin.lsp_definitions({jump_type="vsplit"}) end), {})
 vim.keymap.set('n', 'gt', (function() builtin.lsp_type_definitions({jump_type="vsplit"}) end), {})
@@ -139,9 +123,9 @@ vim.keymap.set('n', '<leader><leader>', builtin.find_files, {})
 vim.keymap.set('n', '<leader>f', builtin.live_grep, {})
 vim.keymap.set('n', '<leader>h', builtin.pickers, {})
 -- vim.keymap.set('n', '<leader>h', builtin.search_history, {})
-vim.keymap.set('n', '<leader>b', (function() builtin.buffers({sort_mru = true}) end), {})
-vim.keymap.set('n', '<leader>d', "<cmd>Telescope diagnostics bufnr=0<cr>", {})
-vim.keymap.set('n', '<leader>ad', builtin.diagnostics, {})
+vim.keymap.set('n', '<leader>b', function() builtin.buffers({sort_mru = true}) end, {})
+vim.keymap.set('n', '<leader>d', function() require('telescope.builtin').diagnostics({ severity_bound = 0, bufnr = 0 }) end, {})
+vim.keymap.set('n', '<leader>ad', function() require('telescope.builtin').diagnostics({ severity_bound = 0 }) end, {})
 vim.keymap.set('n', '<leader>em', "<cmd>RustLsp expandMacro<cr>")
 vim.keymap.set("n", "]d", vim.diagnostic.goto_next)
 vim.keymap.set("n", "[d", vim.diagnostic.goto_prev)
@@ -162,76 +146,11 @@ vim.keymap.set("n", "<leader>x", require("telescope.builtin").resume, {
   desc = "Resume",
 })
 
-local gitsigns = require('gitsigns')
-vim.keymap.set('n', '<leader>gr', gitsigns.reset_hunk)
-vim.keymap.set('n', '<leader>gd', gitsigns.diffthis)
+-- local gitsigns = require('gitsigns')
+-- vim.keymap.set('n', '<leader>gr', gitsigns.reset_hunk)
+-- vim.keymap.set('n', '<leader>gd', gitsigns.diffthis)
+-- vim.keymap.set({'o', 'x'}, 'ig', ':<C-U>Gitsigns select_hunk<CR>')
 
-vim.keymap.set({'o', 'x'}, 'ig', ':<C-U>Gitsigns select_hunk<CR>')
-vim.keymap.set('n', 't', ':Neotree toggle<CR>')
-
--- ============ files and directories ==============
-
--- don't change the directory when a file is opened
--- to work more like an IDE
-vim.opt.autochdir = false
-
--- ============ tabs and indentation ==============
--- automatically indent the next line to the same depth as the current line
-vim.opt.autoindent = true
-vim.opt.smartindent = true
-vim.opt.smarttab = true
--- backspace across lines
-vim.opt.backspace = { "indent", "eol", "start" }
--- :set backspace=indent,eol,start
-
-vim.opt.tabstop = 4
-vim.opt.softtabstop = 4
-vim.opt.shiftwidth = 4
-vim.opt.expandtab = true
-
--- ============ line numbers ==============
--- set number,relativenumber
-vim.opt.number = true
-vim.opt.relativenumber = true
-
--- ============ history ==============
-vim.cmd([[
-  set undodir=~/.vimdid
-  set undofile
-]])
-
-vim.opt.undofile = true
-
--- ============ miscelaneous ==============
-vim.opt.belloff = "all"
-
--- show (usually) hidden characters
-vim.opt.list = true
-vim.opt.listchars = {
-  nbsp = "¬",
-  extends = "»",
-  precedes = "«",
-  trail = "·",
-  tab = ">-",
-}
-
--- paste and yank use global system clipboard
-vim.opt.clipboard = "unnamedplus"
-
--- show partial commands entered in the status line
--- (like show "da" when typing "daw")
-vim.opt.showcmd = true
-vim.opt.mouse = "a"
-
-vim.opt.modeline = true
-
--- highlight the line with the cursor on it
-vim.opt.cursorline = true
-
--- enable spell checking (todo: plugin?)
-vim.opt.spell = false
-
-vim.opt.wrap = false
 
 -- better search
 vim.cmd([[
@@ -264,11 +183,6 @@ vim.cmd([[
   nnoremap <silent> * *zz
   nnoremap <silent> # #zz
   nnoremap <silent> g* g*zz
-
-  " very magic by default
-  nnoremap ? ?\v
-  nnoremap / /\v
-  cnoremap %s/ %sm/
 ]])
 
 vim.cmd([[