diff --git a/config/macos/window-tagger/contents/code/main.js b/config/linux/kwin_window-tagger/contents/code/main.js similarity index 100% rename from config/macos/window-tagger/contents/code/main.js rename to config/linux/kwin_window-tagger/contents/code/main.js diff --git a/config/macos/window-tagger/metadata.json b/config/linux/kwin_window-tagger/metadata.json similarity index 100% rename from config/macos/window-tagger/metadata.json rename to config/linux/kwin_window-tagger/metadata.json diff --git a/config/macos/window-tagger/path.txt b/config/linux/kwin_window-tagger/path.txt similarity index 100% rename from config/macos/window-tagger/path.txt rename to config/linux/kwin_window-tagger/path.txt diff --git a/config/macos/alacritty/alacritty.toml b/config/macos/alacritty/alacritty.toml new file mode 100644 index 0000000..481baf2 --- /dev/null +++ b/config/macos/alacritty/alacritty.toml @@ -0,0 +1,73 @@ +[env] +TERM = "xterm-256color" + +[font] +size = 14 +normal = { family = "Maple Mono", style = "Regular" } +bold = { family = "Maple Mono", style = "Bold" } +italic = { family = "Maple Mono", style = "Italic" } +bold_italic = { family = "Maple Mono", style = "Bold Italic" } +offset = { x = -1, y = 0 } + +[window] +padding = { x = 2, y = 0 } +dynamic_padding = true +# resize_increments = true + +[keyboard] +bindings = [ + # Create new window + { action = "SpawnNewInstance", key = "N", mods = "Command" }, + # Jump back one word + { key = "Left", mods = "Alt", chars = "\u001bb" }, + # Jump forward one word + { key = "Right", mods = "Alt", chars = "\u001bf" }, + # Move to start of line + { key = "Left", mods = "Command", chars = "\u0001" }, + # Move to end of line + { key = "Right", mods = "Command", chars = "\u0005" }, + # Delete backwards + { key = "Back", mods = "Alt", chars = "\u001B\u007F" }, # word + { key = "Back", mods = "Command", chars = "\u0015" }, # line + # Delete forwards + { key = "Delete", mods = "Alt", chars = "\u001Bd" }, # word + { key = "Delete", mods = "Command", chars = "\u000B" } # line +] + +[scrolling] +multiplier = 1 + +[general] +live_config_reload = true + +[colors.primary] +background = "#eeeeee" +foreground = "#434343" + +[colors.cursor] +text = "#eeeeee" +cursor = "#005fff" + +[colors.selection] +text = "#434343" +background = "#e0e0e0" + +[colors.normal] +black = "#000000" +red = "#aa3731" +green = "#448c27" +yellow = "#cb9000" +blue = "#325cc0" +magenta = "#7a3e9d" +cyan = "#0083b2" +white = "#bbbbbb" + +[colors.bright] +black = "#000000" +red = "#aa3731" +green = "#448c27" +yellow = "#cb9000" +blue = "#325cc0" +magenta = "#7a3e9d" +cyan = "#0083b2" +white = "#bbbbbb" diff --git a/config/macos/alacritty/themes/alabaster.toml b/config/macos/alacritty/themes/alabaster.toml new file mode 100644 index 0000000..da82704 --- /dev/null +++ b/config/macos/alacritty/themes/alabaster.toml @@ -0,0 +1,27 @@ +[colors.primary] +background = '#F7F7F7' +foreground = '#434343' + +[colors.cursor] +text = '#F7F7F7' +cursor = '#434343' + +[colors.normal] +black = '#000000' +red = '#AA3731' +green = '#448C27' +yellow = '#CB9000' +blue = '#325CC0' +magenta = '#7A3E9D' +cyan = '#0083B2' +white = '#BBBBBB' + +[colors.bright] +black = '#777777' +red = '#F05050' +green = '#60CB00' +yellow = '#FFBC5D' +blue = '#007ACC' +magenta = '#E64CE6' +cyan = '#00AACB' +white = '#FFFFFF' diff --git a/config/macos/borders/bordersrc b/config/macos/borders/bordersrc new file mode 100755 index 0000000..065fad4 --- /dev/null +++ b/config/macos/borders/bordersrc @@ -0,0 +1,13 @@ +#!/bin/bash + +options=( + order=above + width=2.0 + hidpi=on + active_color=0xff2b2b2b + inactive_color=0xff2b2b2b + # inactive_color=0x00000000 + whitelist="wezterm-gui" +) + +borders "${options[@]}" diff --git a/config/macos/sol/mmkv.default b/config/macos/sol/mmkv.default new file mode 100755 index 0000000..b192c75 Binary files /dev/null and b/config/macos/sol/mmkv.default differ diff --git a/config/macos/sol/mmkv.default.crc b/config/macos/sol/mmkv.default.crc new file mode 100755 index 0000000..1b88657 Binary files /dev/null and b/config/macos/sol/mmkv.default.crc differ diff --git a/config/macos/wezterm/colors/Invero Day.toml b/config/macos/wezterm/colors/Invero Day.toml new file mode 100644 index 0000000..95c7201 --- /dev/null +++ b/config/macos/wezterm/colors/Invero Day.toml @@ -0,0 +1,36 @@ +[colors] +background = "#eeeeee" +foreground = "#444444" +cursor_bg = "#005fff" +cursor_border = "#9e9e9e" +cursor_fg = "#eeeeee" +selection_bg = "#dadada" +selection_fg = "#444444" +split = "#005fff" +compose_cursor = "#d75f00" +scrollbar_thumb = "#9e9e9e" + +copy_mode_active_highlight_bg = { Color = "#dadada" } +copy_mode_active_highlight_fg = { Color = "#d75f00" } +copy_mode_inactive_highlight_bg = { Color = "#eeeeee" } +copy_mode_inactive_highlight_fg = { Color = "#d75f00" } + +ansi = ["#444444", "#ff0000", "#00af5f", "#d75f00", "#005fff", "#5f5f87", "#afd7ff", "#eeeeee"] +brights = ["#444444", "#ff0000", "#00af5f", "#d75f00", "#005fff", "#5f5f87", "#afd7ff", "#eeeeee"] + +[colors.tab_bar] +inactive_tab_edge = "#ff0000" +background = "#444444" + +[colors.tab_bar.active_tab] +fg_color = "#eeeeee" +bg_color = "#444444" +intensity = "Bold" + +[colors.tab_bar.inactive_tab] +fg_color = "#9e9e9e" +bg_color = "#444444" + +[colors.tab_bar.inactive_tab_hover] +fg_color = "#dadada" +bg_color = "#444444" diff --git a/config/macos/wezterm/wezterm.lua b/config/macos/wezterm/wezterm.lua new file mode 100644 index 0000000..99e19bd --- /dev/null +++ b/config/macos/wezterm/wezterm.lua @@ -0,0 +1,71 @@ +local wezterm = require("wezterm") +local config = wezterm.config_builder() +local act = wezterm.action + +-- General +config.term = "wezterm" +config.color_scheme = "Invero Day" + +-- Font +config.font = wezterm.font({ family = "Maple Mono NF", weight = "Medium" }) +config.font_size = 13 +config.harfbuzz_features = { "calt=0", "clig=0", "liga=0" } -- disables alternates and ligatures +config.underline_position = -4 +config.underline_thickness = 3 + +-- Appearance +config.bold_brightens_ansi_colors = false +config.window_padding = { left = "0.5cell", right = "0.5cell", top = 6, bottom = 0 } +config.window_content_alignment = { horizontal = "Center", vertical = "Top" } +config.cell_width = 0.9 +config.line_height = 0.9 + +-- Tabs +config.use_fancy_tab_bar = false +config.show_new_tab_button_in_tab_bar = false +config.hide_tab_bar_if_only_one_tab = true + +-- Events +wezterm.on("toggle-tabbar", function(window, _) + local overrides = window:get_config_overrides() or {} + if overrides.enable_tab_bar == false then + wezterm.log_info("tab bar shown") + overrides.enable_tab_bar = true + else + wezterm.log_info("tab bar hidden") + overrides.enable_tab_bar = false + end + window:set_config_overrides(overrides) +end) + +-- Keybindings +config.keys = { + { mods = "OPT", key = "LeftArrow", action = act.SendString("\x1bb") }, -- Jump back one word + { mods = "OPT", key = "RightArrow", action = act.SendString("\x1bf") }, -- Jump forward one word + { mods = "CMD", key = "LeftArrow", action = act.SendString("\x01") }, -- Move to start of line + { mods = "CMD", key = "RightArrow", action = act.SendString("\x05") }, -- Move to end of line + { mods = "OPT", key = "Backspace", action = act.SendString("\x1b\x7f") }, -- Delete previous word + { mods = "CMD", key = "Backspace", action = act.SendString("\x15") }, -- Delete previous line + { mods = "OPT", key = "Delete", action = act.SendString("\x1bd") }, -- Delete next word + { mods = "CMD", key = "Delete", action = act.SendString("\x0b") }, -- Delete next line + { mods = "CMD", key = "n", action = act.SpawnWindow }, -- New window + { mods = "CMD", key = "t", action = act.SpawnCommandInNewTab({ cwd = wezterm.home_dir }) }, -- New tab + { mods = "SUPER|SHIFT", key = "LeftArrow", action = act({ MoveTabRelative = -1 }) }, -- Move tab left + { mods = "SUPER|SHIFT", key = "RightArrow", action = act({ MoveTabRelative = 1 }) }, -- Move tab right + { mods = "SUPER|SHIFT", key = "b", action = act.EmitEvent("toggle-tabbar") }, + { mods = "SUPER|SHIFT", key = "o", action = wezterm.action.ShowTabNavigator }, + { + mods = "SUPER|SHIFT", + key = "r", + action = wezterm.action.PromptInputLine({ + description = "Enter new tab title", + action = wezterm.action_callback(function(window, pane, line) + if line then + window:active_tab():set_title(line) + end + end), + }), + }, +} + +return config diff --git a/config/shared/nvim/init.lua b/config/shared/nvim/init.lua index 15366d3..1c931a9 100644 --- a/config/shared/nvim/init.lua +++ b/config/shared/nvim/init.lua @@ -23,6 +23,7 @@ require('config.terminal') require('custom.navigation') require('lazy').setup({ spec = { { import = 'plugins' } }, + install = { missing = false }, change_detection = { notify = false }, rocks = { enabled = false }, }) diff --git a/manifest.json b/manifest.json index 3652c43..e0a9e2e 100644 --- a/manifest.json +++ b/manifest.json @@ -38,12 +38,35 @@ } }, "environments": { + "linux": [ + { + "package": "window-tagger", + "link": { + "from": "linux/kwin_window-tagger", + "to": "~/.config/window-tagger" + } + } + ], "macos": [ "git", "zsh", "tmux", "nvim", "bin", + { + "package": "sol", + "link": { + "from": "macos/sol", + "to": "~/.config/sol" + } + }, + { + "package": "borders", + "link": { + "from": "macos/borders", + "to": "~/.config/borders" + } + }, { "package": "linearmouse", "link": {