From 5dd59d3a1e213dbf1be0a075f8741e78f137bcf6 Mon Sep 17 00:00:00 2001 From: Daylin Morgan Date: Mon, 24 Apr 2023 09:59:25 -0500 Subject: [PATCH] just lua things --- .../nvim/lua/config/lazy.lua | 2 +- .../nvim/lua/plugins/builtins.lua | 2 +- .../wezterm/colors/catppuccin.lua | 43 ++++++++++--------- home/private_dot_config/wezterm/wezterm.lua | 40 ++++++++--------- 4 files changed, 45 insertions(+), 42 deletions(-) diff --git a/home/private_dot_config/nvim/lua/config/lazy.lua b/home/private_dot_config/nvim/lua/config/lazy.lua index f46a8e7..f4c06f5 100644 --- a/home/private_dot_config/nvim/lua/config/lazy.lua +++ b/home/private_dot_config/nvim/lua/config/lazy.lua @@ -31,7 +31,7 @@ require("lazy").setup({ "gzip", -- "matchit", -- "matchparen", - -- "netrwPlugin", + "netrwPlugin", "tarPlugin", "tohtml", "tutor", diff --git a/home/private_dot_config/nvim/lua/plugins/builtins.lua b/home/private_dot_config/nvim/lua/plugins/builtins.lua index cd39cf1..527339d 100644 --- a/home/private_dot_config/nvim/lua/plugins/builtins.lua +++ b/home/private_dot_config/nvim/lua/plugins/builtins.lua @@ -46,7 +46,7 @@ return { "shfmt", "ruff", "ruff-lsp", - "nimlsp", + -- "nimlsp", "lua-language-server", }, }, diff --git a/home/private_dot_config/wezterm/colors/catppuccin.lua b/home/private_dot_config/wezterm/colors/catppuccin.lua index 52cf0a4..fe7ed66 100644 --- a/home/private_dot_config/wezterm/colors/catppuccin.lua +++ b/home/private_dot_config/wezterm/colors/catppuccin.lua @@ -1,4 +1,4 @@ -local wezterm = require "wezterm"; +local wezterm = require("wezterm") -- color variant hex codes local colors = { @@ -28,7 +28,7 @@ local colors = { surface0 = "#ccd0da", crust = "#dce0e8", mantle = "#e6e9ef", - base = "#eff1f5" + base = "#eff1f5", }, frappe = { rosewater = "#f2d5cf", @@ -56,7 +56,7 @@ local colors = { surface0 = "#414559", base = "#303446", mantle = "#292c3c", - crust = "#232634" + crust = "#232634", }, macchiato = { rosewater = "#f4dbd6", @@ -84,7 +84,7 @@ local colors = { surface0 = "#363a4f", base = "#24273a", mantle = "#1e2030", - crust = "#181926" + crust = "#181926", }, mocha = { rosewater = "#f5e0dc", @@ -112,8 +112,8 @@ local colors = { surface0 = "#313244", base = "#1e1e2e", mantle = "#181825", - crust = "#11111b" - } + crust = "#11111b", + }, } local catppuccin = {} @@ -134,7 +134,7 @@ function catppuccin.select(palette) colors[palette].blue, colors[palette].pink, colors[palette].sky, - colors[palette].overlay2 + colors[palette].overlay2, }, brights = { colors[palette].overlay1, @@ -144,41 +144,41 @@ function catppuccin.select(palette) colors[palette].blue, colors[palette].pink, colors[palette].sky, - colors[palette].text + colors[palette].text, }, tab_bar = { background = colors[palette].base, active_tab = { bg_color = colors[palette].surface2, - fg_color = colors[palette].text + fg_color = colors[palette].text, }, inactive_tab = { bg_color = colors[palette].base, - fg_color = colors[palette].text + fg_color = colors[palette].text, }, inactive_tab_hover = { bg_color = colors[palette].surface2, - fg_color = colors[palette].text + fg_color = colors[palette].text, }, new_tab = { bg_color = colors[palette].base, - fg_color = colors[palette].text + fg_color = colors[palette].text, }, new_tab_hover = { bg_color = colors[palette].surface2, fg_color = colors[palette].text, - italic = true - } + italic = true, + }, }, visual_bell = colors[palette].surface0, indexed = { [16] = colors[palette].peach, - [17] = colors[palette].rosewater + [17] = colors[palette].rosewater, }, scrollbar_thumb = colors[palette].surface2, split = colors[palette].crust, -- nightbuild only - compose_cursor = colors[palette].flamingo + compose_cursor = colors[palette].flamingo, } end @@ -187,23 +187,26 @@ local function scheme_for_appearance(appearance, options) if appearance:find("Dark") then return catppuccin.select(options.sync_flavours.dark) else - return catppuccin.select(options.sync_flavours.light) + -- return catppuccin.select(options.sync_flavours.light) + return catppuccin.select(options.sync_flavours.dark) end end function catppuccin.setup(options) -- default to not syncing with the OS theme local should_sync = true - if options.sync == false then should_sync = false end + if options.sync == false then + should_sync = false + end -- default options options = { sync = should_sync, sync_flavours = options.sync_flavours or { light = "latte", - dark = "mocha" + dark = "mocha", }, - flavour = options.flavour or "mocha" + flavour = options.flavour or "mocha", } -- if sync is enabled, hook into the window-config-reloaded event diff --git a/home/private_dot_config/wezterm/wezterm.lua b/home/private_dot_config/wezterm/wezterm.lua index 5b3648e..28556c1 100644 --- a/home/private_dot_config/wezterm/wezterm.lua +++ b/home/private_dot_config/wezterm/wezterm.lua @@ -3,29 +3,29 @@ local catppuccin = require("colors/catppuccin").setup({}) local keys = require("keys") -- add wezterm to title for wm usage wezterm.on("format-window-title", function() - return " - Wezterm" + return " - Wezterm" end) local padding = 10 return { - -- window_background_opacity = 0.9, - window_padding = { - left = padding, - right = padding, - top = padding, - bottom = padding, - }, - font = wezterm.font("MonoLisa Nerd Font"), - adjust_window_size_when_changing_font_size = false, - initial_cols = 80, - colors = catppuccin, - use_fancy_tab_bar = false, - hide_tab_bar_if_only_one_tab = true, - tab_bar_at_bottom = true, - disable_default_key_bindings = true, - bold_brightens_ansi_colors = true, - default_gui_startup_args = { "start", "--always-new-process" }, - keys = keys.keys, - key_tables = keys.key_tables, + -- window_background_opacity = 0.9, + window_padding = { + left = padding, + right = padding, + top = padding, + bottom = padding, + }, + font = wezterm.font("MonoLisa Nerd Font"), + adjust_window_size_when_changing_font_size = false, + initial_cols = 80, + colors = catppuccin, + use_fancy_tab_bar = false, + hide_tab_bar_if_only_one_tab = true, + tab_bar_at_bottom = true, + disable_default_key_bindings = true, + bold_brightens_ansi_colors = true, + default_gui_startup_args = { "start", "--always-new-process" }, + keys = keys.keys, + key_tables = keys.key_tables, }