chore: fix system after repair

sQVe · Aug 5, 2024 · 2a24b48 · 2a24b48
1 parent f709e4a
commit 2a24b48
Show file tree

Hide file tree

Showing 5 changed files with 165 additions and 120 deletions.
diff --git a/config/nvim/lazy-lock.json b/config/nvim/lazy-lock.json
@@ -2,63 +2,63 @@
   "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" },
   "blame.nvim": { "branch": "main", "commit": "dedbcdce857f708c63f261287ac7491a893912d0" },
   "bufignore.nvim": { "branch": "main", "commit": "ada90dfbc7537261c372542c60e6f59f6aa446a0" },
-  "catppuccin": { "branch": "main", "commit": "31fcfb02c47952d5c75aec893b93b2878abe5fbb" },
+  "catppuccin": { "branch": "main", "commit": "e1268d1c0351aa5a42ea00a680ce84de2ba080fc" },
   "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
   "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" },
   "cmp-emoji": { "branch": "main", "commit": "e8398e2adf512a03bb4e1728ca017ffeac670a9f" },
-  "cmp-git": { "branch": "main", "commit": "8dfbc33fb32c33e5c0be9dcc8176a4f4d395f95e" },
+  "cmp-git": { "branch": "main", "commit": "3d83031c4b63f9b10703e32e070cda0700a81992" },
   "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
-  "codecompanion.nvim": { "branch": "main", "commit": "fb23266395d73caceaa2444f5444da6955f9651e" },
-  "conform.nvim": { "branch": "master", "commit": "cd75be867f2331b22905f47d28c0c270a69466aa" },
+  "codecompanion.nvim": { "branch": "main", "commit": "4e91c5ad95e4ef511064c5b9d36d66e7e0672d01" },
+  "conform.nvim": { "branch": "master", "commit": "25d48271e3d4404ba017cb92a37d3a681c1ad149" },
   "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
   "dressing.nvim": { "branch": "master", "commit": "6741f1062d3dc6e4755367a7e9b347b553623f04" },
-  "fidget.nvim": { "branch": "main", "commit": "ef99df04a1c53a453602421bc0f756997edc8289" },
-  "flash.nvim": { "branch": "main", "commit": "43f67935d388fbb540f8b40e8cbfd80de54f978a" },
+  "fidget.nvim": { "branch": "main", "commit": "d855eed8a06531a7e8fd0684889b2943f373c469" },
+  "flash.nvim": { "branch": "main", "commit": "34c7be146a91fec3555c33fe89c7d643f6ef5cf1" },
   "grapple.nvim": { "branch": "main", "commit": "7aedc261b05a6c030397c4bc26416efbe746ebf1" },
-  "grug-far.nvim": { "branch": "main", "commit": "3e40d89830c315b267e327b7546da73b8ad59285" },
-  "gx.nvim": { "branch": "main", "commit": "cf6ed6ba86ffe4e3f51a898c03a05023b7a2fe48" },
+  "grug-far.nvim": { "branch": "main", "commit": "3e491ca05c50f87d02543adb010aed9dfb1e12c1" },
+  "gx.nvim": { "branch": "main", "commit": "d921f21f200113fd3201194aa9dddb033e83768a" },
   "headlines.nvim": { "branch": "master", "commit": "618ef1b2502c565c82254ef7d5b04402194d9ce3" },
   "incline.nvim": { "branch": "main", "commit": "16fc9c073e3ea4175b66ad94375df6d73fc114c0" },
-  "indent-blankline.nvim": { "branch": "master", "commit": "65e20ab94a26d0e14acac5049b8641336819dfc7" },
-  "lazy.nvim": { "branch": "main", "commit": "407e65c7924989c1efed6bbc89e6287e2d140f02" },
-  "lazydev.nvim": { "branch": "main", "commit": "9876fde06f7fc07dca4fe386b0ecfd0d9fa97f6f" },
-  "lspkind-nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" },
-  "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" },
+  "indent-blankline.nvim": { "branch": "master", "commit": "3fe94b8034dd5241cb882bb73847303b58857ecf" },
+  "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" },
+  "lazydev.nvim": { "branch": "main", "commit": "491452cf1ca6f029e90ad0d0368848fac717c6d2" },
+  "lspkind-nvim": { "branch": "master", "commit": "cff4ae321a91ee3473a92ea1a8c637e3a9510aec" },
+  "lualine.nvim": { "branch": "master", "commit": "544dd1583f9bb27b393f598475c89809c4d5e86b" },
   "luvit-meta": { "branch": "main", "commit": "ce76f6f6cdc9201523a5875a4471dcfe0186eb60" },
   "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
   "mini.ai": { "branch": "main", "commit": "45587078f323eaf41b9f701bbc04f8d1ab008979" },
   "mini.align": { "branch": "main", "commit": "b54d88b16bfac62ca6b3d699566135639a3ca4fa" },
   "mini.bufremove": { "branch": "main", "commit": "1ee294a97e091d3cf967974df622c0d887890dc2" },
