diff options
| -rw-r--r-- | nvim/.config/nvim/after/ftplugin/c.lua | 2 | ||||
| -rw-r--r-- | nvim/.config/nvim/after/ftplugin/css.lua | 2 | ||||
| -rw-r--r-- | nvim/.config/nvim/after/ftplugin/html.lua | 2 | ||||
| -rw-r--r-- | nvim/.config/nvim/after/ftplugin/javascript.lua | 2 | ||||
| -rw-r--r-- | nvim/.config/nvim/after/ftplugin/lua.lua | 2 | ||||
| -rw-r--r-- | nvim/.config/nvim/after/ftplugin/markdown.lua | 2 | ||||
| -rw-r--r-- | nvim/.config/nvim/after/ftplugin/rust.lua | 1 | ||||
| -rw-r--r-- | nvim/.config/nvim/after/ftplugin/sh.lua | 2 | ||||
| -rw-r--r-- | nvim/.config/nvim/after/ftplugin/typescript.lua | 1 | ||||
| -rw-r--r-- | nvim/.config/nvim/after/ftplugin/zsh.lua | 2 | ||||
| -rw-r--r-- | nvim/.config/nvim/lua/tobyvin/autocmds.lua | 30 |
11 files changed, 24 insertions, 24 deletions
diff --git a/nvim/.config/nvim/after/ftplugin/c.lua b/nvim/.config/nvim/after/ftplugin/c.lua new file mode 100644 index 0000000..2408612 --- /dev/null +++ b/nvim/.config/nvim/after/ftplugin/c.lua @@ -0,0 +1,2 @@ +vim.opt_local.shiftwidth = 2 +vim.opt_local.formatoptions:remove("o") diff --git a/nvim/.config/nvim/after/ftplugin/css.lua b/nvim/.config/nvim/after/ftplugin/css.lua new file mode 100644 index 0000000..2408612 --- /dev/null +++ b/nvim/.config/nvim/after/ftplugin/css.lua @@ -0,0 +1,2 @@ +vim.opt_local.shiftwidth = 2 +vim.opt_local.formatoptions:remove("o") diff --git a/nvim/.config/nvim/after/ftplugin/html.lua b/nvim/.config/nvim/after/ftplugin/html.lua new file mode 100644 index 0000000..2408612 --- /dev/null +++ b/nvim/.config/nvim/after/ftplugin/html.lua @@ -0,0 +1,2 @@ +vim.opt_local.shiftwidth = 2 +vim.opt_local.formatoptions:remove("o") diff --git a/nvim/.config/nvim/after/ftplugin/javascript.lua b/nvim/.config/nvim/after/ftplugin/javascript.lua new file mode 100644 index 0000000..2408612 --- /dev/null +++ b/nvim/.config/nvim/after/ftplugin/javascript.lua @@ -0,0 +1,2 @@ +vim.opt_local.shiftwidth = 2 +vim.opt_local.formatoptions:remove("o") diff --git a/nvim/.config/nvim/after/ftplugin/lua.lua b/nvim/.config/nvim/after/ftplugin/lua.lua new file mode 100644 index 0000000..2408612 --- /dev/null +++ b/nvim/.config/nvim/after/ftplugin/lua.lua @@ -0,0 +1,2 @@ +vim.opt_local.shiftwidth = 2 +vim.opt_local.formatoptions:remove("o") diff --git a/nvim/.config/nvim/after/ftplugin/markdown.lua b/nvim/.config/nvim/after/ftplugin/markdown.lua index 97209fb..4547d08 100644 --- a/nvim/.config/nvim/after/ftplugin/markdown.lua +++ b/nvim/.config/nvim/after/ftplugin/markdown.lua @@ -1 +1,3 @@ vim.opt_local.textwidth = 80 +vim.opt_local.shiftwidth = 2 +vim.opt_local.formatoptions:remove("o") diff --git a/nvim/.config/nvim/after/ftplugin/rust.lua b/nvim/.config/nvim/after/ftplugin/rust.lua new file mode 100644 index 0000000..17304d6 --- /dev/null +++ b/nvim/.config/nvim/after/ftplugin/rust.lua @@ -0,0 +1 @@ +vim.opt_local.formatoptions:remove("o") diff --git a/nvim/.config/nvim/after/ftplugin/sh.lua b/nvim/.config/nvim/after/ftplugin/sh.lua new file mode 100644 index 0000000..2408612 --- /dev/null +++ b/nvim/.config/nvim/after/ftplugin/sh.lua @@ -0,0 +1,2 @@ +vim.opt_local.shiftwidth = 2 +vim.opt_local.formatoptions:remove("o") diff --git a/nvim/.config/nvim/after/ftplugin/typescript.lua b/nvim/.config/nvim/after/ftplugin/typescript.lua new file mode 100644 index 0000000..17304d6 --- /dev/null +++ b/nvim/.config/nvim/after/ftplugin/typescript.lua @@ -0,0 +1 @@ +vim.opt_local.formatoptions:remove("o") diff --git a/nvim/.config/nvim/after/ftplugin/zsh.lua b/nvim/.config/nvim/after/ftplugin/zsh.lua new file mode 100644 index 0000000..2408612 --- /dev/null +++ b/nvim/.config/nvim/after/ftplugin/zsh.lua @@ -0,0 +1,2 @@ +vim.opt_local.shiftwidth = 2 +vim.opt_local.formatoptions:remove("o") diff --git a/nvim/.config/nvim/lua/tobyvin/autocmds.lua b/nvim/.config/nvim/lua/tobyvin/autocmds.lua index 48cf6c7..891a7af 100644 --- a/nvim/.config/nvim/lua/tobyvin/autocmds.lua +++ b/nvim/.config/nvim/lua/tobyvin/autocmds.lua @@ -21,16 +21,19 @@ vim.api.nvim_create_autocmd("FocusLost", { desc = "clipboard sync", }) -vim.api.nvim_create_autocmd("FocusGained", { +vim.api.nvim_create_autocmd({ "VimEnter", "FocusGained" }, { group = augroup, pattern = "*", - callback = function() + callback = function(args) local system_clipboard = { regtype = vim.fn.getregtype("+"), contents = vim.split(vim.fn.getreg("+"), "\n"), } - if vim.g.system_clipboard ~= nil and not vim.deep_equal(vim.g.system_clipboard, system_clipboard) then + if + args.event == "VimEnter" + or vim.g.system_clipboard ~= nil and not vim.deep_equal(vim.g.system_clipboard, system_clipboard) + then require("neoclip") require("neoclip.storage").insert(system_clipboard, "yanks") end @@ -70,24 +73,3 @@ vim.api.nvim_create_autocmd("BufWritePre", { end, desc = "Trim whitespace on write", }) - -vim.api.nvim_create_autocmd("FileType", { - group = augroup, - pattern = { - "c", - "sh", - "zsh", - "xml", - "html", - "xhtml", - "css", - "scss", - "javascript", - "lua", - "markdown", - }, - callback = function(args) - vim.bo[args.buf].tabstop = 2 - end, - desc = "Set tabstop", -}) |