neovim

commit 23f165271dec45c7ff6be92e36706e2bc7db19f9
parent 1a05e4faab47ceb4930d18c8c62e7f1ec319d03e
Author: Tomas Nemec <owl@gtms.dev>
Date:   Wed,  2 Oct 2024 12:08:41 +0200

update

Diffstat:
M
after/plugin/cmp.lua
 | 
13
-------------
M
lua/tms/snippets.lua
 | 
15
+++++++--------
M
plugin/unimpaired.lua
 | 
53
-----------------------------------------------------

3 files changed, 7 insertions(+), 74 deletions(-)
diff --git a/after/plugin/cmp.lua b/after/plugin/cmp.lua
@@ -31,19 +31,6 @@ local kind_icons = {
 }
 
 local cmp = require('cmp')
-local Codeium = require('tms.p.codeium')
--- local compare = require('cmp.config.compare')
--- require('cmp_dictionary').setup({
---   dic = { --
---     spelllang = { --
---       en = '/usr/share/dict/words',
---       cs = '~/.local/share/dict/cs.dict',
---     },
---   },
---   document = true,
---   async = true,
--- })
--- cmp.register_source('exe', require('tms.p.cmp.exe_source').new())
 local function close()
   return function(fallback)
     -- if Codeium.Completions() then
diff --git a/lua/tms/snippets.lua b/lua/tms/snippets.lua
@@ -1,10 +1,9 @@
-local function shell(command)
-  local file = io.popen(command, 'r')
-  local res = {}
-  for line in file:lines() do
-    table.insert(res, line)
+local function system(command)
+  local stdout = vim.system(command, { text = true }):wait().stdout
+  if not stdout then
+    return ""
   end
-  return res[1]
+  return stdout:gsub('\n', '')
 end
 
 -- borrowed from LuaSnip, thanks...
@@ -20,7 +19,7 @@ local function buffer_comment_chars()
   if index_placeholder then
     index_placeholder = index_placeholder - 1
     if index_placeholder + #placeholder == #commentstring then
-      comments[1] = vim.trim(commentstring:sub(1, -#placeholder - 1))
+      comments[1] = vim.trim(commentstring:sub(1, - #placeholder - 1))
     else
       comments[2] = vim.trim(commentstring:sub(1, index_placeholder))
       comments[3] = vim.trim(commentstring:sub(index_placeholder + #placeholder + 1, -1))
@@ -37,7 +36,7 @@ local global = {
   {
     prefix = 'todo',
     body = function()
-      return cmt() .. ' TODO(' .. shell('id -un') .. ') ' .. os.date('%d.%m.%y') .. ': $0'
+      return cmt() .. ' TODO(' .. system { 'id', '-un' } .. ') ' .. os.date('%d.%m.%y') .. ': $0'
     end,
   },
   { prefix = 'bang', body = '#!/usr/bin/env $0' },
diff --git a/plugin/unimpaired.lua b/plugin/unimpaired.lua
@@ -1,56 +1,3 @@
--- remap ] and [
--- vim.keymap.set('n', '<c-l><c-q>', '<cmd>cnext<cr>')
--- vim.keymap.set('n', '<c-h><c-q>', '<cmd>cprev<cr>')
--- vim.keymap.set('n', '<c-l>q', '<cmd>clast<cr>')
--- vim.keymap.set('n', '<c-h>q', '<cmd>cfirst<cr>')
--- vim.keymap.set('n', '<c-l><c-a>', '<cmd>next<cr>')
--- vim.keymap.set('n', '<c-h><c-a>', '<cmd>prev<cr>')
--- vim.keymap.set('n', '<c-l>a', '<cmd>last<cr>')
--- vim.keymap.set('n', '<c-h>a', '<cmd>first<cr>')
--- vim.keymap.set('n', '<c-l><c-b>', '<cmd>bnext<cr>')
--- vim.keymap.set('n', '<c-h><c-b>', '<cmd>bprev<cr>')
--- vim.keymap.set('n', '<c-l>b', '<cmd>blast<cr>')
--- vim.keymap.set('n', '<c-h>b', '<cmd>bfirst<cr>')
--- vim.keymap.set('n', '<c-l><c-l>', '<cmd>lnext<cr>')
--- vim.keymap.set('n', '<c-h><c-l>', '<cmd>lprev<cr>')
--- vim.keymap.set('n', '<c-l>l', '<cmd>llast<cr>')
--- vim.keymap.set('n', '<c-h>l', '<cmd>lfirst<cr>')
--- vim.keymap.set('n', '<c-l><c-t>', '<cmd>tnext<cr>')
--- vim.keymap.set('n', '<c-h><c-t>', '<cmd>tprev<cr>')
--- vim.keymap.set('n', '<c-l>t', '<cmd>tlast<cr>')
--- vim.keymap.set('n', '<c-h>t', '<cmd>tfirst<cr>')
--- vim.keymap.set('n', '<c-l><c-s>', ']s')
--- vim.keymap.set('n', '<c-h><c-s>', '[s')
--- vim.keymap.set('n', '<c-l>s', ']S')
--- vim.keymap.set('n', '<c-h>s', '[S')
-
-vim.keymap.set('n', ']q', '<cmd>cnext<cr>')
-vim.keymap.set('n', '[q', '<cmd>cprev<cr>')
--- vim.keymap.set('n', ']q', '<cmd>cnfile<cr>')
--- vim.keymap.set('n', '[q', '<cmd>cpfile<cr>')
-vim.keymap.set('n', ']Q', '<cmd>clast<cr>')
-vim.keymap.set('n', '[Q', '<cmd>cfirst<cr>')
--- vim.keymap.set('n', ']a', '<cmd>next<cr>')
--- vim.keymap.set('n', '[a', '<cmd>prev<cr>')
--- vim.keymap.set('n', ']A', '<cmd>last<cr>')
--- vim.keymap.set('n', '[A', '<cmd>first<cr>')
--- vim.keymap.set('n', ']b', '<cmd>bnext<cr>')
--- vim.keymap.set('n', '[b', '<cmd>bprev<cr>')
--- vim.keymap.set('n', ']B', '<cmd>blast<cr>')
--- vim.keymap.set('n', '[B', '<cmd>bfirst<cr>')
-vim.keymap.set('n', ']l', '<cmd>lnext<cr>')
-vim.keymap.set('n', '[l', '<cmd>lprev<cr>')
-vim.keymap.set('n', ']L', '<cmd>llast<cr>')
-vim.keymap.set('n', '[L', '<cmd>lfirst<cr>')
--- vim.keymap.set('n', ']t', '<cmd>tnext<cr>')
--- vim.keymap.set('n', '[t', '<cmd>tprev<cr>')
--- vim.keymap.set('n', ']T', '<cmd>tlast<cr>')
--- vim.keymap.set('n', '[T', '<cmd>tfirst<cr>')
--- vim.keymap.set('n', ']<c-s>', ']s')
--- vim.keymap.set('n', '[<c-s>', '[s')
--- vim.keymap.set('n', ']s', ']S')
--- vim.keymap.set('n', '[s', '[S')
-
 local toggle = require('tms.toggle')
 toggle.option('c', 'cursorline', 'local')
 toggle.option('u', 'cursorcolumn', 'local')