-  "mini.diff": { "branch": "main", "commit": "d052bf31cc01bb1dde0afd129d8dcdd9f36b9d35" },
-  "mini.files": { "branch": "main", "commit": "acfc4e46f6722a0690ce640632c5b5515ddade70" },
-  "mini.hipatterns": { "branch": "main", "commit": "aa68eb143ce77a57b6416fb4bd71ee0adba5a517" },
+  "mini.diff": { "branch": "main", "commit": "d58f9cb13400aedc5b5a0ef70fcdf31871ba2ee6" },
+  "mini.files": { "branch": "main", "commit": "99aef1d68a01dd8fd8d37bbf62d67766f97311e3" },
+  "mini.hipatterns": { "branch": "main", "commit": "1811b0661721285fc83494d2e687d538fb3ddac8" },
   "mini.pairs": { "branch": "main", "commit": "927d19cbdd0e752ab1c7eed87072e71d2cd6ff51" },
-  "mini.surround": { "branch": "main", "commit": "7098744c8d4573a4b32cb172965f6b2ba03465d2" },
+  "mini.surround": { "branch": "main", "commit": "57caca9525cec0ea771a67326b0ee637d056078a" },
   "notebox.nvim": { "branch": "main", "commit": "7d6c5c9f97f075fe5ce7806b930ec55cee52b886" },
   "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" },
-  "nvim-cmp": { "branch": "main", "commit": "a110e12d0b58eefcf5b771f533fc2cf3050680ac" },
+  "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" },
   "nvim-lint": { "branch": "master", "commit": "efc6fc83f0772283e064c53a8f9fb5645bde0bc0" },
-  "nvim-lspconfig": { "branch": "master", "commit": "cf97d2485fc3f6d4df1b79a3ea183e24c272215e" },
+  "nvim-lspconfig": { "branch": "master", "commit": "81a19de18990208b678be084597613e2dbe66912" },
   "nvim-navic": { "branch": "master", "commit": "8649f694d3e76ee10c19255dece6411c29206a54" },
-  "nvim-snippets": { "branch": "main", "commit": "5c978b3ba0c504dc9f94ca93d17029f26064d229" },
+  "nvim-snippets": { "branch": "main", "commit": "56b4052f71220144689caaa2e5b66222ba5661eb" },
   "nvim-tree-pairs": { "branch": "main", "commit": "e7f7b6cc28dda6f3fa271ce63b0d371d5b7641da" },
-  "nvim-treesitter": { "branch": "master", "commit": "f7c05e3e0510df7c742d455c802e27b6ee7ab384" },
-  "nvim-treesitter-context": { "branch": "master", "commit": "2e5aef3d3013482ace17306b1fd1183c6e6c9eb1" },
+  "nvim-treesitter": { "branch": "master", "commit": "1aad04ecde5ebf8f2b3eea5c6f39d38b251757f5" },
+  "nvim-treesitter-context": { "branch": "master", "commit": "2aba92ceb1479485953007f4d5adf34d0b66917e" },
   "nvim-treesitter-textsubjects": { "branch": "master", "commit": "a8d2844bba925d9450ef7ab215f3b054028288ca" },
-  "nvim-web-devicons": { "branch": "master", "commit": "c0cfc1738361b5da1cd0a962dd6f774cc444f856" },
-  "persistence.nvim": { "branch": "main", "commit": "95d03ad5450389ad7dc2a0fab14ebb3d46bc2c96" },
+  "nvim-web-devicons": { "branch": "master", "commit": "3722e3d1fb5fe1896a104eb489e8f8651260b520" },
+  "persistence.nvim": { "branch": "main", "commit": "f6aad7dde7fcf54148ccfc5f622c6d5badd0cc3d" },
   "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" },
