diff --git a/common/.wezterm.lua b/common/.wezterm.lua index 162612c..79de1dd 100644 --- a/common/.wezterm.lua +++ b/common/.wezterm.lua @@ -5,7 +5,247 @@ local config = { use_cap_height_to_scale_fallback_fonts = true, bold_brightens_ansi_colors = true, color_scheme = "Amora Focus", - hide_tab_bar_if_only_one_tab = true, + color_schemes = { + everforest = { + foreground = "#d3c6aa", + background = "#2b3339", + + cursor_fg = "#3a454a", + cursor_bg = "#d3c6aa", + cursor_border = "#d3c6aa", + + selection_fg = "#9da9a0", + selection_bg = "#7a8478", + + ansi = { + "#323C41", + "#e67e80", + "#a7c080", + "#dbbc7f", + "#7fbbb3", + "#d699b6", + "#83c092", + "#d3c6aa", + }, + brights = { + "#3A454A", + "#f85552", + "#8da101", + "#dfa000", + "#3a94c5", + "#df69ba", + "#35a77c", + "#9da9a0", + }, + + tab_bar = { + background = "#1e2327", + active_tab = { + bg_color = "#2b3339", + fg_color = "#d3c6aa", + }, + inactive_tab = { + bg_color = "#1e2327", + fg_color = "#9da9a0", + }, + inactive_tab_hover = { + bg_color = "#1e2327", + fg_color = "#d3c6aa", + italic = false, + }, + new_tab = { + bg_color = "#1e2327", + fg_color = "#9da9a0", + italic = false, + }, + new_tab_hover = { + bg_color = "#1e2327", + fg_color = "#d3c6aa", + italic = false, + }, + }, + }, + ["Tokyo Night"] = { + background = "#1a1b26", + foreground = "#a9b1d6", + + cursor_fg = "#444b6a", + cursor_bg = "#9da9a0", + cursor_border = "#9da9a0", + + selection_fg = "#787c99", + selection_bg = "#444b6a", + + ansi = { + "#32344a", + "#f7768e", + "#9ece6a", + "#e0af68", + "#7aa2f7", + "#ad8ee6", + "#449dab", + "#787c99", + }, + + brights = { + "#444b6a", + "#ff7a93", + "#b9f27c", + "#ff9e64", + "#7da6ff", + "#bb9af7", + "#0db9d7", + "#acb0d0", + }, + + tab_bar = { + background = "#16161e", + active_tab = { + bg_color = "#1a1b26", + fg_color = "#a9b1d6", + }, + inactive_tab = { + bg_color = "#16161e", + fg_color = "#787c99", + }, + inactive_tab_hover = { + bg_color = "#16161e", + fg_color = "#a9b1d6", + italic = false, + }, + new_tab = { + bg_color = "#16161e", + fg_color = "#9da9a0", + italic = false, + }, + new_tab_hover = { + bg_color = "#16161e", + fg_color = "#a9b1d6", + italic = false, + }, + }, + }, + ["Amora Focus"] = { + background = "#1a1a1a", + foreground = "#dedbeb", + + cursor_fg = "#2d2d2d", + cursor_bg = "#5c5c5c", + cursor_border = "#5c5c5c", + + selection_fg = "#dedbeb", + selection_bg = "#2d2d2d", + + ansi = { + "#2d2d2d", + "#e83f80", + "#a2baa8", + "#eacac0", + "#9985d1", + "#e68ac1", + "#aabae7", + "#dedbeb", + }, + + brights = { + "#383838", + "#f55d8f", + "#bfd1c3", + "#f0ddd8", + "#b4a4de", + "#edabd2", + "#c4d1f5", + "#edebf7", + }, + + tab_bar = { + background = "#141414", + active_tab = { + bg_color = "#1a1a1a", + fg_color = "#dedbeb", + }, + inactive_tab = { + bg_color = "#171717", + fg_color = "#edebf7", + }, + inactive_tab_hover = { + bg_color = "#171717", + fg_color = "#dedbeb", + italic = false, + }, + new_tab = { + bg_color = "#141414", + fg_color = "#edebf7", + italic = false, + }, + new_tab_hover = { + bg_color = "#171717", + fg_color = "#dedbeb", + italic = false, + }, + }, + }, + Discord = { + background = "#36393f", + foreground = "#dcddde", + + cursor_fg = "#202225", + cursor_bg = "#b9bbbe", + cursor_border = "#b9bbbe", + + selection_fg = "#dcddde", + selection_bg = "#202225", + + ansi = { + "#202225", + "#ed4245", + "#46c46d", + "#faa61a", + "#00b0f4", + "#b377f3", + "#45ddc0", + "#a3a6aa", + }, + + brights = { + "#4f545c", + "#f1686a", + "#57f287", + "#fbb848", + "#33c0f6", + "#d09aff", + "#86dcc5", + "#b9bbbe", + }, + + tab_bar = { + background = "#292b2f", + active_tab = { + bg_color = "#36393f", + fg_color = "#dcddde", + }, + inactive_tab = { + bg_color = "#2f3136", + fg_color = "#b9bbbe", + }, + inactive_tab_hover = { + bg_color = "#2f3136", + fg_color = "#dcddde", + italic = false, + }, + new_tab = { + bg_color = "#292b2f", + fg_color = "#b9bbbe", + italic = false, + }, + new_tab_hover = { + bg_color = "#2f3136", + fg_color = "#dcddde", + italic = false, + }, + }, + }, + }, window_padding = { left = 4, right = 4, @@ -18,13 +258,8 @@ local config = { keys = { -- disable search (ctrl f = tab) {key = "f", mods = "CTRL|SHIFT", action = "DisableDefaultAssignment"}, - -- launcher {key = "Space", mods = "CTRL|SHIFT", action = "ShowLauncher"}, - - -- , and . navigation between tabs - {key = "<", mods = "CTRL|SHIFT", action = wezterm.action.ActivateTabRelative(-1)}, - {key = ">", mods = "CTRL|SHIFT", action = wezterm.action.ActivateTabRelative(1)}, }, mouse_bindings = { -- Change the default selection behavior so that it only selects text, @@ -34,7 +269,6 @@ local config = { mods="NONE", action=wezterm.action{ExtendSelectionToMouseCursor="Cell"} }, - -- Don't automatically copy the selection to the clipboard -- when double clicking a word { @@ -42,7 +276,6 @@ local config = { mods="NONE", action="Nop", }, - -- Ctrl-click will open the link under the mouse cursor { event={Up={streak=1, button="Left"}}, diff --git a/common/wezterm/colors/Amora Focus.toml b/common/wezterm/colors/Amora Focus.toml deleted file mode 100644 index 878852e..0000000 --- a/common/wezterm/colors/Amora Focus.toml +++ /dev/null @@ -1,58 +0,0 @@ -[colors] -background = "#1a1a1a" -foreground = "#dedbeb" - -cursor_fg = "#2d2d2d" -cursor_bg = "#5c5c5c" -cursor_border = "#5c5c5c" - -selection_fg = "#dedbeb" -selection_bg = "#2d2d2d" - -ansi = [ - "#2d2d2d", - "#e83f80", - "#a2baa8", - "#eacac0", - "#9985d1", - "#e68ac1", - "#aabae7", - "#dedbeb", -] -brights = [ - "#383838", - "#f55d8f", - "#bfd1c3", - "#f0ddd8", - "#b4a4de", - "#edabd2", - "#c4d1f5", - "#edebf7", -] - -[colors.tab_bar] -background = "#141414" - -[colors.tab_bar.active_tab] -bg_color = "#1a1a1a" -fg_color = "#dedbeb" - -[colors.tab_bar.inactive_tab] -bg_color = "#171717" -fg_color = "#edebf7" - -[colors.tab_bar.inactive_tab_hover] -bg_color = "#171717" -fg_color = "#dedbeb" - -[colors.tab_bar.new_tab] -bg_color = "#141414" -fg_color = "#edebf7" - -[colors.tab_bar.new_tab_hover] -bg_color = "#171717" -fg_color = "#dedbeb" - -[metadata] -name = "Amora Focus" -origin_url = "https://github.com/owozsh/amora" diff --git a/common/wezterm/colors/Discord.toml b/common/wezterm/colors/Discord.toml deleted file mode 100644 index ca2cced..0000000 --- a/common/wezterm/colors/Discord.toml +++ /dev/null @@ -1,57 +0,0 @@ -[colors] -background = "#36393f" -foreground = "#dcddde" - -cursor_fg = "#202225" -cursor_bg = "#b9bbbe" -cursor_border = "#b9bbbe" - -selection_fg = "#dcddde" -selection_bg = "#202225" - -ansi = [ - "#202225", - "#ed4245", - "#46c46d", - "#faa61a", - "#00b0f4", - "#b377f3", - "#45ddc0", - "#a3a6aa", -] -brights = [ - "#4f545c", - "#f1686a", - "#57f287", - "#fbb848", - "#33c0f6", - "#d09aff", - "#86dcc5", - "#b9bbbe", -] - -[colors.tab_bar] -background = "#292b2f" - -[colors.tab_bar.active_tab] -bg_color = "#36393f" -fg_color = "#dcddde" - -[colors.tab_bar.inactive_tab] -bg_color = "#2f3136" -fg_color = "#b9bbbe" - -[colors.tab_bar.inactive_tab_hover] -bg_color = "#2f3136" -fg_color = "#dcddde" - -[colors.tab_bar.new_tab] -bg_color = "#292b2f" -fg_color = "#b9bbbe" - -[colors.tab_bar.new_tab_hover] -bg_color = "#2f3136" -fg_color = "#dcddde" - -[metadata] -name = "Discord" diff --git a/common/wezterm/colors/Embark.toml b/common/wezterm/colors/Embark.toml deleted file mode 100644 index 1f275b3..0000000 --- a/common/wezterm/colors/Embark.toml +++ /dev/null @@ -1,58 +0,0 @@ -[colors] -background = "#1e1c31" -foreground = "#cbe3e7" - -cursor_fg = "#1e1c31" -cursor_bg = "#cbe3e7" -cursor_border = "#cbe3e7" - -selection_fg = "#cbe3e7" -selection_bg = "#8a889d" - -ansi = [ - "#2D2B40", - "#F48FB1", - "#A1EFD3", - "#FFE6B3", - "#91DDFF", - "#D4BFFF", - "#87DFEB", - "#8A889D", -] -brights = [ - "#100E23", - "#F02E6E", - "#62D196", - "#F2B482", - "#65B2FF", - "#A37ACC", - "#63F2F1", - "#585273", -] - -[colors.tab_bar] -background = "#100E23" - -[colors.tab_bar.active_tab] -bg_color = "#1E1C31" -fg_color = "#CBE3E7" - -[colors.tab_bar.inactive_tab] -bg_color = "#2D2B40" -fg_color = "#8A889D" - -[colors.tab_bar.inactive_tab_hover] -bg_color = "#2D2B40" -fg_color = "#CBE3E7" - -[colors.tab_bar.new_tab] -bg_color = "#100e23" -fg_color = "#8A889D" - -[colors.tab_bar.new_tab_hover] -bg_color = "#100e23" -fg_color = "#cbe3e7" - -[metadata] -name = "Embark" -origin_url = "https://embark-theme.github.io/" diff --git a/common/wezterm/colors/Tokyo Night.toml b/common/wezterm/colors/Tokyo Night.toml deleted file mode 100644 index a2232c8..0000000 --- a/common/wezterm/colors/Tokyo Night.toml +++ /dev/null @@ -1,58 +0,0 @@ -[colors] -background = "#1a1b26" -foreground = "#a9b1d6" - -cursor_fg = "#444b6a" -cursor_bg = "#9da9a0" -cursor_border = "#9da9a0" - -selection_fg = "#787c99" -selection_bg = "#444b6a" - -ansi = [ - "#32344a", - "#f7768e", - "#9ece6a", - "#e0af68", - "#7aa2f7", - "#ad8ee6", - "#449dab", - "#787c99", -] -brights = [ - "#444b6a", - "#ff7a93", - "#b9f27c", - "#ff9e64", - "#7da6ff", - "#bb9af7", - "#0db9d7", - "#acb0d0", -] - -[colors.tab_bar] -background = "#16161e" - -[colors.tab_bar.active_tab] -bg_color = "#1a1b26" -fg_color = "#a9b1d6" - -[colors.tab_bar.inactive_tab] -bg_color = "#16161e" -fg_color = "#787c99" - -[colors.tab_bar.inactive_tab_hover] -bg_color = "#16161e" -fg_color = "#a9b1d6" - -[colors.tab_bar.new_tab] -bg_color = "#16161e" -fg_color = "#9da9a0" - -[colors.tab_bar.new_tab_hover] -bg_color = "#16161e" -fg_color = "#a9b1d6" - -[metadata] -name = "Tokyo Night" -origin_url = "https://github.com/enkia/tokyo-night-vscode-theme" diff --git a/common/wezterm/colors/everforest.toml b/common/wezterm/colors/everforest.toml deleted file mode 100644 index fcd9d64..0000000 --- a/common/wezterm/colors/everforest.toml +++ /dev/null @@ -1,59 +0,0 @@ -[colors] -background = "#2b3339" -foreground = "#d3c6aa" - -cursor_fg = "#3a454a" -cursor_bg = "#d3c6aa" -cursor_border = "#d3c6aa" - -selection_fg = "#9da9a0" -selection_bg = "#7a8478" - -ansi = [ - "#323c41", - "#e67e80", - "#a7c080", - "#dbbc7f", - "#7fbbb3", - "#d699b6", - "#83c092", - "#d3c6aa", -] -brights = [ - "#3a454a", - "#f85552", - "#8da101", - "#dfa000", - "#3a94c5", - "#df69ba", - "#35a77c", - "#9da9a0", -] - -[colors.tab_bar] -background = "#1e2327" - -[colors.tab_bar.active_tab] -bg_color = "#2b3339" -fg_color = "#d3c6aa" - -[colors.tab_bar.inactive_tab] -bg_color = "#1e2327" -fg_color = "#9da9a0" - -[colors.tab_bar.inactive_tab_hover] -bg_color = "#1e2327" -fg_color = "#d3c6aa" - -[colors.tab_bar.new_tab] -bg_color = "#1e2327" -fg_color = "#9da9a0" - -[colors.tab_bar.new_tab_hover] -bg_color = "#1e2327" -fg_color = "#d3c6aa" - -[metadata] -name = "everforest" -origin_url = "https://github.com/sainnhe/everforest" - diff --git a/common/wezterm/colors/valve16-goldsrc.toml b/common/wezterm/colors/valve16-goldsrc.toml deleted file mode 100644 index e1e78e7..0000000 --- a/common/wezterm/colors/valve16-goldsrc.toml +++ /dev/null @@ -1,57 +0,0 @@ -[colors] -background = "#3e4637" -foreground = "#f7f8f7" - -cursor_fg = "#958831" -cursor_bg = "#f7f8f7" -cursor_border = "#958831" - -selection_fg = "#f7f8f7" -selection_bg = "#958831" - -ansi = [ - "#282e22", - "#aa0000", - "#4d7455", - "#cf6a32", - "#476291", - "#8650ac", - "#5e98d9", - "#837e77", -] -brights = [ - "#4c5844", - "#eb4b4b", - "#70b04a", - "#ffd700", - "#4b69ff", - "#8847ff", - "#38f3ab", - "#b2b2b2", -] - -[colors.tab_bar] -background = "#282e22" - -[colors.tab_bar.active_tab] -bg_color = "#4c5844" -fg_color = "#f7f8f7" - -[colors.tab_bar.inactive_tab] -bg_color = "#3e4637" -fg_color = "#b2b2b2" - -[colors.tab_bar.inactive_tab_hover] -bg_color = "#3e4637" -fg_color = "#f7f8f7" - -[colors.tab_bar.new_tab] -bg_color = "#282e22" -fg_color = "#b2b2b2" - -[colors.tab_bar.new_tab_hover] -bg_color = "#282e22" -fg_color = "#f7f8f7" - -[metadata] -name = "Valve16 - GoldSrc" diff --git a/common/wezterm/colors/valve16-source-dark.toml b/common/wezterm/colors/valve16-source-dark.toml deleted file mode 100644 index 6595d05..0000000 --- a/common/wezterm/colors/valve16-source-dark.toml +++ /dev/null @@ -1,57 +0,0 @@ -[colors] -background = "#404040" -foreground = "#e0e0e0" - -cursor_fg = "#ff9c00" -cursor_bg = "#e0e0e0" -cursor_border = "#958831" - -selection_fg = "#f7f8f7" -selection_bg = "#958831" - -ansi = [ - "#2c2c2c", - "#aa0000", - "#4d7455", - "#cf6a32", - "#476291", - "#8650ac", - "#5e98d9", - "#837e77", -] -brights = [ - "#606060", - "#eb4b4b", - "#70b04a", - "#ffd700", - "#4b69ff", - "#8847ff", - "#38f3ab", - "#b2b2b2", -] - -[colors.tab_bar] -background = "#2c2c2c" - -[colors.tab_bar.active_tab] -bg_color = "#606060" -fg_color = "#e0e0e0" - -[colors.tab_bar.inactive_tab] -bg_color = "#404040" -fg_color = "#b2b2b2" - -[colors.tab_bar.inactive_tab_hover] -bg_color = "#404040" -fg_color = "#e0e0e0" - -[colors.tab_bar.new_tab] -bg_color = "#2c2c2c" -fg_color = "#b2b2b2" - -[colors.tab_bar.new_tab_hover] -bg_color = "#2c2c2c" -fg_color = "#e0e0e0" - -[metadata] -name = "Valve16 - Source (dark)" diff --git a/linux/.config/awesome/modules/notifs.lua b/linux/.config/awesome/modules/notifs.lua index e5eef33..6553bfb 100644 --- a/linux/.config/awesome/modules/notifs.lua +++ b/linux/.config/awesome/modules/notifs.lua @@ -1,6 +1,4 @@ local beautiful = require("beautiful") -local gears = require("gears") -local lain = require("lain") local naughty = require("naughty") local ruled = require("ruled") local wibox = require("wibox") @@ -57,18 +55,6 @@ naughty.connect_signal("request::display", function(n) bg = beautiful.win9x_unfocus end - local shadow_title = naughty.widget.title({ - notification = n, - }) - shadow_title:set_markup_silently( - lain.util.markup( - beautiful.__colors.color0, - gears.string.xml_escape(n.title) - ) - ) - - n.text = n.text:gsub("\\", "\\\\") - naughty.layout.box({ notification = n, type = "notification", @@ -96,16 +82,7 @@ naughty.connect_signal("request::display", function(n) { { { - { - { - shadow_title, - left = 1, - top = 2, - layout = wibox.container.margin, - }, - naughty.widget.title, - layout = wibox.layout.stack, - }, + naughty.widget.title, left = 1, right = 4, layout = wibox.container.margin, @@ -223,4 +200,4 @@ end) urgency = urgency, timeout = 10, }) -end--]] +end--]] \ No newline at end of file diff --git a/linux/.config/awesome/modules/titlebar.lua b/linux/.config/awesome/modules/titlebar.lua index 724d7f9..7fbe16e 100644 --- a/linux/.config/awesome/modules/titlebar.lua +++ b/linux/.config/awesome/modules/titlebar.lua @@ -103,22 +103,22 @@ client.connect_signal("request::titlebars", function(c) local shadow_title = awful.titlebar.widget.titlewidget(c) shadow_title.update = function() end local name = gears.string.xml_escape(c.name or awful.titlebar.fallback_name) - shadow_title:set_markup_silently(lain.util.markup(beautiful.win9x_title_unfocus or beautiful.win9x_outer, name)) + shadow_title:set_markup_silently(lain.util.markup(beautiful.win9x_outer, name)) c:connect_signal("focus", function() name = gears.string.xml_escape(c.name or awful.titlebar.fallback_name) - shadow_title:set_markup_silently(lain.util.markup(beautiful.win9x_title_focus or beautiful.__colors.color, name)) + shadow_title:set_markup_silently(lain.util.markup(beautiful.__colors.color0, name)) update_lines(true) end) c:connect_signal("unfocus", function() name = gears.string.xml_escape(c.name or awful.titlebar.fallback_name) - shadow_title:set_markup_silently(lain.util.markup(beautiful.win9x_title_unfocus or beautiful.win9x_outer, name)) + shadow_title:set_markup_silently(lain.util.markup(beautiful.win9x_outer, name)) update_lines(false) end) c:connect_signal("property::name", function() name = gears.string.xml_escape(c.name or awful.titlebar.fallback_name) local focused = c == client.focus - local col = focused and (beautiful.win9x_title_focus or beautiful.__colors.color0) or (beautiful.win9x_title_unfocus or beautiful.win9x_outer) + local col = focused and beautiful.__colors.color0 or beautiful.win9x_outer shadow_title:set_markup_silently(lain.util.markup(col, name)) end) diff --git a/linux/.config/awesome/themes/embark.lua b/linux/.config/awesome/themes/embark.lua deleted file mode 100755 index d7a28de..0000000 --- a/linux/.config/awesome/themes/embark.lua +++ /dev/null @@ -1,33 +0,0 @@ -local vars = require("modules/vars") - -local theme = dofile(vars.env.THEME_DIR .. "/_base.lua")({ - background = "#1E1C31", - foreground = "#CBE3E7", - secondary = "#181627", - tertiary = "#100E23", - accent = "#3E3859", - - color0 = "#2D2B40", - color1 = "#F48FB1", - color2 = "#A1EFD3", - color3 = "#FFE6B3", - color4 = "#91DDFF", - color5 = "#D4BFFF", - color6 = "#87DFEB", - color7 = "#8A889D", - - color8 = "#100E23", - color9 = "#F02E6E", - color10 = "#62D196", - color11 = "#F2B482", - color12 = "#65B2FF", - color13 = "#A37ACC", - color14 = "#63F2F1", - color15 = "#585273", -}) - -theme.win9x_bright = "#2D2B40" -theme.win9x_buttons_unfocus = "#2D2B40" -theme.win9x_unfocus = "#8A889D" - -return theme diff --git a/linux/.config/awesome/themes/valve16-goldsrc.lua b/linux/.config/awesome/themes/valve16-goldsrc.lua deleted file mode 100755 index e52f5b5..0000000 --- a/linux/.config/awesome/themes/valve16-goldsrc.lua +++ /dev/null @@ -1,32 +0,0 @@ -local vars = require("modules/vars") - -local theme = dofile(vars.env.THEME_DIR .. "/_base.lua")({ - background = "#4c5844", - foreground = "#f7f8f7", - secondary = "#3e4637", - tertiary = "#282e22", - accent = "#958831", - - color0 = "#282e22", - color1 = "#aa0000", - color2 = "#4d7455", - color3 = "#cf6a32", - color4 = "#476291", - color5 = "#8650ac", - color6 = "#5e98d9", - color7 = "#837e77", - - color8 = "#4c5844", - color9 = "#eb4b4b", - color10 = "#70b04a", - color11 = "#ffd700", - color12 = "#4b69ff", - color13 = "#8847ff", - color14 = "#38f3ab", - color15 = "#b2b2b2", -}) - -theme.win9x_bright = "#889180" -theme.win9x_unfocus = "#889180" - -return theme