diff --git a/alacritty/.gitignore b/alacritty/.gitignore index 7c8f5f1..05d8323 100644 --- a/alacritty/.gitignore +++ b/alacritty/.gitignore @@ -1,8 +1,5 @@ -# Generated by `./install` -/alacritty.yml - # Symlink created by `../bin/set-colors` -/colors.yml +/colors.toml # Symlink created by `../install` -/os.yml +/os.toml diff --git a/alacritty/alacritty.toml b/alacritty/alacritty.toml new file mode 100644 index 0000000..d369e47 --- /dev/null +++ b/alacritty/alacritty.toml @@ -0,0 +1,5 @@ +import = [ + "~/.config/alacritty/base.toml", + "~/.config/alacritty/os.toml", + "~/.config/alacritty/colors.toml", +] diff --git a/alacritty/base.toml b/alacritty/base.toml new file mode 100644 index 0000000..8384531 --- /dev/null +++ b/alacritty/base.toml @@ -0,0 +1,537 @@ +live_config_reload = true + +[bell] +duration = 0 + +[colors] +draw_bold_text_with_bright_colors = true + +[cursor] +style = "Block" + +[env] +TERM = "xterm-256color" + +[[keyboard.bindings]] +action = "Paste" +key = "V" +mods = "Control|Shift" + +[[keyboard.bindings]] +action = "Copy" +key = "C" +mods = "Control|Shift" + +[[keyboard.bindings]] +action = "Quit" +key = "Q" +mods = "Command" + +[[keyboard.bindings]] +action = "Quit" +key = "W" +mods = "Command" + +[[keyboard.bindings]] +action = "PasteSelection" +key = "Insert" +mods = "Shift" + +[[keyboard.bindings]] +action = "ResetFontSize" +key = "Key0" +mods = "Control" + +[[keyboard.bindings]] +action = "IncreaseFontSize" +key = "Equals" +mods = "Control" + +[[keyboard.bindings]] +action = "DecreaseFontSize" +key = "Minus" +mods = "Control" + +[[keyboard.bindings]] +chars = "\u001BOH" +key = "Home" +mode = "AppCursor" + +[[keyboard.bindings]] +chars = "\u001B[H" +key = "Home" +mode = "~AppCursor" + +[[keyboard.bindings]] +chars = "\u001BOF" +key = "End" +mode = "AppCursor" + +[[keyboard.bindings]] +chars = "\u001B[F" +key = "End" +mode = "~AppCursor" + +[[keyboard.bindings]] +chars = "\u001B[5;2~" +key = "PageUp" +mods = "Shift" + +[[keyboard.bindings]] +chars = "\u001B[5;5~" +key = "PageUp" +mods = "Control" + +[[keyboard.bindings]] +chars = "\u001B[5~" +key = "PageUp" + +[[keyboard.bindings]] +chars = "\u001B[6;2~" +key = "PageDown" +mods = "Shift" + +[[keyboard.bindings]] +chars = "\u001B[6;5~" +key = "PageDown" +mods = "Control" + +[[keyboard.bindings]] +chars = "\u001B[6~" +key = "PageDown" + +[[keyboard.bindings]] +chars = "\u001B[Z" +key = "Tab" +mods = "Shift" + +[[keyboard.bindings]] +chars = "\u007F" +key = "Back" + +[[keyboard.bindings]] +chars = "\u001B\u007F" +key = "Back" +mods = "Alt" + +[[keyboard.bindings]] +chars = "\u001B[2~" +key = "Insert" + +[[keyboard.bindings]] +chars = "\u001B[3~" +key = "Delete" + +[[keyboard.bindings]] +chars = "\u001B[1;2D" +key = "Left" +mods = "Shift" + +[[keyboard.bindings]] +chars = "\u001B[1;5D" +key = "Left" +mods = "Control" + +[[keyboard.bindings]] +chars = "\u001B[1;3D" +key = "Left" +mods = "Alt" + +[[keyboard.bindings]] +chars = "\u001B[D" +key = "Left" +mode = "~AppCursor" + +[[keyboard.bindings]] +chars = "\u001BOD" +key = "Left" +mode = "AppCursor" + +[[keyboard.bindings]] +chars = "\u001B[1;2C" +key = "Right" +mods = "Shift" + +[[keyboard.bindings]] +chars = "\u001B[1;5C" +key = "Right" +mods = "Control" + +[[keyboard.bindings]] +chars = "\u001B[1;3C" +key = "Right" +mods = "Alt" + +[[keyboard.bindings]] +chars = "\u001B[C" +key = "Right" +mode = "~AppCursor" + +[[keyboard.bindings]] +chars = "\u001BOC" +key = "Right" +mode = "AppCursor" + +[[keyboard.bindings]] +chars = "\u001B[1;2A" +key = "Up" +mods = "Shift" + +[[keyboard.bindings]] +chars = "\u001B[1;5A" +key = "Up" +mods = "Control" + +[[keyboard.bindings]] +chars = "\u001B[1;3A" +key = "Up" +mods = "Alt" + +[[keyboard.bindings]] +chars = "\u001B[A" +key = "Up" +mode = "~AppCursor" + +[[keyboard.bindings]] +chars = "\u001BOA" +key = "Up" +mode = "AppCursor" + +[[keyboard.bindings]] +chars = "\u001B[1;2B" +key = "Down" +mods = "Shift" + +[[keyboard.bindings]] +chars = "\u001B[1;5B" +key = "Down" +mods = "Control" + +[[keyboard.bindings]] +chars = "\u001B[1;3B" +key = "Down" +mods = "Alt" + +[[keyboard.bindings]] +chars = "\u001B[B" +key = "Down" +mode = "~AppCursor" + +[[keyboard.bindings]] +chars = "\u001BOB" +key = "Down" +mode = "AppCursor" + +[[keyboard.bindings]] +chars = "\u001BOP" +key = "F1" + +[[keyboard.bindings]] +chars = "\u001BOQ" +key = "F2" + +[[keyboard.bindings]] +chars = "\u001BOR" +key = "F3" + +[[keyboard.bindings]] +chars = "\u001BOS" +key = "F4" + +[[keyboard.bindings]] +chars = "\u001B[15~" +key = "F5" + +[[keyboard.bindings]] +chars = "\u001B[17~" +key = "F6" + +[[keyboard.bindings]] +chars = "\u001B[18~" +key = "F7" + +[[keyboard.bindings]] +chars = "\u001B[19~" +key = "F8" + +[[keyboard.bindings]] +chars = "\u001B[20~" +key = "F9" + +[[keyboard.bindings]] +chars = "\u001B[21~" +key = "F10" + +[[keyboard.bindings]] +chars = "\u001B[23~" +key = "F11" + +[[keyboard.bindings]] +chars = "\u001B[24~" +key = "F12" + +[[keyboard.bindings]] +chars = "\u001B[1;2P" +key = "F1" +mods = "Shift" + +[[keyboard.bindings]] +chars = "\u001B[1;2Q" +key = "F2" +mods = "Shift" + +[[keyboard.bindings]] +chars = "\u001B[1;2R" +key = "F3" +mods = "Shift" + +[[keyboard.bindings]] +chars = "\u001B[1;2S" +key = "F4" +mods = "Shift" + +[[keyboard.bindings]] +chars = "\u001B[15;2~" +key = "F5" +mods = "Shift" + +[[keyboard.bindings]] +chars = "\u001B[17;2~" +key = "F6" +mods = "Shift" + +[[keyboard.bindings]] +chars = "\u001B[18;2~" +key = "F7" +mods = "Shift" + +[[keyboard.bindings]] +chars = "\u001B[19;2~" +key = "F8" +mods = "Shift" + +[[keyboard.bindings]] +chars = "\u001B[20;2~" +key = "F9" +mods = "Shift" + +[[keyboard.bindings]] +chars = "\u001B[21;2~" +key = "F10" +mods = "Shift" + +[[keyboard.bindings]] +chars = "\u001B[23;2~" +key = "F11" +mods = "Shift" + +[[keyboard.bindings]] +chars = "\u001B[24;2~" +key = "F12" +mods = "Shift" + +[[keyboard.bindings]] +chars = "\u001B[1;5P" +key = "F1" +mods = "Control" + +[[keyboard.bindings]] +chars = "\u001B[1;5Q" +key = "F2" +mods = "Control" + +[[keyboard.bindings]] +chars = "\u001B[1;5R" +key = "F3" +mods = "Control" + +[[keyboard.bindings]] +chars = "\u001B[1;5S" +key = "F4" +mods = "Control" + +[[keyboard.bindings]] +chars = "\u001B[15;5~" +key = "F5" +mods = "Control" + +[[keyboard.bindings]] +chars = "\u001B[17;5~" +key = "F6" +mods = "Control" + +[[keyboard.bindings]] +chars = "\u001B[18;5~" +key = "F7" +mods = "Control" + +[[keyboard.bindings]] +chars = "\u001B[19;5~" +key = "F8" +mods = "Control" + +[[keyboard.bindings]] +chars = "\u001B[20;5~" +key = "F9" +mods = "Control" + +[[keyboard.bindings]] +chars = "\u001B[21;5~" +key = "F10" +mods = "Control" + +[[keyboard.bindings]] +chars = "\u001B[23;5~" +key = "F11" +mods = "Control" + +[[keyboard.bindings]] +chars = "\u001B[24;5~" +key = "F12" +mods = "Control" + +[[keyboard.bindings]] +chars = "\u001B[1;6P" +key = "F1" +mods = "Alt" + +[[keyboard.bindings]] +chars = "\u001B[1;6Q" +key = "F2" +mods = "Alt" + +[[keyboard.bindings]] +chars = "\u001B[1;6R" +key = "F3" +mods = "Alt" + +[[keyboard.bindings]] +chars = "\u001B[1;6S" +key = "F4" +mods = "Alt" + +[[keyboard.bindings]] +chars = "\u001B[15;6~" +key = "F5" +mods = "Alt" + +[[keyboard.bindings]] +chars = "\u001B[17;6~" +key = "F6" +mods = "Alt" + +[[keyboard.bindings]] +chars = "\u001B[18;6~" +key = "F7" +mods = "Alt" + +[[keyboard.bindings]] +chars = "\u001B[19;6~" +key = "F8" +mods = "Alt" + +[[keyboard.bindings]] +chars = "\u001B[20;6~" +key = "F9" +mods = "Alt" + +[[keyboard.bindings]] +chars = "\u001B[21;6~" +key = "F10" +mods = "Alt" + +[[keyboard.bindings]] +chars = "\u001B[23;6~" +key = "F11" +mods = "Alt" + +[[keyboard.bindings]] +chars = "\u001B[24;6~" +key = "F12" +mods = "Alt" + +[[keyboard.bindings]] +chars = "\u001B[1;3P" +key = "F1" +mods = "Super" + +[[keyboard.bindings]] +chars = "\u001B[1;3Q" +key = "F2" +mods = "Super" + +[[keyboard.bindings]] +chars = "\u001B[1;3R" +key = "F3" +mods = "Super" + +[[keyboard.bindings]] +chars = "\u001B[1;3S" +key = "F4" +mods = "Super" + +[[keyboard.bindings]] +chars = "\u001B[15;3~" +key = "F5" +mods = "Super" + +[[keyboard.bindings]] +chars = "\u001B[17;3~" +key = "F6" +mods = "Super" + +[[keyboard.bindings]] +chars = "\u001B[18;3~" +key = "F7" +mods = "Super" + +[[keyboard.bindings]] +chars = "\u001B[19;3~" +key = "F8" +mods = "Super" + +[[keyboard.bindings]] +chars = "\u001B[20;3~" +key = "F9" +mods = "Super" + +[[keyboard.bindings]] +chars = "\u001B[21;3~" +key = "F10" +mods = "Super" + +[[keyboard.bindings]] +chars = "\u001B[23;3~" +key = "F11" +mods = "Super" + +[[keyboard.bindings]] +chars = "\u001B[24;3~" +key = "F12" +mods = "Super" + +[mouse] +hide_when_typing = false + +[[mouse.bindings]] +action = "PasteSelection" +mouse = "Middle" + +[scrolling] +multiplier = 1 + +[selection] +semantic_escape_chars = ",│`|:\"' ()[]{}<>" + +[window] +decorations = "Full" +dynamic_title = true +opacity = 1.0 + +[window.dimensions] +columns = 80 +lines = 24 + +[window.padding] +x = 2 +y = 2 diff --git a/alacritty/base.yml b/alacritty/base.yml deleted file mode 100644 index 1701d87..0000000 --- a/alacritty/base.yml +++ /dev/null @@ -1,285 +0,0 @@ -# Configuration for Alacritty, the GPU enhanced terminal emulator - - -# Any items in the `env` entry below will be added as -# environment variables. Some entries may override variables -# set by alacritty it self. -env: - # TERM env customization. - # - # If this property is not set, alacritty will set it to xterm-256color. - # - # Note that some xterm terminfo databases don't declare support for italics. - # You can verify this by checking for the presence of `smso` and `sitm` in - # `infocmp xterm-256color`. - TERM: xterm-256color - -window: - # Window dimensions in character columns and lines - # Falls back to size specified by window manager if set to 0x0. - # (changes require restart) - dimensions: - columns: 80 - lines: 24 - - # Adds this many blank pixels of padding around the window - # Units are physical pixels; this is not DPI aware. - # (change requires restart) - padding: - x: 2 - y: 2 - - # Window decorations - # Setting this to None will result in window without borders and title bar. - decorations: Full - -# Display tabs using this many cells (changes require restart) -tabspaces: 8 - -# When true, bold text is drawn using the bright variant of colors. -draw_bold_text_with_bright_colors: true - -# Should display the render timer -render_timer: false - -# Use custom cursor colors. If true, display the cursor in the cursor.foreground -# and cursor.background colors, otherwise invert the colors of the cursor. -custom_cursor_colors: false - -# Visual Bell -# -# Any time the BEL code is received, Alacritty "rings" the visual bell. Once -# rung, the terminal background will be set to white and transition back to the -# default background color. You can control the rate of this transition by -# setting the `duration` property (represented in milliseconds). You can also -# configure the transition function by setting the `animation` property. -# -# Possible values for `animation` -# `Ease` -# `EaseOut` -# `EaseOutSine` -# `EaseOutQuad` -# `EaseOutCubic` -# `EaseOutQuart` -# `EaseOutQuint` -# `EaseOutExpo` -# `EaseOutCirc` -# `Linear` -# -# To completely disable the visual bell, set its duration to 0. -# -bell: - duration: 0 - -# Background opacity -window: - opacity: 1.0 - -# Mouse bindings -# -# Currently doesn't support modifiers. Both the `mouse` and `action` fields must -# be specified. -# -# Values for `mouse`: -# - Middle -# - Left -# - Right -# - Numeric identifier such as `5` -# -# Values for `action`: -# - Paste -# - PasteSelection -# - Copy (TODO) -mouse_bindings: - - { mouse: Middle, action: PasteSelection } - -mouse: - # Click settings - # - # The `double_click` and `triple_click` settings control the time - # alacritty should wait for accepting multiple clicks as one double - # or triple click. - double_click: { threshold: 300 } - triple_click: { threshold: 300 } - - # Faux Scrollback - # - # The `faux_scrollback_lines` setting controls the number - # of lines the terminal should scroll when the alternate - # screen buffer is active. This is used to allow mouse - # scrolling for applications like `man`. - # - # To disable this completely, set `faux_scrollback_lines` to 0. - faux_scrollback_lines: 1 - -selection: - semantic_escape_chars: ",│`|:\"' ()[]{}<>" - -dynamic_title: true - -hide_cursor_when_typing: false - -# Style of the cursor -# -# Values for 'cursor_style': -# - Block -# - Underline -# - Beam -cursor_style: Block - -# Live config reload (changes require restart) -live_config_reload: true - -# Shell -# -# You can set shell.program to the path of your favorite shell, e.g. /bin/fish. -# Entries in shell.args are passed unmodified as arguments to the shell. -# -# shell: -# program: /bin/bash -# args: -# - --login - -# Key bindings -# -# Each binding is defined as an object with some properties. Most of the -# properties are optional. All of the alphabetical keys should have a letter for -# the `key` value such as `V`. Function keys are probably what you would expect -# as well (F1, F2, ..). The number keys above the main keyboard are encoded as -# `Key1`, `Key2`, etc. Keys on the number pad are encoded `Number1`, `Number2`, -# etc. These all match the glutin::VirtualKeyCode variants. -# -# A list with all available `key` names can be found here: -# https://docs.rs/glutin/*/glutin/enum.VirtualKeyCode.html#variants -# -# Possible values for `mods` -# `Command`, `Super` refer to the super/command/windows key -# `Control` for the control key -# `Shift` for the Shift key -# `Alt` and `Option` refer to alt/option -# -# mods may be combined with a `|`. For example, requiring control and shift -# looks like: -# -# mods: Control|Shift -# -# The parser is currently quite sensitive to whitespace and capitalization - -# capitalization must match exactly, and piped items must not have whitespace -# around them. -# -# Either an `action`, `chars`, or `command` field must be present. -# `action` must be one of `Paste`, `PasteSelection`, `Copy`, or `Quit`. -# `chars` writes the specified string every time that binding is activated. -# These should generally be escape sequences, but they can be configured to -# send arbitrary strings of bytes. -# `command` must be a map containing a `program` string, and `args` array of -# strings. For example: -# - { ... , command: { program: "alacritty", args: ["-e", "vttest"] } } -# -# Want to add a binding (e.g. "PageUp") but are unsure what the X sequence -# (e.g. "\x1b[5~") is? Open another terminal (like xterm) without tmux, -# then run `showkey -a` to get the sequence associated to a key combination. -key_bindings: - - { key: V, mods: Control|Shift, action: Paste } - - { key: C, mods: Control|Shift, action: Copy } - - { key: Q, mods: Command, action: Quit } - - { key: W, mods: Command, action: Quit } - - { key: Insert, mods: Shift, action: PasteSelection } - - { key: Key0, mods: Control, action: ResetFontSize } - - { key: Equals, mods: Control, action: IncreaseFontSize } - - { key: Minus, mods: Control, action: DecreaseFontSize } - - { key: Home, chars: "\x1bOH", mode: AppCursor } - - { key: Home, chars: "\x1b[H", mode: ~AppCursor } - - { key: End, chars: "\x1bOF", mode: AppCursor } - - { key: End, chars: "\x1b[F", mode: ~AppCursor } - - { key: PageUp, mods: Shift, chars: "\x1b[5;2~" } - - { key: PageUp, mods: Control, chars: "\x1b[5;5~" } - - { key: PageUp, chars: "\x1b[5~" } - - { key: PageDown, mods: Shift, chars: "\x1b[6;2~" } - - { key: PageDown, mods: Control, chars: "\x1b[6;5~" } - - { key: PageDown, chars: "\x1b[6~" } - - { key: Tab, mods: Shift, chars: "\x1b[Z" } - - { key: Back, chars: "\x7f" } - - { key: Back, mods: Alt, chars: "\x1b\x7f" } - - { key: Insert, chars: "\x1b[2~" } - - { key: Delete, chars: "\x1b[3~" } - - { key: Left, mods: Shift, chars: "\x1b[1;2D" } - - { key: Left, mods: Control, chars: "\x1b[1;5D" } - - { key: Left, mods: Alt, chars: "\x1b[1;3D" } - - { key: Left, chars: "\x1b[D", mode: ~AppCursor } - - { key: Left, chars: "\x1bOD", mode: AppCursor } - - { key: Right, mods: Shift, chars: "\x1b[1;2C" } - - { key: Right, mods: Control, chars: "\x1b[1;5C" } - - { key: Right, mods: Alt, chars: "\x1b[1;3C" } - - { key: Right, chars: "\x1b[C", mode: ~AppCursor } - - { key: Right, chars: "\x1bOC", mode: AppCursor } - - { key: Up, mods: Shift, chars: "\x1b[1;2A" } - - { key: Up, mods: Control, chars: "\x1b[1;5A" } - - { key: Up, mods: Alt, chars: "\x1b[1;3A" } - - { key: Up, chars: "\x1b[A", mode: ~AppCursor } - - { key: Up, chars: "\x1bOA", mode: AppCursor } - - { key: Down, mods: Shift, chars: "\x1b[1;2B" } - - { key: Down, mods: Control, chars: "\x1b[1;5B" } - - { key: Down, mods: Alt, chars: "\x1b[1;3B" } - - { key: Down, chars: "\x1b[B", mode: ~AppCursor } - - { key: Down, chars: "\x1bOB", mode: AppCursor } - - { key: F1, chars: "\x1bOP" } - - { key: F2, chars: "\x1bOQ" } - - { key: F3, chars: "\x1bOR" } - - { key: F4, chars: "\x1bOS" } - - { key: F5, chars: "\x1b[15~" } - - { key: F6, chars: "\x1b[17~" } - - { key: F7, chars: "\x1b[18~" } - - { key: F8, chars: "\x1b[19~" } - - { key: F9, chars: "\x1b[20~" } - - { key: F10, chars: "\x1b[21~" } - - { key: F11, chars: "\x1b[23~" } - - { key: F12, chars: "\x1b[24~" } - - { key: F1, mods: Shift, chars: "\x1b[1;2P" } - - { key: F2, mods: Shift, chars: "\x1b[1;2Q" } - - { key: F3, mods: Shift, chars: "\x1b[1;2R" } - - { key: F4, mods: Shift, chars: "\x1b[1;2S" } - - { key: F5, mods: Shift, chars: "\x1b[15;2~" } - - { key: F6, mods: Shift, chars: "\x1b[17;2~" } - - { key: F7, mods: Shift, chars: "\x1b[18;2~" } - - { key: F8, mods: Shift, chars: "\x1b[19;2~" } - - { key: F9, mods: Shift, chars: "\x1b[20;2~" } - - { key: F10, mods: Shift, chars: "\x1b[21;2~" } - - { key: F11, mods: Shift, chars: "\x1b[23;2~" } - - { key: F12, mods: Shift, chars: "\x1b[24;2~" } - - { key: F1, mods: Control, chars: "\x1b[1;5P" } - - { key: F2, mods: Control, chars: "\x1b[1;5Q" } - - { key: F3, mods: Control, chars: "\x1b[1;5R" } - - { key: F4, mods: Control, chars: "\x1b[1;5S" } - - { key: F5, mods: Control, chars: "\x1b[15;5~" } - - { key: F6, mods: Control, chars: "\x1b[17;5~" } - - { key: F7, mods: Control, chars: "\x1b[18;5~" } - - { key: F8, mods: Control, chars: "\x1b[19;5~" } - - { key: F9, mods: Control, chars: "\x1b[20;5~" } - - { key: F10, mods: Control, chars: "\x1b[21;5~" } - - { key: F11, mods: Control, chars: "\x1b[23;5~" } - - { key: F12, mods: Control, chars: "\x1b[24;5~" } - - { key: F1, mods: Alt, chars: "\x1b[1;6P" } - - { key: F2, mods: Alt, chars: "\x1b[1;6Q" } - - { key: F3, mods: Alt, chars: "\x1b[1;6R" } - - { key: F4, mods: Alt, chars: "\x1b[1;6S" } - - { key: F5, mods: Alt, chars: "\x1b[15;6~" } - - { key: F6, mods: Alt, chars: "\x1b[17;6~" } - - { key: F7, mods: Alt, chars: "\x1b[18;6~" } - - { key: F8, mods: Alt, chars: "\x1b[19;6~" } - - { key: F9, mods: Alt, chars: "\x1b[20;6~" } - - { key: F10, mods: Alt, chars: "\x1b[21;6~" } - - { key: F11, mods: Alt, chars: "\x1b[23;6~" } - - { key: F12, mods: Alt, chars: "\x1b[24;6~" } - - { key: F1, mods: Super, chars: "\x1b[1;3P" } - - { key: F2, mods: Super, chars: "\x1b[1;3Q" } - - { key: F3, mods: Super, chars: "\x1b[1;3R" } - - { key: F4, mods: Super, chars: "\x1b[1;3S" } - - { key: F5, mods: Super, chars: "\x1b[15;3~" } - - { key: F6, mods: Super, chars: "\x1b[17;3~" } - - { key: F7, mods: Super, chars: "\x1b[18;3~" } - - { key: F8, mods: Super, chars: "\x1b[19;3~" } - - { key: F9, mods: Super, chars: "\x1b[20;3~" } - - { key: F10, mods: Super, chars: "\x1b[21;3~" } - - { key: F11, mods: Super, chars: "\x1b[23;3~" } - - { key: F12, mods: Super, chars: "\x1b[24;3~" } diff --git a/alacritty/colors-dark.toml b/alacritty/colors-dark.toml new file mode 100644 index 0000000..497247e --- /dev/null +++ b/alacritty/colors-dark.toml @@ -0,0 +1,23 @@ +[colors.bright] +black = "0x373b41" +blue = "0x81a2be" +cyan = "0x8abeb7" +green = "0xb5bd68" +magenta = "0xb294bb" +red = "0xcc6666" +white = "0xc5c8c6" +yellow = "0xf0c674" + +[colors.normal] +black = "0x282a2e" +blue = "0x5f819d" +cyan = "0x5e8d87" +green = "0x8c9440" +magenta = "0x85678f" +red = "0xa54242" +white = "0x707880" +yellow = "0xde935f" + +[colors.primary] +background = "0x1d1f21" +foreground = "0xc5c8c6" diff --git a/alacritty/colors-dark.yml b/alacritty/colors-dark.yml deleted file mode 100644 index ed246f6..0000000 --- a/alacritty/colors-dark.yml +++ /dev/null @@ -1,27 +0,0 @@ -colors: - # Default colors - primary: - background: '0x1d1f21' - foreground: '0xc5c8c6' - - # Normal colors - normal: - black: '0x282a2e' - red: '0xa54242' - green: '0x8c9440' - yellow: '0xde935f' - blue: '0x5f819d' - magenta: '0x85678f' - cyan: '0x5e8d87' - white: '0x707880' - - # Bright colors - bright: - black: '0x373b41' - red: '0xcc6666' - green: '0xb5bd68' - yellow: '0xf0c674' - blue: '0x81a2be' - magenta: '0xb294bb' - cyan: '0x8abeb7' - white: '0xc5c8c6' diff --git a/alacritty/colors-light.toml b/alacritty/colors-light.toml new file mode 100644 index 0000000..7723df5 --- /dev/null +++ b/alacritty/colors-light.toml @@ -0,0 +1,23 @@ +[colors.bright] +black = "0xb3b3b3" +blue = "0x024299" +cyan = "0x008a86" +green = "0x345a09" +magenta = "0x63039f" +red = "0xad1d2f" +white = "0x909090" +yellow = "0xb44900" + +[colors.normal] +black = "0xdadada" +blue = "0x337ada" +cyan = "0x0089a8" +green = "0x056602" +magenta = "0xac37f5" +red = "0xf32840" +white = "0x707070" +yellow = "0xf06d14" + +[colors.primary] +background = "0xffffff" +foreground = "0x303030" diff --git a/alacritty/colors-light.yml b/alacritty/colors-light.yml deleted file mode 100644 index d268792..0000000 --- a/alacritty/colors-light.yml +++ /dev/null @@ -1,27 +0,0 @@ -colors: - # Default colors - primary: - background: '0xffffff' - foreground: '0x303030' - - # Normal colors - normal: - black: '0xdadada' - red: '0xf32840' - green: '0x056602' - yellow: '0xf06d14' - blue: '0x337ada' - magenta: '0xac37f5' - cyan: '0x0089a8' - white: '0x707070' - - # Bright colors - bright: - black: '0xb3b3b3' - red: '0xad1d2f' - green: '0x345a09' - yellow: '0xb44900' - blue: '0x024299' - magenta: '0x63039f' - cyan: '0x008a86' - white: '0x909090' diff --git a/alacritty/darwin.toml b/alacritty/darwin.toml new file mode 100644 index 0000000..9990071 --- /dev/null +++ b/alacritty/darwin.toml @@ -0,0 +1,143 @@ +[font] +size = 13 + +[font.glyph_offset] +x = 0 +y = 0 + +[font.normal] +family = "Iosevka Term" + +[font.offset] +x = 0 +y = 0 + +[[keyboard.bindings]] +chars = "\u001Ba" +key = "A" +mods = "Alt" + +[[keyboard.bindings]] +chars = "\u001Bb" +key = "B" +mods = "Alt" + +[[keyboard.bindings]] +chars = "\u001Bc" +key = "C" +mods = "Alt" + +[[keyboard.bindings]] +chars = "\u001Bd" +key = "D" +mods = "Alt" + +[[keyboard.bindings]] +chars = "\u001Be" +key = "E" +mods = "Alt" + +[[keyboard.bindings]] +chars = "\u001Bf" +key = "F" +mods = "Alt" + +[[keyboard.bindings]] +chars = "\u001Bg" +key = "G" +mods = "Alt" + +[[keyboard.bindings]] +chars = "\u001Bh" +key = "H" +mods = "Alt" + +[[keyboard.bindings]] +chars = "\u001Bi" +key = "I" +mods = "Alt" + +[[keyboard.bindings]] +chars = "\u001Bj" +key = "J" +mods = "Alt" + +[[keyboard.bindings]] +chars = "\u001Bk" +key = "K" +mods = "Alt" + +[[keyboard.bindings]] +chars = "\u001Bl" +key = "L" +mods = "Alt" + +[[keyboard.bindings]] +chars = "\u001Bm" +key = "M" +mods = "Alt" + +[[keyboard.bindings]] +chars = "\u001Bn" +key = "N" +mods = "Alt" + +[[keyboard.bindings]] +chars = "\u001Bo" +key = "O" +mods = "Alt" + +[[keyboard.bindings]] +chars = "\u001Bp" +key = "P" +mods = "Alt" + +[[keyboard.bindings]] +chars = "\u001Bq" +key = "Q" +mods = "Alt" + +[[keyboard.bindings]] +chars = "\u001Br" +key = "R" +mods = "Alt" + +[[keyboard.bindings]] +chars = "\u001Bs" +key = "S" +mods = "Alt" + +[[keyboard.bindings]] +chars = "\u001Bt" +key = "T" +mods = "Alt" + +[[keyboard.bindings]] +chars = "\u001Bu" +key = "U" +mods = "Alt" + +[[keyboard.bindings]] +chars = "\u001Bv" +key = "V" +mods = "Alt" + +[[keyboard.bindings]] +chars = "\u001Bw" +key = "W" +mods = "Alt" + +[[keyboard.bindings]] +chars = "\u001Bx" +key = "X" +mods = "Alt" + +[[keyboard.bindings]] +chars = "\u001By" +key = "Y" +mods = "Alt" + +[[keyboard.bindings]] +chars = "\u001Bz" +key = "Z" +mods = "Alt" diff --git a/alacritty/darwin.yml b/alacritty/darwin.yml deleted file mode 100644 index 977ca04..0000000 --- a/alacritty/darwin.yml +++ /dev/null @@ -1,68 +0,0 @@ -# Font configuration (changes require restart) -# -# Important font attributes like antialiasing, subpixel aa, and hinting can be -# controlled through fontconfig. Specifically, the following attributes should -# have an effect: -# -# * hintstyle -# * antialias -# * lcdfilter -# * rgba -# -# For instance, if you wish to disable subpixel antialiasing, you might set the -# rgba property to "none". If you wish to completely disable antialiasing, you -# can set antialias to false. -# -# Please see these resources for more information on how to use fontconfig -# -# * https://wiki.archlinux.org/index.php/font_configuration#Fontconfig_configuration -# * file:///usr/share/doc/fontconfig/fontconfig-user.html -font: - normal: - family: Iosevka Term - - # Point size of the font - size: 13 - - # Offset is the extra space around each character. offset.y can be thought of - # as modifying the linespacing, and offset.x as modifying the letter spacing. - offset: - x: 0 - y: 0 - - # Glyph offset determines the locations of the glyphs within their cells with - # the default being at the bottom. Increase the x offset to move the glyph to - # the right, increase the y offset to move the glyph upward. - glyph_offset: - x: 0 - y: 0 - -# Bind all the Alt+[letter] combinations to avoid getting the special -# characters from Option+[letter]. -key_bindings: - - { key: A, mods: Alt, chars: "\x1ba" } - - { key: B, mods: Alt, chars: "\x1bb" } - - { key: C, mods: Alt, chars: "\x1bc" } - - { key: D, mods: Alt, chars: "\x1bd" } - - { key: E, mods: Alt, chars: "\x1be" } - - { key: F, mods: Alt, chars: "\x1bf" } - - { key: G, mods: Alt, chars: "\x1bg" } - - { key: H, mods: Alt, chars: "\x1bh" } - - { key: I, mods: Alt, chars: "\x1bi" } - - { key: J, mods: Alt, chars: "\x1bj" } - - { key: K, mods: Alt, chars: "\x1bk" } - - { key: L, mods: Alt, chars: "\x1bl" } - - { key: M, mods: Alt, chars: "\x1bm" } - - { key: N, mods: Alt, chars: "\x1bn" } - - { key: O, mods: Alt, chars: "\x1bo" } - - { key: P, mods: Alt, chars: "\x1bp" } - - { key: Q, mods: Alt, chars: "\x1bq" } - - { key: R, mods: Alt, chars: "\x1br" } - - { key: S, mods: Alt, chars: "\x1bs" } - - { key: T, mods: Alt, chars: "\x1bt" } - - { key: U, mods: Alt, chars: "\x1bu" } - - { key: V, mods: Alt, chars: "\x1bv" } - - { key: W, mods: Alt, chars: "\x1bw" } - - { key: X, mods: Alt, chars: "\x1bx" } - - { key: Y, mods: Alt, chars: "\x1by" } - - { key: Z, mods: Alt, chars: "\x1bz" } diff --git a/alacritty/install b/alacritty/install deleted file mode 100755 index fc9d1c6..0000000 --- a/alacritty/install +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env bash - -set -euo pipefail - -CURDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -inputs=( - "${CURDIR}/base.yml" - "${CURDIR}/os.yml" - "${CURDIR}/colors.yml" -) -output="${CURDIR}/alacritty.yml" - -cat "${inputs[@]}" > "${output}" diff --git a/alacritty/linux.toml b/alacritty/linux.toml new file mode 100644 index 0000000..bdbd514 --- /dev/null +++ b/alacritty/linux.toml @@ -0,0 +1,13 @@ +[font] +size = 10 + +[font.glyph_offset] +x = 0 +y = 0 + +[font.normal] +family = "Input Mono Narrow Light" + +[font.offset] +x = 0 +y = 0 diff --git a/alacritty/linux.yml b/alacritty/linux.yml deleted file mode 100644 index a930f6a..0000000 --- a/alacritty/linux.yml +++ /dev/null @@ -1,38 +0,0 @@ -# Font configuration (changes require restart) -# -# Important font attributes like antialiasing, subpixel aa, and hinting can be -# controlled through fontconfig. Specifically, the following attributes should -# have an effect: -# -# * hintstyle -# * antialias -# * lcdfilter -# * rgba -# -# For instance, if you wish to disable subpixel antialiasing, you might set the -# rgba property to "none". If you wish to completely disable antialiasing, you -# can set antialias to false. -# -# Please see these resources for more information on how to use fontconfig -# -# * https://wiki.archlinux.org/index.php/font_configuration#Fontconfig_configuration -# * file:///usr/share/doc/fontconfig/fontconfig-user.html -font: - normal: - family: Input Mono Narrow Light - - # Point size of the font - size: 10 - - # Offset is the extra space around each character. offset.y can be thought of - # as modifying the linespacing, and offset.x as modifying the letter spacing. - offset: - x: 0 - y: 0 - - # Glyph offset determines the locations of the glyphs within their cells with - # the default being at the bottom. Increase the x offset to move the glyph to - # the right, increase the y offset to move the glyph upward. - glyph_offset: - x: 0 - y: 0 diff --git a/bin/set-colors b/bin/set-colors index a45dded..79d6f6e 100755 --- a/bin/set-colors +++ b/bin/set-colors @@ -9,7 +9,7 @@ SCHEME_FILE="${DOTFILES}/.color-scheme" OSTYPE="$(uname -s)" install_dark() { - ln -sf "${DOTFILES}/alacritty/colors-dark.yml" "${DOTFILES}/alacritty/colors.yml" + ln -sf "${DOTFILES}/alacritty/colors-dark.toml" "${DOTFILES}/alacritty/colors.toml" ln -sf "${DOTFILES}/bat/config-dark" "${DOTFILES}/bat/config" ln -sf "${DOTFILES}/task/jdkaplan-dark.theme" "${DOTFILES}/task/color.theme" ln -sf "${DOTFILES}/vim/colors/jdkaplan-dark.vim" "${DOTFILES}/vim/colors/jdkaplan.vim" @@ -27,7 +27,7 @@ install_dark() { } install_light() { - ln -sf "${DOTFILES}/alacritty/colors-light.yml" "${DOTFILES}/alacritty/colors.yml" + ln -sf "${DOTFILES}/alacritty/colors-light.toml" "${DOTFILES}/alacritty/colors.toml" ln -sf "${DOTFILES}/bat/config-light" "${DOTFILES}/bat/config" ln -sf "${DOTFILES}/task/jdkaplan-light.theme" "${DOTFILES}/task/color.theme" ln -sf "${DOTFILES}/vim/colors/jdkaplan-light.vim" "${DOTFILES}/vim/colors/jdkaplan.vim" @@ -45,8 +45,6 @@ install_light() { } postinstall() { - "${DOTFILES}/alacritty/install" - if [ "${OSTYPE}" == 'Linux' ]; then killall --signal HUP xsettingsd fi diff --git a/darwin.conf.yaml b/darwin.conf.yaml index 809ec20..f3a8cba 100644 --- a/darwin.conf.yaml +++ b/darwin.conf.yaml @@ -6,7 +6,7 @@ quiet: false - link: - ./alacritty/os.yml: alacritty/darwin.yml + ./alacritty/os.toml: alacritty/darwin.toml ./git/config-os: git/config-darwin ./zsh/os.zshrc: zsh/darwin.zshrc ~/.config/karabiner: karabiner/ diff --git a/linux.conf.yaml b/linux.conf.yaml index ec56cdf..b307ba6 100644 --- a/linux.conf.yaml +++ b/linux.conf.yaml @@ -1,3 +1,3 @@ - link: - ./alacritty/os.yml: alacritty/linux.yml + ./alacritty/os.toml: alacritty/linux.toml ./zsh/os.zshrc: zsh/linux.zshrc