-  "schemastore.nvim": { "branch": "main", "commit": "30946db59edba23103c2f524e636910a7a2160df" },
+  "schemastore.nvim": { "branch": "main", "commit": "a86e7a0ecaf09fdb0b58ca09f34cd1e2b2b1fd75" },
   "smart-open.nvim": { "branch": "0.2.x", "commit": "87626ee8748b9bba22093adec7bb58c63e7214f0" },
   "sort.nvim": { "branch": "main", "commit": "c789da6968337d2a61104a929880b5f144e02855" },
   "sqlite.lua": { "branch": "master", "commit": "d0ffd703b56d090d213b497ed4eb840495f14a11" },
-  "statuscol.nvim": { "branch": "main", "commit": "d6f7f5437c5404d958b88bb73e0721b1c0e09223" },
-  "supermaven-nvim": { "branch": "main", "commit": "c7ab94a6bcde96c79ff51afd6a1494606bb6f10b" },
+  "statuscol.nvim": { "branch": "main", "commit": "93d8bcda516fc86e11c03f9ef577bae9a72fba0e" },
+  "supermaven-nvim": { "branch": "main", "commit": "d71257f431e190d9236d7f30da4c2d659389e91f" },
   "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" },
-  "telescope.nvim": { "branch": "master", "commit": "bfcc7d5c6f12209139f175e6123a7b7de6d9c18a" },
-  "ts-comments.nvim": { "branch": "main", "commit": "c538b8fdd9e07119361929ba0a29d9f45c0de68a" },
+  "telescope.nvim": { "branch": "master", "commit": "3b1600d0fd5172ad9fae00987362ca0ef3d8895d" },
+  "ts-comments.nvim": { "branch": "main", "commit": "98d7d4dec0af1312d38e288f800bbf6ff562b6ab" },
   "vim-illuminate": { "branch": "master", "commit": "5eeb7951fc630682c322e88a9bbdae5c224ff0aa" },
-  "vim-repeat": { "branch": "master", "commit": "24afe922e6a05891756ecf331f39a1f6743d3d5a" },
-  "which-key.nvim": { "branch": "main", "commit": "0099511294f16b81c696004fa6a403b0ae61f7a0" }
+  "vim-repeat": { "branch": "master", "commit": "65846025c15494983dafe5e3b46c8f88ab2e9635" },
+  "which-key.nvim": { "branch": "main", "commit": "6c1584eb76b55629702716995cca4ae2798a9cca" }
 }
diff --git a/config/nvim/lua/sQVe/plugins/mini-ai/init.lua b/config/nvim/lua/sQVe/plugins/mini-ai/init.lua
@@ -10,37 +10,71 @@ local M = {
   event = 'VeryLazy',
 }
 
