neovim

commit 535bdc0f2fd3a1b0c28af7a8ef673ba63d46cf1b
parent 71861ceb50828174bb6e69b06e2db0025ab2381f
Author: Tomas Nemec <owl@gtms.dev>
Date:   Tue, 18 Jun 2024 08:55:01 +0200

update

Diffstat:
M
after/plugin/codeium.lua
 | 
8
++++----
M
after/plugin/format.lua
 | 
21
+++++++++------------
A
ftplugin/bash.lua
 | 
1
+
M
ftplugin/lua.lua
 | 
1
+
M
ftplugin/sh.lua
 | 
1
+
M
ftplugin/zsh.lua
 | 
1
+

6 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/after/plugin/codeium.lua b/after/plugin/codeium.lua
@@ -1,5 +1,5 @@
-vim.g.codeium_enabled = false
-vim.g.codeium_manual = true
+-- vim.g.codeium_enabled = false
+-- vim.g.codeium_manual = true
 vim.g.codeium_disable_bindings = true
 vim.g.codeium_no_map_tab = true
 
@@ -12,9 +12,9 @@ vim.keymap.set('i', '<c-p>', codeium.Prev, { desc = 'Codeium Prev' })
 local toggle = require('tms.toggle')
 toggle.fn('p', function()
   if codeium.isEnabled() then
-    codeium.Disable()
+    vim.g.codeium_manual = true
   else
-    codeium.Enable()
+    vim.g.codeium_manual = false
   end
 end, 'Codeium Toggle')
 
diff --git a/after/plugin/format.lua b/after/plugin/format.lua
@@ -20,18 +20,15 @@ require 'conform'.setup {
   },
   formatters = {
     prettier = {
-      options = {
-        ft_parsers = {
-          css = "css",
-          scss = "scss",
-          less = "less",
-          html = "html",
-          json = "json",
-          yaml = "yaml",
-          markdown = "markdown",
-          graphql = "graphql",
-        }
-      }
+      args = { '--stdin-filepath', '$FILENAME' },
+      range_args = function(_, ctx)
+        local args = { '$FILENAME' }
+        local start_offset, end_offset = require "conform.util".get_offsets_from_range(ctx.buf, ctx.range)
+        return vim.list_extend(args, {
+          "--range-start=" .. start_offset,
+          "--range-end=" .. end_offset,
+        })
+      end,
     }
   },
 }
diff --git a/ftplugin/bash.lua b/ftplugin/bash.lua
@@ -0,0 +1 @@
+vim.bo.expandtab = false
diff --git a/ftplugin/lua.lua b/ftplugin/lua.lua
@@ -1,5 +1,6 @@
 vim.bo.efm = [[lua: %f:%l: %m]]
 vim.bo.makeprg = [[lua %:S]]
+vim.bo.shiftwidth = 2
 
 vim.keymap.set('n', '<leader>ar', vim.cmd.make)
 
diff --git a/ftplugin/sh.lua b/ftplugin/sh.lua
@@ -1,5 +1,6 @@
 vim.bo.makeprg = [[sh %:S]]
 vim.bo.efm = [[%f: line %l: %m]]
+vim.bo.expandtab = false
 
 local cmp = require('cmp')
 cmp.setup.buffer { sources = { { name = 'nvim_lsp' }, { name = 'exe' }, { name = 'path' } } }
diff --git a/ftplugin/zsh.lua b/ftplugin/zsh.lua
@@ -1,5 +1,6 @@
 vim.bo.makeprg = [[zsh -n -- %:S]]
 vim.bo.efm = [[%f:%l: %m,%f: line %l: %m, %-G%.%#]]
+vim.bo.expandtab = false
 
 if pcall(require, 'cmp') then
   require 'cmp'.setup.buffer {