diff --git a/home/any/neovim/.config/nvim/lua/chadrc.lua b/home/any/neovim/.config/nvim/lua/chadrc.lua index 989bcd7..50a96bd 100644 --- a/home/any/neovim/.config/nvim/lua/chadrc.lua +++ b/home/any/neovim/.config/nvim/lua/chadrc.lua @@ -9,21 +9,53 @@ M.base46 = { theme = "gruvbox", hl_override = { - LineNr = { fg = "#FBB829" }, - String = { fg = "#EF2F27" }, - Keyword = { fg = "#2C78BF" }, - Type = { fg = "#FF5F00" }, + LineNr = { fg = "#FBB829" }, + ["@linenr"] = { fg = "#FBB829" }, + String = { fg = "#EF2F27" }, + ["@string"] = { fg = "#EF2F27" }, + Keyword = { fg = "#68A8E4" }, + ["@keyword"] = { fg = "#68A8E4" }, + ["@keyword.function"] = { fg = "#68A8E4" }, + ["@keyword.return"] = { fg = "#68A8E4" }, + ["@keyword.conditional"] = { fg = "#68A8E4" }, + Type = { fg = "#2C78BF" }, + ["@type"] = { fg = "#2C78BF" }, + -- ["@type"] = { fg = "#FF5F00" }, + ["@number"] = { fg = "#FF5F00" }, + ["@boolean"] = { fg = "#FF5F00" }, Comment = { fg = "#519F50" }, ["@comment"] = { fg = "#519F50" }, - -- Normal = { bg = "none" }, - -- NormalFloat = { bg = "none" }, + ["@string.documentation.python"] = { fg = "#519F50" }, + ["@function"] = { fg = "#FBB829" }, + ["@function.call"] = { fg = "#FBB829" }, + ["@function.builtin"] = { fg = "#FBB829" }, + ["@variable"] = { fg = "#BAA67F" }, + ["@variable.member"] = { fg = "#FF5C8F" }, + ["@property"] = { fg = "#FF5C8F" }, + -- Normal = { bg = "none" }, + -- NormalFloat = { bg = "none" }, }, - transparency = true, + transparency = true, } M.ui = { statusline = { - separator_style = "arrow" + separator_style = "arrow", + order = { "mode", "file", "git", "%=", "lsp_msg", "%=", "diagnostics", "venv", "lsp", "cwd", "cursor" }, + modules = { + venv = function() + if vim.bo.filetype == "python" then + if vim.env["VIRTUAL_ENV"] ~= "" then + local venv_path = require("venv-selector").venv() + if venv_path ~= nil then + local venv = venv_path:match("([^/]+)$") + return "" + end + end + end + return "" + end, + }, } } diff --git a/home/any/neovim/.config/nvim/lua/plugins/treesitter.lua b/home/any/neovim/.config/nvim/lua/plugins/treesitter.lua index 150d3e2..7f0bca6 100644 --- a/home/any/neovim/.config/nvim/lua/plugins/treesitter.lua +++ b/home/any/neovim/.config/nvim/lua/plugins/treesitter.lua @@ -19,4 +19,8 @@ return { } }, }, + { + "nvim-treesitter/playground", + lazy = false, + } }