QML INDENTATION POGGERS
This commit is contained in:
@@ -22,7 +22,7 @@ end
|
||||
|
||||
local function spell()
|
||||
if vim.o.spell then
|
||||
return string.format("[SPELL]")
|
||||
return string.format "[SPELL]"
|
||||
end
|
||||
|
||||
return ""
|
||||
@@ -31,7 +31,8 @@ end
|
||||
--- show indicator for Chinese IME
|
||||
local function ime_state()
|
||||
if vim.g.is_mac then
|
||||
local layout = fn.libcall(vim.g.XkbSwitchLib, "Xkb_Switch_getXkbLayout", "")
|
||||
local layout =
|
||||
fn.libcall(vim.g.XkbSwitchLib, "Xkb_Switch_getXkbLayout", "")
|
||||
local res = fn.match(layout, [[\v(Squirrel\.Rime|SCIM.ITABC)]])
|
||||
if res ~= -1 then
|
||||
return "[CN]"
|
||||
@@ -58,8 +59,8 @@ local virtual_env = function()
|
||||
return ""
|
||||
end
|
||||
|
||||
local conda_env = os.getenv("CONDA_DEFAULT_ENV")
|
||||
local venv_path = os.getenv("VIRTUAL_ENV")
|
||||
local conda_env = os.getenv "CONDA_DEFAULT_ENV"
|
||||
local venv_path = os.getenv "VIRTUAL_ENV"
|
||||
|
||||
if venv_path == nil then
|
||||
if conda_env == nil then
|
||||
@@ -85,10 +86,10 @@ require("lualine").setup {
|
||||
laststatus = 0,
|
||||
options = {
|
||||
icons_enabled = true,
|
||||
theme = "auto",
|
||||
theme = "zshell",
|
||||
globalstatus = true,
|
||||
component_separators = '',
|
||||
section_separators = { left = '', right = '' },
|
||||
component_separators = "",
|
||||
section_separators = { left = "", right = "" },
|
||||
disabled_filetypes = {},
|
||||
always_divide_middle = true,
|
||||
},
|
||||
@@ -158,7 +159,7 @@ require("lualine").setup {
|
||||
error = icons.diagnostics.Error,
|
||||
warn = icons.diagnostics.Warn,
|
||||
info = icons.diagnostics.Info,
|
||||
hint = icons.diagnostics.Hint
|
||||
hint = icons.diagnostics.Hint,
|
||||
},
|
||||
},
|
||||
},
|
||||
|
||||
@@ -2,14 +2,11 @@ local treesitter = require "nvim-treesitter"
|
||||
|
||||
treesitter.install { "all" }
|
||||
|
||||
local parsers = treesitter.get_installed()
|
||||
|
||||
vim.api.nvim_create_autocmd("FileType", {
|
||||
callback = function(args)
|
||||
local has_parser = pcall(vim.treesitter.get_parser, args.buf)
|
||||
|
||||
if not has_parser then
|
||||
return
|
||||
end
|
||||
|
||||
pattern = parsers,
|
||||
callback = function()
|
||||
vim.treesitter.start()
|
||||
vim.bo.indentexpr = "v:lua.require'nvim-treesitter'.indentexpr()"
|
||||
end,
|
||||
|
||||
@@ -0,0 +1,61 @@
|
||||
-- Generated by zshell. Lualine theme matching the zshell colorscheme.
|
||||
|
||||
local is_light = "dark" == "light"
|
||||
local function pick(light, dark)
|
||||
return is_light and light or dark
|
||||
end
|
||||
|
||||
local c = {
|
||||
bg = "#1A1206",
|
||||
bg_alt = "#231A0D",
|
||||
bg_mid = pick("#32291A", "#271E11"),
|
||||
fg = "#F1E0CA",
|
||||
fg_muted = "#DBC3A1",
|
||||
fg_strong = pick("#15161A", "#F4F4F8"),
|
||||
|
||||
normal = "#7D2C1E",
|
||||
insert = "#733429",
|
||||
visual = "#B5893E",
|
||||
replace = "#93000A",
|
||||
command = pick("#FFDFD5", "#B9AB66"),
|
||||
inactive = "#231A0D",
|
||||
|
||||
normal_fg = pick("#15161A", "#F4F4F8"),
|
||||
insert_fg = pick("#15161A", "#F4F4F8"),
|
||||
visual_fg = pick("#15161A", "#F4F4F8"),
|
||||
replace_fg = pick("#15161A", "#F4F4F8"),
|
||||
command_fg = pick("#15161A", "#F4F4F8"),
|
||||
}
|
||||
|
||||
return {
|
||||
normal = {
|
||||
a = { fg = c.normal_fg, bg = c.normal, gui = "bold" },
|
||||
b = { fg = c.fg_strong, bg = c.bg_mid },
|
||||
c = { fg = c.fg, bg = c.bg_alt },
|
||||
},
|
||||
insert = {
|
||||
a = { fg = c.insert_fg, bg = c.insert, gui = "bold" },
|
||||
b = { fg = c.fg_strong, bg = c.bg_mid },
|
||||
c = { fg = c.fg, bg = c.bg_alt },
|
||||
},
|
||||
visual = {
|
||||
a = { fg = c.visual_fg, bg = c.visual, gui = "bold" },
|
||||
b = { fg = c.fg_strong, bg = c.bg_mid },
|
||||
c = { fg = c.fg, bg = c.bg_alt },
|
||||
},
|
||||
replace = {
|
||||
a = { fg = c.replace_fg, bg = c.replace, gui = "bold" },
|
||||
b = { fg = c.fg_strong, bg = c.bg_mid },
|
||||
c = { fg = c.fg, bg = c.bg_alt },
|
||||
},
|
||||
command = {
|
||||
a = { fg = c.command_fg, bg = c.command, gui = "bold" },
|
||||
b = { fg = c.fg_strong, bg = c.bg_mid },
|
||||
c = { fg = c.fg, bg = c.bg_alt },
|
||||
},
|
||||
inactive = {
|
||||
a = { fg = c.fg_muted, bg = c.inactive, gui = "bold" },
|
||||
b = { fg = c.fg_muted, bg = c.inactive },
|
||||
c = { fg = c.fg_muted, bg = c.bg },
|
||||
},
|
||||
}
|
||||
@@ -68,7 +68,7 @@ return {
|
||||
},
|
||||
{
|
||||
"hiphish/rainbow-delimiters.nvim",
|
||||
enabled = true,
|
||||
enabled = false,
|
||||
},
|
||||
{
|
||||
"windwp/nvim-autopairs",
|
||||
|
||||
Reference in New Issue
Block a user