From 9cb007dc326000d63446f471adc01216e850a74b Mon Sep 17 00:00:00 2001 From: Dustin Swan Date: Thu, 3 Jan 2019 17:24:10 -0500 Subject: [PATCH] Updating alacritty's config format, some polybar updates --- alacritty.yml | 426 +++++++++++++++++++++++++++++++++----------------- polybar | 28 ++-- 2 files changed, 298 insertions(+), 156 deletions(-) diff --git a/alacritty.yml b/alacritty.yml index aeee4bb..e29093c 100644 --- a/alacritty.yml +++ b/alacritty.yml @@ -1,89 +1,141 @@ -# Configuration for Alacritty, the GPU enhanced terminal emulator +# 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. +# set by alacritty itself. +#env: + # TERM variable # - # 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 + # This value is used to set the `$TERM` environment variable for + # each instance of Alacritty. If it is not present, alacritty will + # check the local terminfo database and use 'alacritty' if it is + # available, otherwise 'xterm-256color' is used. + #TERM: xterm-256color window: - # Window dimensions in character columns and lines - # (changes require restart) + # Window dimensions (changes require restart) + # + # Specified in number of columns/lines, not pixels. + # If both are `0`, this setting is ignored. 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) + # Window padding (changes require restart) + # + # Blank space added around the window in pixels. This padding is scaled + # by DPI and the specified value is always added at both opposing sides. padding: x: 12 y: 12 + # Spread additional padding evenly around the terminal content. + dynamic_padding: false + # Window decorations - # Setting this to false will result in window without borders and title bar. - decorations: true + # + # Values for `decorations`: + # - full: Borders and title bar + # - none: Neither borders nor title bar + decorations: full -# Display tabs using this many cells (changes require restart) -tabspaces: 8 + # When true, alacritty starts maximized. + start_maximized: false -# When true, bold text is drawn using the bright variant of colors. -draw_bold_text_with_bright_colors: true +scrolling: + # Maximum number of lines in the scrollback buffer. + # Specifying '0' will disable scrolling. + history: 10000 + + # Number of lines the viewport will move for every line scrolled when + # scrollback is enabled (history > 0). + multiplier: 3 + + # Faux Scrolling + # + # The `faux_multiplier` 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`. + # + # Specifying `0` will disable faux scrolling. + faux_multiplier: 3 + + # Scroll to the bottom when new text is written to the terminal. + auto_scroll: false + +# Spaces per Tab (changes require restart) +# +# This setting defines the width of a tab in cells. +# +# Some applications, like Emacs, rely on knowing about the width of a tab. +# To prevent unexpected behavior in these applications, it's also required to +# change the `it` value in terminfo when altering this setting. +tabspaces: 8 # 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: - # The normal (roman) font face to use. + # Normal (roman) font face normal: + # family: monospace family: Iosevka Nerd Font - # Style can be specified to pick a specific face. - style: Regular + # The `style` can be specified to pick a specific face. + #style: Regular - # The bold font face + # Bold font face bold: + # family: monospace family: Iosevka Nerd Font - # Style can be specified to pick a specific face. - style: Bold + # The `style` can be specified to pick a specific face. + #style: Bold - # The italic font face + # Italic font face italic: + # family: monospace family: Iosevka Nerd Font - # Style can be specified to pick a specific face. - style: Italic + # The `style` can be specified to pick a specific face. + #style: Italic - # Point size of the font + # Point size + # size: 11.0 size: 8.0 - # 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 is the extra space around each character. `offset.y` can be thought of + # as modifying the line spacing, and `offset.x` as modifying the letter spacing. offset: - x: 0.0 - y: 0.0 + 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. + # the default being at the bottom. Increasing `x` moves the glyph to the right, + # increasing `y` moves the glyph upwards. glyph_offset: - x: 0.0 - y: 0.0 - - # OS X only: use thin stroke font rendering. Thin strokes are suitable - # for retina displays, but for non-retina you probably want this set to - # false. - use_thin_strokes: true + x: 0 + y: 0 -# Should display the render timer +# Display the time it takes to redraw each frame. 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 +# Keep the log file after quitting Alacritty. +persistent_logging: false + +# If `true`, bold text is drawn using the bright color variants. +draw_bold_text_with_bright_colors: true # Colors (Tomorrow Night Bright) colors: @@ -92,10 +144,21 @@ colors: background: '0x000000' foreground: '0xeaeaea' - # Colors the cursor will use if `custom_cursor_colors` is true - cursor: - text: '0x000000' - cursor: '0xffffff' + # Bright and dim foreground colors + # + # The dimmed foreground color is calculated automatically if it is not present. + # If the bright foreground color is not set, or `draw_bold_text_with_bright_colors` + # is `false`, the normal foreground color will be used. + #dim_foreground: '0x9a9a9a' + #bright_foreground: '0xffffff' + + # Cursor colors + # + # Colors which should be used to draw the terminal cursor. If these are unset, + # the cursor color will be the inverse of the cell color. + #cursor: + # text: '0x000000' + # cursor: '0xffffff' # Normal colors normal: @@ -119,7 +182,10 @@ colors: cyan: '0x54ced6' white: '0xffffff' - # Dim colors (Optional) + # Dim colors + # + # If the dim colors are not set, they will be calculated automatically based + # on the `normal` colors. dim: black: '0x333333' red: '0xf2777a' @@ -130,6 +196,12 @@ colors: cyan: '0x66cccc' white: '0xdddddd' + # Indexed Colors + # + # The indexed colors include all colors from 16 to 256. + # When these are not set, they're filled with sensible defaults. + #indexed_colors: + # - { index: 16, color: '0x000000' } # Visual Bell # @@ -139,42 +211,45 @@ colors: # 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. +# Values for `animation`: +# - Ease +# - EaseOut +# - EaseOutSine +# - EaseOutQuad +# - EaseOutCubic +# - EaseOutQuart +# - EaseOutQuint +# - EaseOutExpo +# - EaseOutCirc +# - Linear # +# Specifying a `duration` of `0` will disable the visual bell. visual_bell: animation: EaseOutExpo duration: 0 + color: '0xffffff' # Background opacity -background_opacity: 0.9 +# +# Window opacity as a floating point number from `0.0` to `1.0`. +# The value `0.0` is completely transparent and `1.0` is opaque. +background_opacity: 1.0 # Mouse bindings # -# Currently doesn't support modifiers. Both the `mouse` and `action` fields must -# be specified. +# Available fields: +# - mouse +# - action +# - mods (optional) # # Values for `mouse`: -# - Middle -# - Left -# - Right -# - Numeric identifier such as `5` +# - Middle +# - Left +# - Right +# - Numeric identifier such as `5` # -# Values for `action`: -# - Paste -# - PasteSelection -# - Copy (TODO) +# All available `mods` and `action` values are documented in the key binding +# section. mouse_bindings: - { mouse: Middle, action: PasteSelection } @@ -187,91 +262,152 @@ mouse: 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 + # If this is `true`, the cursor is temporarily hidden when typing. + hide_when_typing: false + + url: + # URL launcher + # + # This program is executed when clicking on a text which is recognized as a URL. + # The URL is always added to the command as the last parameter. + launcher: xdg-open + + # URL modifiers + # + # These are the modifiers that need to be held down for opening URLs when clicking + # on them. The available modifiers are documented in the key binding section. + #modifiers: Control|Shift selection: semantic_escape_chars: ",│`|:\"' ()[]{}<>" + # When set to `true`, selected text will be copied to both the primary and + # the selection clipboard. Otherwise, it will only be copied to the selection + # clipboard. + save_to_clipboard: false + dynamic_title: true -hide_cursor_when_typing: false +cursor: + # Cursor style + # + # Values for 'style': + # - ▇ Block + # - _ Underline + # - | Beam + style: Block -# Style of the cursor -# -# Values for 'cursor_style': -# - Block -# - Underline -# - Beam -cursor_style: Block + # If this is `true`, the cursor will be rendered as a hollow box when the + # window is not focused. + unfocused_hollow: true # 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 +# 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. +# Key bindings are specified as a list of objects. Each binding will specify +# a key and modifiers required to trigger it, terminal modes where the binding +# is applicable, and what should be done when the key binding fires. It can +# either send a byte sequnce to the running application (`chars`), execute +# a predefined action (`action`) or fork and execute a specified command plus +# arguments (`command`). +# +# Example: +# `- { key: V, mods: Command, action: Paste }` +# +# Available fields: +# - key +# - mods (optional) +# - chars | action | command (exactly one required) +# - mode (optional) # -# A list with all available `key` names can be found here: -# https://docs.rs/glutin/*/glutin/enum.VirtualKeyCode.html#variants +# Values for `key`: +# - `A` -> `Z` +# - `F1` -> `F12` +# - `Key1` -> `Key0` # -# 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 +# A full list with available key codes can be found here: +# https://docs.rs/glutin/*/glutin/enum.VirtualKeyCode.html#variants # -# mods may be combined with a `|`. For example, requiring control and shift -# looks like: +# Instead of using the name of the keys, the `key` field also supports using +# the scancode of the desired key. Scancodes have to be specified as a +# decimal number. +# This command will allow you to display the hex scancodes for certain keys: +# `showkey --scancodes` +# +# Values for `mods`: +# - Command +# - Control +# - Shift +# - Alt +# +# Multiple `mods` can be combined using `|` like this: `mods: Control|Shift`. +# Whitespace and capitalization is relevant and must match the example. +# +# Values for `chars`: +# The `chars` field writes the specified string to the terminal. This makes +# it possible to pass escape sequences. +# To find escape codes for bindings like `PageUp` ("\x1b[5~"), you can run +# the command `showkey -a` outside of tmux. +# Note that applications use terminfo to map escape sequences back to +# keys. It is therefore required to update the terminfo when +# changing an escape sequence. +# +# Values for `action`: +# - Paste +# - PasteSelection +# - Copy +# - IncreaseFontSize +# - DecreaseFontSize +# - ResetFontSize +# - ScrollPageUp +# - ScrollPageDown +# - ScrollToTop +# - ScrollToBottom +# - ClearHistory +# - Hide +# - Quit +# - ClearLogNotice # -# mods: Control|Shift +# Values for `command`: +# The `command` field must be a map containing a `program` string and +# an `args` array of command line parameter strings. # -# The parser is currently quite sensitive to whitespace and capitalization - -# capitalization must match exactly, and piped items must not have whitespace -# around them. +# Example: +# `command: { program: "alacritty", args: ["-e", "vttest"] }` # -# 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"] } } +# Values for `mode`: +# - ~AppCursor +# - AppCursor +# - ~AppKeypad +# - AppKeypad key_bindings: - - { key: V, mods: Command, action: Paste } - - { key: C, mods: Command, action: Copy } + - { key: V, mods: Control|Shift, action: Paste } + - { key: C, mods: Control|Shift, action: Copy } + - { key: Paste, action: Paste } + - { key: Copy, 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: Subtract, mods: Control, action: DecreaseFontSize } + - { key: L, mods: Control, action: ClearLogNotice } + - { key: L, mods: Control, chars: "\x0c" } - { 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: Key0, mods: Command, action: ResetFontSize } - - { key: Equals, mods: Command, action: IncreaseFontSize } - - { key: Minus, mods: Command, action: DecreaseFontSize } - { key: PageUp, mods: Shift, chars: "\x1b[5;2~" } - { key: PageUp, mods: Control, chars: "\x1b[5;5~" } - { key: PageUp, chars: "\x1b[5~" } @@ -351,15 +487,15 @@ key_bindings: - { 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: Command, chars: "\x1b[1;3P" } - - { key: F2, mods: Command, chars: "\x1b[1;3Q" } - - { key: F3, mods: Command, chars: "\x1b[1;3R" } - - { key: F4, mods: Command, chars: "\x1b[1;3S" } - - { key: F5, mods: Command, chars: "\x1b[15;3~" } - - { key: F6, mods: Command, chars: "\x1b[17;3~" } - - { key: F7, mods: Command, chars: "\x1b[18;3~" } - - { key: F8, mods: Command, chars: "\x1b[19;3~" } - - { key: F9, mods: Command, chars: "\x1b[20;3~" } - - { key: F10, mods: Command, chars: "\x1b[21;3~" } - - { key: F11, mods: Command, chars: "\x1b[23;3~" } - - { key: F12, mods: Command, chars: "\x1b[24;3~" } + - { 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/polybar b/polybar index 427e77b..0803fe0 100644 --- a/polybar +++ b/polybar @@ -14,11 +14,16 @@ padding-right = 3 module-margin = 2 font-0 = Iosevka Nerd Font:size=8; -font-1 = Iosevka Nerd Font:size=10; +font-1 = Iosevka Nerd Font:size=9; +font-2 = Iosevka Nerd Font:size=11; modules-left = i3 mpd modules-right = backlight temperature cpu memory volume wireless-network wired-network battery date powermenu +tray-position = right +tray-scale = 0.9 +tray-padding = 5 + [module/backlight] type = internal/xbacklight format = @@ -73,15 +78,15 @@ animation-charging-framerate = 750 [module/i3] type = internal/i3 -ws-icon-0 = 1; -ws-icon-1 = 2; -ws-icon-2 = 3; -ws-icon-3 = 4; -ws-icon-4 = 5; -ws-icon-5 = 6; -ws-icon-6 = 7; -ws-icon-7 = 8; -ws-icon-default =  +ws-icon-0 = 1;%{T3}%{T-} +ws-icon-1 = 2;%{T3}爵%{T-} +ws-icon-2 = 3;%{T3}%{T-} +ws-icon-3 = 4;%{T2}%{T-} +ws-icon-4 = 5;%{T2}%{T-} +ws-icon-5 = 6;%{T3}%{T-} +ws-icon-6 = 7;%{T3}%{T-} +ws-icon-7 = 8;%{T2}%{T-} +ws-icon-default = %{T2}%{T-} format = @@ -219,7 +224,7 @@ format-muted = label-muted = %{T2}ﱛ %{T-} muted label-muted-foreground = #999 -ramp-volume-font = 2 +ramp-volume-font = 3 ramp-volume-0 = 奄 ramp-volume-1 = 奔 ramp-volume-2 = 墳 @@ -271,6 +276,7 @@ menu-2-1-exec = menu_open-0 [module/temperature] type = internal/temperature format =