diff --git a/modules/nvim/config/lua/plugins/which-key.lua b/modules/nvim/config/lua/plugins/which-key.lua index 2b20bf1..0982e0f 100644 --- a/modules/nvim/config/lua/plugins/which-key.lua +++ b/modules/nvim/config/lua/plugins/which-key.lua @@ -14,6 +14,13 @@ return { wk.setup(opts) wk.add({ + { "o", group = "+open", mode = "n" }, + { + "od", + "vsplit | lua vim.lsp.buf.definition()", + desc = "Go to definition in other window", + mode = "n", + }, { "od", "vsplit | lua vim.lsp.buf.definition()", diff --git a/modules/wezterm/config/appearance.lua b/modules/wezterm/config/appearance.lua index 965bc89..dac848f 100644 --- a/modules/wezterm/config/appearance.lua +++ b/modules/wezterm/config/appearance.lua @@ -1,10 +1,14 @@ local wezterm = require("wezterm") local helpers = require("helpers") +local theme = require("theme") local M = {} function M.apply_to_config(config) - config.color_scheme = "Modus-Vivendi-Tinted" + config.color_schemes = { + ["dnsc"] = theme.colors, + } + config.color_scheme = "dnsc" config.font = wezterm.font("VictorMono Nerd Font", { weight = "DemiBold", stretch = "Normal", style = "Normal" }) config.font_size = 18.5 config.window_decorations = "RESIZE" diff --git a/modules/wezterm/config/tab_bar.lua b/modules/wezterm/config/tab_bar.lua index 0b7816e..1ddc222 100644 --- a/modules/wezterm/config/tab_bar.lua +++ b/modules/wezterm/config/tab_bar.lua @@ -1,15 +1,16 @@ local wezterm = require("wezterm") local helpers = require("helpers") +local theme = require("theme") local M = {} local function get_elements(for_window) return { - { Background = { Color = "#0d0e1c" } }, + { Background = { Color = theme.palette.bg } }, { Text = "h:" .. wezterm.hostname() .. " " }, { Text = "u:" .. helpers.get_outdated_packages() .. " " }, { Text = "b:" .. helpers.get_primary_battery_state() .. " " }, - { Background = { Color = "#1d2235" } }, + { Background = { Color = theme.palette.bg_secondary } }, { Text = " " .. helpers.get_zoomed_status(for_window) .. " " }, { Text = "s:" .. for_window:active_workspace() .. " " }, } @@ -25,32 +26,32 @@ function M.apply_to_config(config) config.tab_bar_at_bottom = false config.window_frame = { - inactive_titlebar_bg = "#0d0e1c", - active_titlebar_bg = "#0d0e1c", + inactive_titlebar_bg = theme.palette.bg, + active_titlebar_bg = theme.palette.bg, font = wezterm.font({ family = "Victor Mono", weight = "Bold" }), } config.colors = { tab_bar = { active_tab = { - bg_color = "#0d0e1c", - fg_color = "#ffffff", + bg_color = theme.palette.bg, + fg_color = theme.palette.fg, }, inactive_tab = { - bg_color = "#0d0e1c", - fg_color = "#989898", + bg_color = theme.palette.bg, + fg_color = theme.palette.grey, }, inactive_tab_hover = { - fg_color = "#ffffff", - bg_color = "#0d0e1c", + fg_color = theme.palette.fg, + bg_color = theme.palette.bg, }, new_tab = { - bg_color = "#0d0e1c", - fg_color = "#989898", + bg_color = theme.palette.bg, + fg_color = theme.palette.grey, }, new_tab_hover = { - bg_color = "#0d0e1c", - fg_color = "#ffffff", + bg_color = theme.palette.bg, + fg_color = theme.palette.fg, }, }, } diff --git a/modules/wezterm/config/theme.lua b/modules/wezterm/config/theme.lua new file mode 100644 index 0000000..fa0cd22 --- /dev/null +++ b/modules/wezterm/config/theme.lua @@ -0,0 +1,64 @@ +local M = {} + +local palette = { + fg = "#ffffff", + bg = "#0d0911", + bg_secondary = "#231d2b", + grey = "#605470", + grey_bright = "#847a91", + red = "#be0f58", + red_bright = "#e61565", + green = "#218b72", + green_bright = "#36d9b8", + yellow = "#d8a428", + yellow_bright = "#f0c674", + blue = "#1d74c5", + blue_bright = "#49a8dd", + magenta = "#9e3a96", + magenta_bright = "#d957ce", + cyan = "#2692a8", + cyan_bright = "#36c3d9", + silver = "#605470", + silver_bright = "#ffffff", +} + +M.palette = palette + +M.colors = { + foreground = palette.fg, + background = palette.bg, + + cursor_bg = palette.grey_bright, + cursor_fg = palette.bg_secondary, + cursor_border = palette.grey_bright, + + selection_fg = palette.grey_bright, + selection_bg = palette.bg_secondary, + + scrollbar_thumb = palette.bg_secondary, + split = palette.bg_secondary, + + ansi = { + palette.grey, + palette.red, + palette.green, + palette.yellow, + palette.blue, + palette.magenta, + palette.cyan, + palette.silver, + }, + + brights = { + palette.grey_bright, + palette.red_bright, + palette.green_bright, + palette.yellow_bright, + palette.blue_bright, + palette.magenta_bright, + palette.cyan_bright, + palette.silver_bright, + }, +} + +return M