-M.opts = {
-  custom_textobjects = {
-    i = function()
-      local line_number = vim.fn.line('.')
-      local line_content = vim.fn.getline('.')
-      local indentation = string.match(line_content, '^%s*')
-      local indentation_level = string.len(indentation)
-
-      return {
-        from = {
-          col = 1,
-          line = utils.find_indent_boundary(
-            line_number,
-            indentation_level,
-            'up'
-          ),
-        },
-        to = {
-          col = 1,
-          line = utils.find_indent_boundary(
-            line_number,
-            indentation_level,
-            'down'
-          ),
+M.opts = function()
+  local ai = require('mini.ai')
+
+  return {
+    custom_textobjects = {
+      d = { '%f[%d]%d+' },
+      e = {
+        {
+          '%u[%l%d]+%f[^%l%d]',
+          '%f[%S][%l%d]+%f[^%l%d]',
+          '%f[%P][%l%d]+%f[^%l%d]',
+          '^[%l%d]+%f[^%l%d]',
         },
-        vis_mode = 'V',
-      }
-    end,
-    t = { '<([%p%w]-)%f[^<%w][^<>]->.-</%1>', '^<.->().*()</[^/]->$' },
-  },
-  n_lines = 500,
-}
+        '^().*()$',
+      },
+      g = function(ai_type)
+        local start_line, end_line = 1, vim.fn.line('$')
+
+        if ai_type == 'i' then
+          local first_nonblank, last_nonblank =
+            vim.fn.nextnonblank(start_line), vim.fn.prevnonblank(end_line)
+
+          if first_nonblank == 0 or last_nonblank == 0 then
+            return { from = { line = start_line, col = 1 } }
+          end
+          start_line, end_line = first_nonblank, last_nonblank
+        end
+
+        local to_col = math.max(vim.fn.getline(end_line):len(), 1)
+
+        return {
+          from = { line = start_line, col = 1 },
+          to = { line = end_line, col = to_col },
+        }
+      end,
+      i = function()
+        local line_number = vim.fn.line('.')
+        local line_content = vim.fn.getline('.')
+        local indentation = string.match(line_content, '^%s*')
+        local indentation_level = string.len(indentation)
+
+        return {
+          from = {
+            col = 1,
+            line = utils.find_indent_boundary(
+              line_number,
+              indentation_level,
+              'up'
+            ),
+          },
+          to = {
+            col = 1,
+            line = utils.find_indent_boundary(
+              line_number,
+              indentation_level,
+              'down'
+            ),
+          },
+          vis_mode = 'V',
+        }
+      end,
+      t = { '<([%p%w]-)%f[^<%w][^<>]->.-</%1>', '^<.->().*()</[^/]->$' },
+    },
+    n_lines = 500,
+  }
+end
 
 return M
diff --git a/config/nvim/lua/sQVe/plugins/which-key.lua b/config/nvim/lua/sQVe/plugins/which-key.lua
@@ -12,16 +12,12 @@ M.opts = {
   icons = {
     separator = '=',
     group = '> ',
+    mappings = false,
   },
-  key_labels = {
+  replace = {
     ['<leader>'] = '<Leader>',
     ['<space>'] = '<Space>',
   },
-  operators = {
-    gc = 'Comment',
-    gq = 'Format',
-    gs = 'Surround',
-  },
   plugins = {
     spelling = {
       enabled = false,
@@ -35,61 +31,75 @@ M.config = function(_, opts)
 
   wk.setup(opts)
 
-  -- Register general keys.
-  wk.register({
-    mode = { 'n', 'v' },
-    ["'"] = { 'Marks' },
-    ['"'] = { 'Registers' },
-    ['<C-q>'] = { 'Quickfix' },
-    ['<C-w>'] = { 'Window' },
-    ['@'] = { 'Registers' },
-    ['['] = { 'Previous' },
-    [']'] = { 'Next' },
-    ['`'] = { 'Marks' },
-    g = { o = 'Sort' },
+  -- Add general keys.
+  wk.add({
+    {
+      mode = { 'n', 'v' },
+      { "'", desc = 'Marks' },
+      { '"', desc = 'Registers' },
+      { '<C-q>', desc = 'Quickfix' },
+      { '<C-w>', desc = 'Window' },
+      { '@', desc = 'Registers' },
+      { '[', desc = 'Previous' },
+      { ']', desc = 'Next' },
+      { '`', desc = 'Marks' },
+      { 'go', desc = 'Sort' },
+      { 'gq', desc = 'Format' },
+    },
   })
 
-  local inner_textobjects = {
-    [' '] = 'Whitespace',
-    ['"'] = '"',
-    ["'"] = "'",
-    ['`'] = '`',
-    ['('] = '(',
-    [')'] = ') including white-space',
-    ['>'] = '> including white-space',
-    ['<lt>'] = '<',
-    [']'] = '] including white-space',
-    ['['] = '[',
-    ['}'] = '} including white-space',
-    ['{'] = '{',
-    ['?'] = 'User prompt',
-    _ = 'Underscore',
-    a = 'Argument',
-    b = '), ], }',
-    B = '], }',
-    c = 'Class',
-    f = 'Function',
-    i = 'Indentation',
-    o = 'Block, conditional, loop',
-    p = 'Paragraph',
-    q = 'Quote `, ", \'',
-    s = 'Sentence',
-    t = 'Tag',
-    w = 'word',
-    W = 'WORD',
+  local ai_objects = {
+    { "'", desc = "' string" },
+    { ' ', desc = 'whitespace' },
+    { '"', desc = '" string' },
+    { '(', desc = '() block' },
+    { ')', desc = '() block with ws' },
+    { '<', desc = '<> block' },
+    { '>', desc = '<> block with ws' },
+    { '?', desc = 'user prompt' },
+    { 'U', desc = 'use/call without dot' },
+    { '[', desc = '[] block' },
+    { ']', desc = '[] block with ws' },
+    { '_', desc = 'underscore' },
+    { '`', desc = '` string' },
+    { 'a', desc = 'argument' },
+    { 'b', desc = ')]} block' },
+    { 'd', desc = 'digit(s)' },
+    { 'e', desc = 'CamelCase / snake_case' },
+    { 'g', desc = 'entire file' },
+    { 'i', desc = 'indent' },
+    { 'o', desc = 'block, conditional, loop' },
+    { 'q', desc = 'quote `"\'' },
+    { 't', desc = 'tag' },
+    { '{', desc = '{} block' },
+    { '}', desc = '{} with ws' },
   }
-  local around_textobjects = vim.deepcopy(inner_textobjects)
 
-  for key, description in pairs(inner_textobjects) do
-    around_textobjects[key] = description:gsub(' including.*', '')
+  local ret = { mode = { 'o', 'x' } }
+  local mappings = vim.tbl_extend('force', {}, {
+    around = 'a',
+    inside = 'i',
+    around_next = 'an',
+    inside_next = 'in',
+    around_last = 'al',
+    inside_last = 'il',
+  }, opts.mappings or {})
+  mappings.goto_left = nil
+  mappings.goto_right = nil
+
+  for name, prefix in pairs(mappings) do
+    name = name:gsub('^around_', ''):gsub('^inside_', '')
+    ret[#ret + 1] = { prefix, group = name }
+    for _, obj in ipairs(ai_objects) do
+      local desc = obj.desc
+      if prefix:sub(1, 1) == 'i' then
+        desc = desc:gsub(' with ws', '')
+      end
+      ret[#ret + 1] = { prefix .. obj[1], desc = obj.desc }
+    end
   end
 
-  -- Register textobjects keys.
-  require('which-key').register({
-    mode = { 'o', 'x' },
-    i = inner_textobjects,
-    a = around_textobjects,
-  })
+  wk.add(ret, { notify = false })
 end
 
 return M
diff --git a/config/qutebrowser/bookmarks/urls b/config/qutebrowser/bookmarks/urls
@@ -5,9 +5,9 @@ http://guide.bash.academy Development / Bash | Bash Academy
 http://html5please.com Development / Web / Compatibility | HTML5 Please
 http://learnvimscriptthehardway.stevelosh.com Development / Vim Script | Learn Vim Script the hard way
 http://mywiki.wooledge.org/BashGuide Development / Bash | Bash Guide
+http://nekubasu Local | Nekubasu
 http://sed.sourceforge.net/sed1line.txt Linux / Apps | Sed One Liners
 http://shishigami:5000 Local | Shishigami
-http://nekubasu Local | Nekubasu
 http://www.gnu.org/software/gawk/manual/gawk.html Linux / Apps | Awk Manual
 http://www.gnu.org/software/grep/manual/grep.html Linux / Apps | Grep Manual
 http://www.gnu.org/software/sed/manual/sed.html Linux / Apps | Sed Manual
@@ -75,6 +75,7 @@ https://www.github.com Development | GitHub
 https://www.gnu.org/software/bash/manual/bash.html Development / Specification | Bash
 https://www.google.com Search engine | Google
 https://www.hackerrank.com Development | HackerRank
+https://www.ifixit.com/guide Electronics / iFixit
 https://www.jsonviewer.tools/editor Development / Apps | JSON Viewer
 https://www.justwatch.com/se Streaming | JustWatch
 https://www.nerdfonts.com/cheat-sheet Development / Apps | Nerd Fonts

diff --git a/gnupg/gpg-agent.conf b/gnupg/gpg-agent.conf
@@ -13,5 +13,5 @@ max-cache-ttl 7200
 # SSH max password cache: 8 hours
 max-cache-ttl-ssh 28800
 
-# Open password prompt with GTK 2.
-pinentry-program /usr/bin/pinentry-gtk-2
+# Open password prompt with GTK.
+pinentry-program /usr/bin/pinentry-gtk