dotfiles: .chezmoitemplates/init.lua comparison

comparison .chezmoitemplates/init.lua @ 600:24b0dd06381b

Enable collapsed statements for stylua

author	Zeger Van de Vannet <zegervdv@me.com>
date	Fri, 08 Jul 2022 16:46:27 +0200
parents	1def7efdc619
children	837e6ed64a90

comparison

equal deleted inserted replaced

-:1def7efdc619
+:24b0dd06381b
 --
 local execute = vim.api.nvim_command
 local fn = vim.fn
 local home = os.getenv 'HOME'
-if home == nil then
+if home == nil then home = os.getenv 'USERPROFILE' end
-home = os.getenv 'USERPROFILE'
-end
 -- Bootstrap package manager
 local install_path = fn.stdpath 'data' .. '/site/pack/packer/opt/packer.nvim'
 if fn.empty(fn.glob(install_path)) > 0 then
 }
 -- Smooth scrolling
 use {
 'karb94/neoscroll.nvim',
-config = function()
+config = function() require('neoscroll').setup {} end,
-require('neoscroll').setup {}
-end,
 }
 -- Faster lua package loading (until 15436 is merged)
 use {
 'lewis6991/impatient.nvim',
 module = { 'impatient' },
-setup = function()
+setup = function() require 'impatient' end,
-require 'impatient'
-end,
 }
 -- Library with lua functions
 use { 'nvim-lua/plenary.nvim' }
 Rule(' ', ' '):with_pair(function(opts)
 local pair = opts.line:sub(opts.col - 1, opts.col)
 return vim.tbl_contains({ '()', '[]', '{}' }, pair)
 end),
 Rule('( ', ' )')
-:with_pair(function()
+:with_pair(function() return false end)
-return false
+:with_move(function(opts) return opts.prev_char:match '.%)' ~= nil end)
-end)
-:with_move(function(opts)
-return opts.prev_char:match '.%)' ~= nil
-end)
 :use_key ')',
 Rule('{ ', ' }')
-:with_pair(function()
+:with_pair(function() return false end)
-return false
+:with_move(function(opts) return opts.prev_char:match '.%}' ~= nil end)
-end)
-:with_move(function(opts)
-return opts.prev_char:match '.%}' ~= nil
-end)
 :use_key '}',
 Rule('[ ', ' ]')
-:with_pair(function()
+:with_pair(function() return false end)
-return false
+:with_move(function(opts) return opts.prev_char:match '.%]' ~= nil end)
-end)
-:with_move(function(opts)
-return opts.prev_char:match '.%]' ~= nil
-end)
 :use_key ']',
 }
