From 662e59fe131429d21563dcca8252134cbcd391e0 Mon Sep 17 00:00:00 2001 From: Niverton Date: Sun, 28 Jan 2024 11:37:23 +0100 Subject: [PATCH] Formatting --- lua/config/lazy.lua | 11 +++++------ lua/plugins/05-community.lua | 14 +++++++------- lua/plugins/10-colorscheme.lua | 4 ++-- lua/plugins/20-lsp.lua | 2 +- lua/plugins/40-heirline.lua | 30 +++++++++++++++--------------- lua/plugins/50-user.lua | 2 +- stylua.toml | 2 +- 7 files changed, 32 insertions(+), 33 deletions(-) diff --git a/lua/config/lazy.lua b/lua/config/lazy.lua index 31ee5bf..83fe90d 100644 --- a/lua/config/lazy.lua +++ b/lua/config/lazy.lua @@ -1,24 +1,23 @@ -local lazypath = vim.env.LAZY or vim.fn.stdpath "data" .. "/lazy/lazy.nvim" +local lazypath = vim.env.LAZY or vim.fn.stdpath("data") .. "/lazy/lazy.nvim" if not (vim.env.LAZY or vim.loop.fs_stat(lazypath)) then vim.g.astronvim_first_install = true -- lets AstroNvim know that this is an initial installation - vim.fn.system { + vim.fn.system({ "git", "clone", "--filter=blob:none", "https://github.com/folke/lazy.nvim.git", "--branch=stable", lazypath, - } + }) end vim.opt.rtp:prepend(lazypath) - local lazy_loaded, lazy = pcall(require, "lazy") -- validate that lazy is available if not lazy_loaded then -- stylua: ignore vim.api.nvim_echo({ { ("Unable to load lazy from: %s\n"):format(lazypath), "ErrorMsg" }, { "Press any key to exit...", "MoreMsg" } }, true, {}) - vim.fn.getchar() - vim.cmd.quit() + vim.fn.getchar() + vim.cmd.quit() end lazy.setup({ diff --git a/lua/plugins/05-community.lua b/lua/plugins/05-community.lua index d48b588..54ff13d 100644 --- a/lua/plugins/05-community.lua +++ b/lua/plugins/05-community.lua @@ -4,13 +4,13 @@ local work = not home return { { "AstroNvim/astrocommunity", branch = "v4" }, -- Language packs - { enabled = true, import = "astrocommunity.pack.cpp" }, - { enabled = true, import = "astrocommunity.pack.lua" }, - { enabled = true, import = "astrocommunity.pack.markdown" }, - { enabled = home, import = "astrocommunity.pack.rust" }, - { enabled = home, import = "astrocommunity.pack.bash" }, - { enabled = work, import = "astrocommunity.pack.cs" }, - { enabled = work, import = "astrocommunity.pack.ps1" }, + { enabled = true, import = "astrocommunity.pack.cpp" }, + { enabled = true, import = "astrocommunity.pack.lua" }, + { enabled = true, import = "astrocommunity.pack.markdown" }, + { enabled = home, import = "astrocommunity.pack.rust" }, + { enabled = home, import = "astrocommunity.pack.bash" }, + { enabled = work, import = "astrocommunity.pack.cs" }, + { enabled = work, import = "astrocommunity.pack.ps1" }, { enabled = false, import = "astrocommunity.pack.html-css" }, { enabled = false, import = "astrocommunity.pack.java" }, { enabled = false, import = "astrocommunity.pack.wgsl" }, -- WebGLShaderLanguage diff --git a/lua/plugins/10-colorscheme.lua b/lua/plugins/10-colorscheme.lua index 3a2f0fe..9fb6b85 100644 --- a/lua/plugins/10-colorscheme.lua +++ b/lua/plugins/10-colorscheme.lua @@ -11,7 +11,7 @@ return { url = "https://git.niverton.tk/niverton/Astrobox.git", dev = true, -- Use local dir if available opts = { - contrast = "hard" - } + contrast = "hard", + }, }, } diff --git a/lua/plugins/20-lsp.lua b/lua/plugins/20-lsp.lua index e9b2061..ae3c378 100644 --- a/lua/plugins/20-lsp.lua +++ b/lua/plugins/20-lsp.lua @@ -17,7 +17,7 @@ return { ---@diagnostic disable: missing-fields config = { clangd = { - cmd = { "clangd", "--header-insertion=never"}, -- Disable auto includes + cmd = { "clangd", "--header-insertion=never" }, -- Disable auto includes }, }, }, diff --git a/lua/plugins/40-heirline.lua b/lua/plugins/40-heirline.lua index 8a05caa..4cae805 100644 --- a/lua/plugins/40-heirline.lua +++ b/lua/plugins/40-heirline.lua @@ -6,28 +6,28 @@ return { opts.statusline = { hl = { fg = "fg", bg = "bg" }, - status.component.mode { mode_text = { hl = { bold = true }, padding = { left = 1, right = 1 } } }, - status.component.file_info { + status.component.mode({ mode_text = { hl = { bold = true }, padding = { left = 1, right = 1 } } }), + status.component.file_info({ filetype = false, filename = { modify = ":~:.", }, file_modified = {}, - }, + }), status.component.diagnostics(), status.component.fill(), status.component.cmd_info(), status.component.fill(), status.component.lsp(), - status.component.treesitter { padding = { right = 1 } }, -- Extra space to separate from next component + status.component.treesitter({ padding = { right = 1 } }), -- Extra space to separate from next component status.component.git_diff(), status.component.git_branch(), - status.component.nav { scrollbar = false }, + status.component.nav({ scrollbar = false }), } - local get_file_path = status.provider.filename { + local get_file_path = status.provider.filename({ modify = ":~:.:h", -- Relative path and cut filename - } + }) -- Fix path separation on windows local path_func = get_file_path if vim.fn.has("win32") then @@ -45,34 +45,34 @@ return { { -- Set display priority to hide when component is too big to fit flexible = 1, - status.component.separated_path { + status.component.separated_path({ flexible = 2, max_depth = 5, path_func = path_func, - }, - status.component.separated_path { + }), + status.component.separated_path({ flexible = 3, max_depth = 3, path_func = path_func, - }, - status.component.separated_path { + }), + status.component.separated_path({ flexible = 4, max_depth = 1, path_func = path_func, - }, + }), { -- Hide provider = "", }, }, - status.component.file_info { + status.component.file_info({ file_icon = { hl = status.hl.file_icon("winbar"), padding = { left = 0 } }, file_modified = false, file_read_only = false, hl = status.hl.get_attributes("winbarnc", true), surround = false, update = "BufEnter", - }, + }), }, status.component.breadcrumbs(), } diff --git a/lua/plugins/50-user.lua b/lua/plugins/50-user.lua index 1d55929..f31abb6 100644 --- a/lua/plugins/50-user.lua +++ b/lua/plugins/50-user.lua @@ -1,4 +1,4 @@ return { - { "echasnovski/mini.align", event = "User AstroFile", config = function() require("mini.align").setup {} end }, + { "echasnovski/mini.align", event = "User AstroFile", config = function() require("mini.align").setup({}) end }, { "tpope/vim-abolish", event = "User AstroFile" }, } diff --git a/stylua.toml b/stylua.toml index 6ea0e6b..66068bb 100644 --- a/stylua.toml +++ b/stylua.toml @@ -1,7 +1,7 @@ column_width = 120 line_endings = "Unix" indent_type = "Spaces" -call_parentheses = "NoSingleTable" +call_parentheses = "Always" collapse_simple_statement = "Always" [sort_requires]