-npairs.get_rule('`'):with_pair(function()
+npairs.get_rule('`'):with_pair(function() return vim.bo.filetype ~= 'systemverilog' end)
-return vim.bo.filetype ~= 'systemverilog'
-end)
+npairs.get_rule("'")[1]:with_pair(function() return vim.bo.filetype ~= 'systemverilog' end)
-npairs.get_rule("'")[1]:with_pair(function()
-return vim.bo.filetype ~= 'systemverilog'
-end)
 end,
 after = { 'nvim-cmp' },
 }
 -- Moving around within lines
 -- session management
 use {
 'folke/persistence.nvim',
 event = 'BufReadPre',
 module = 'persistence',
-config = function()
+config = function() require('persistence').setup() end,
-require('persistence').setup()
-end,
 }
 -- Indent lines
 use {
 'lukas-reineke/indent-blankline.nvim',
 use {
 'numtostr/navigator.nvim',
 config = function()
 require('Navigator').setup { auto_save = 'current', disable_on_zoom = true }
-local nmap = function(lhs, rhs, opts)
+local nmap = function(lhs, rhs, opts) return vim.keymap.set('n', lhs, rhs, opts) end
-return vim.keymap.set('n', lhs, rhs, opts)
-end
 nmap('<c-h>', require('Navigator').left, { silent = true })
 nmap('<c-j>', require('Navigator').down, { silent = true })
 nmap('<c-k>', require('Navigator').up, { silent = true })
 nmap('<c-l>', require('Navigator').right, { silent = true })
 end,
 return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match '%s' == nil
 end
 cmp.setup {
 snippet = {
-expand = function(args)
+expand = function(args) luasnip.lsp_expand(args.body) end,
-luasnip.lsp_expand(args.body)
-end,
 },
 mapping = {
 ['<C-p>'] = { i = cmp.mapping.select_prev_item() },
 ['<C-n>'] = { i = cmp.mapping.select_next_item() },
 ['<C-d>'] = { i = cmp.mapping.scroll_docs(-4) },
 { 'nvim-treesitter/playground', opt = true },
 }
 use { 'L3MON4D3/luasnip' }
 use {
 'rmagatti/goto-preview',
-config = function()
+config = function() require('goto-preview').setup {} end,
-require('goto-preview').setup {}
-end,
 }
 use {
 'jose-elias-alvarez/null-ls.nvim',
 requires = 'nvim-lua/plenary.nvim',
 }
 use {
 'lukas-reineke/lsp-format.nvim',
-config = function()
+config = function() require('lsp-format').setup {} end,
-require('lsp-format').setup {}
-end,
 }
 use { 'folke/lua-dev.nvim' }
 use {
 'folke/trouble.nvim',
 config = function()
 colors.bg = '#2C323C'
 gls.left[1] = {
 RainbowRed = {
-provider = function()
+provider = function() return '▊ ' end,
-return '▊ '
-end,
 highlight = { colors.blue, colors.bg },
 },
 }
 gls.left[2] = {
 FileName = {
-provider = function()
+provider = function() return require('galaxyline.providers.fileinfo').get_current_file_name '⊙' end,
-return require('galaxyline.providers.fileinfo').get_current_file_name '⊙'
-end,
 condition = condition.buffer_not_empty,
 highlight = { colors.magenta, colors.bg, 'bold' },
 },
 }
 gls.right[1] = {
 ShowLspClient = {
 provider = 'GetLspClient',
 condition = function()
 local tbl = { ['dashboard'] = true, [''] = true }
-if tbl[vim.bo.filetype] then
+if tbl[vim.bo.filetype] then return false end
-return false
-end
 return true
 end,
 highlight = { colors.green, colors.bg, 'bold' },
 },
 }
 highlight = { colors.fg, colors.bg, 'bold' },
 },
 }
 gls.right[8] = {
 RainbowBlue = {
-provider = function()
+provider = function() return ' ▊' end,
-return ' ▊'
-end,
 highlight = { colors.blue, colors.bg },
 },
 }
 gls.short_line_left[1] = {
 use { 'lepture/vim-jinja' }
 -- Integration with external tools
 use {
 'glacambre/firenvim',
-run = function()
+run = function() vim.fn['firenvim#install'](0) end,
-vim.fn['firenvim#install'](0)
-end,
 config = function()
 vim.g.firenvim_config = {
 localSettings = {
 ['.*'] = {
 takeover = 'never',
 opt.foldtext =
 [[substitute(getline(v:foldstart),'\\t',repeat('\ ',&tabstop),'g').'...'.trim(getline(v:foldend)) . ' (' . (v:foldend - v:foldstart + 1) . ' lines)']]
 opt.foldenable = false
 -- Clean up terminal codes from strings
-local t = function(str)
+local t = function(str) return vim.api.nvim_replace_termcodes(str, true, true, true) end
-return vim.api.nvim_replace_termcodes(str, true, true, true)
-end
 -- General keymaps
 local map = vim.keymap.set
 -- Set leader to space
 map('n', '<RIGHT>', ':cnf<CR>', { desc = 'Go to next error/match in next file' })
 local au = require 'au'
 -- Highlight yanked text
-au.TextYankPost = function()
+au.TextYankPost = function() vim.highlight.on_yank { timeout = 120 } end
-vim.highlight.on_yank { timeout = 120 }
-end
 -- Automatic cursorline
 au.group('cline', {
 {
 'WinEnter',
 '*',
-function()
+function() vim.opt_local.cursorline = true end,
-vim.opt_local.cursorline = true
-end,
 },
 {
 'WinLeave',
 '*',
-function()
+function() vim.opt_local.cursorline = false end,
-vim.opt_local.cursorline = false
-end,
 },
 })
 -- Save files on focus lost
 au.FocusLost = function()
-if not vim.o.readonly and vim.api.nvim_buf_get_name(0) ~= '' then
+if not vim.o.readonly and vim.api.nvim_buf_get_name(0) ~= '' then vim.cmd [[ wa ]] end
-vim.cmd [[ wa ]]
-end
 end
 -- Equalize splits after resizing
 au.VimResized = [[ exe "normal! \<c-w>=" ]]
 -- Reload diffs after editing
 au.BufWritePost = function()
-if vim.o.diff then
+if vim.o.diff then vim.cmd [[ diffupdate ]] end
-vim.cmd [[ diffupdate ]]
-end
 end
 -- Snippets
 local ls = require 'luasnip'
 -- Expand snippet or jump to next placeholder
 vim.keymap.set({ 'i', 's' }, '<c-k>', function()
-if ls.expand_or_jumpable() then
+if ls.expand_or_jumpable() then ls.expand_or_jump() end
-ls.expand_or_jump()
-end
 end, {
 silent = true,
 })
 -- Go back to previous placeholder
 vim.keymap.set({ 'i', 's' }, '<c-j>', function()
-if ls.jumpable(-1) then
+if ls.jumpable(-1) then ls.jump(-1) end
-ls.jump(-1)
-end
 end, {
 silent = true,
 })
 -- Toggle options in snippets
 vim.keymap.set('i', '<c-l>', function()
-if ls.choice_active() then
+if ls.choice_active() then ls.change_choice() end
-ls.change_choice()
-end
 end)
 -- LSP config
 local lsp = require 'lspconfig'
 local null_ls = require 'null-ls'
 local on_attach = function(client)
 require('lsp-format').on_attach(client)
-local nmap = function(lhs, rhs, opts)
+local nmap = function(lhs, rhs, opts) return vim.keymap.set('n', lhs, rhs, opts) end
-return vim.keymap.set('n', lhs, rhs, opts)
-end
 vim.bo.tagfunc = 'v:lua.vim.lsp.tagfunc'
 nmap('gp', require('goto-preview').goto_preview_definition, { silent = true, buffer = 0 })
 nmap('gP', require('goto-preview').close_all_win, { silent = true, buffer = 0 })
 nmap('gD', vim.lsp.buf.implementation, { silent = true, buffer = 0 })
 nmap('1gD', vim.lsp.buf.type_definition, { silent = true, buffer = 0 })
 nmap('gr', vim.lsp.buf.references, { silent = true, buffer = 0 })
 nmap('g0', vim.lsp.buf.document_symbol, { silent = true, buffer = 0 })
-nmap('<c-p>', function()
+nmap('<c-p>', function() require('lsp-format').format() end, {
-require('lsp-format').format()
-end, {
 silent = true,
 buffer = 0,
 })
 vim.bo.formatexpr = 'v:lua.vim.lsp.formatexpr()'
 })
 vim.fn.sign_define('DiagnosticSignHint', { texthl = 'DiagnosticSignHint', linehl = '', numhl = '', text = '▎' })
 -- Try importing local config
 local ok, localconfig = pcall(require, 'localconfig')
-if ok then
+if ok then localconfig.setup { on_attach = on_attach, capabilities = capabilities } end
-localconfig.setup { on_attach = on_attach, capabilities = capabilities }
-end

Mercurial > dotfiles

comparison .chezmoitemplates/init.lua @ 600:24b0dd06381b