From 182cb9918352e93047d0fcc8c38048c61b3d4dfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yaroslav=20de=20la=20Pe=C3=B1a=20Smirnov?= Date: Fri, 7 Jun 2024 00:55:02 +0300 Subject: terminal: return to Alacritty I haven't actively used my trusty old X200 in more than a year, and I really did miss Alacritty's font rendering and features, namely config hot-reload. --- dotfiles/.config/alacritty/alacritty.toml | 32 ++ dotfiles/.config/alacritty/alacritty.yml | 670 ------------------------- dotfiles/.config/alacritty/ultramar-dark.toml | 34 ++ dotfiles/.config/alacritty/ultramar-light.toml | 34 ++ dotfiles/.config/mimeo/default_arguments.txt | 2 +- dotfiles/.config/qutebrowser/config.py | 4 +- dotfiles/.config/sway/config | 13 +- dotfiles/.config/zsh/.zshrc | 5 +- dotfiles/.local/bin/chcolors | 2 + dotfiles/.local/bin/ddquakemite | 2 +- dotfiles/.local/bin/menuman | 2 +- dotfiles/.local/bin/workspace | 4 +- dotfiles/.profile | 4 +- 13 files changed, 122 insertions(+), 686 deletions(-) create mode 100644 dotfiles/.config/alacritty/alacritty.toml delete mode 100644 dotfiles/.config/alacritty/alacritty.yml create mode 100644 dotfiles/.config/alacritty/ultramar-dark.toml create mode 100644 dotfiles/.config/alacritty/ultramar-light.toml diff --git a/dotfiles/.config/alacritty/alacritty.toml b/dotfiles/.config/alacritty/alacritty.toml new file mode 100644 index 0000000..f3a3f0e --- /dev/null +++ b/dotfiles/.config/alacritty/alacritty.toml @@ -0,0 +1,32 @@ +live_config_reload = true + +import = [ + "~/.config/alacritty/ultramar-dark.toml", +] + +[bell.command] +args = ["-i", "Oxygen-Sys-App-Message"] +program = "canberra-gtk-play" + +[font] +size = 9.0 + +[mouse] +hide_when_typing = true + +[scrolling] +multiplier = 10 + +[window] +blur = true +dynamic_padding = true +opacity = 0.95 +padding = { x = 2, y = 2 } + +[[hints.enabled]] +command = "xdg-open" +hyperlinks = true +post_processing = true +mouse.enabled = true +binding = { key = "O", mods = "Control|Shift" } +regex = "(ipfs:|ipns:|magnet:|mailto:|gemini://|gopher://|https://|http://|news:|file:|git://|ssh:|ftp://)[^\u0000-\u001F\u007F-\u009F<>\"\\s{-}\\^⟨⟩‘]+" diff --git a/dotfiles/.config/alacritty/alacritty.yml b/dotfiles/.config/alacritty/alacritty.yml deleted file mode 100644 index 846970a..0000000 --- a/dotfiles/.config/alacritty/alacritty.yml +++ /dev/null @@ -1,670 +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 itself. -#env: - # TERM variable - # - # 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: alacritty - -window: - # Window dimensions (changes require restart) - # - # Specified in number of columns/lines, not pixels. - # If both are `0`, this setting is ignored. - #dimensions: - # columns: 0 - # lines: 0 - - # Window position (changes require restart) - # - # Specified in number of pixels. - # If the position is not set, the window manager will handle the placement. - #position: - # x: 0 - # y: 0 - - # 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: 2 - y: 2 - - # Spread additional padding evenly around the terminal content. - dynamic_padding: true - - # Window decorations - # - # Values for `decorations`: - # - full: Borders and title bar - # - none: Neither borders nor title bar - # - # Values for `decorations` (macOS only): - # - transparent: Title bar, transparent background and title bar buttons - # - buttonless: Title bar, transparent background, but no title bar buttons - #decorations: full - - # Startup Mode (changes require restart) - # - # Values for `startup_mode`: - # - Windowed - # - Maximized - # - Fullscreen - # - # Values for `startup_mode` (macOS only): - # - SimpleFullscreen - #startup_mode: Windowed - - # Window title - #title: Alacritty - - # Allow terminal applications to change Alacritty's window title. - #dynamic_title: true - - # Window class (Linux/BSD only): - #class: - # Application instance name - #instance: Alacritty - # General application class - #general: Alacritty - - # GTK theme variant (Linux/BSD only) - # - # Override the variant of the GTK theme. Commonly supported values are `dark` and `light`. - # Set this to `None` to use the default theme variant. - #gtk_theme_variant: None - -scrolling: - # Maximum number of lines in the scrollback buffer. - # Specifying '0' will disable scrolling. - #history: 10000 - - # Scrolling distance multiplier. - multiplier: 10 - -# Font configuration -font: - # Normal (roman) font face - #normal: - # Font family - # - # Default: - # - (macOS) Menlo - # - (Linux/BSD) monospace - # - (Windows) Consolas - #family: monospace - - # The `style` can be specified to pick a specific face. - #style: Regular - - # Bold font face - #bold: - # Font family - # - # If the bold family is not specified, it will fall back to the - # value specified for the normal font. - #family: monospace - - # The `style` can be specified to pick a specific face. - #style: Bold - - # Italic font face - #italic: - # Font family - # - # If the italic family is not specified, it will fall back to the - # value specified for the normal font. - #family: monospace - - # The `style` can be specified to pick a specific face. - #style: Italic - - # Bold italic font face - #bold_italic: - # Font family - # - # If the bold italic family is not specified, it will fall back to the - # value specified for the normal font. - #family: monospace - - # The `style` can be specified to pick a specific face. - #style: Bold Italic - - # Point size - size: 10.0 - - # 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 - # y: 0 - - # Glyph offset determines the locations of the glyphs within their cells with - # the default being at the bottom. Increasing `x` moves the glyph to the right, - # increasing `y` moves the glyph upward. - #glyph_offset: - # x: 0 - # y: 0 - - # Thin stroke font rendering (macOS only) - # - # Thin strokes are suitable for retina displays, but for non-retina screens - # it is recommended to set `use_thin_strokes` to `false`. - #use_thin_strokes: true - -# If `true`, bold text is drawn using the bright color variants. -#draw_bold_text_with_bright_colors: false - -# Colors -schemes: -### Ultramar ### - ultramar_dark: &dark - primary: - background: '#151517' - foreground: '#fcf8e2' - - cursor: - cursor: '#ffffff' - - search: - matches: - foreground: '#000000' - background: '#b2872f' - - bar: - background: '#252832' - foreground: '#e5e9f0' - - normal: - black: '#33333a' - red: '#b73030' - green: '#6d974b' - yellow: '#b2872f' - blue: '#3f6e90' - magenta: '#9c6992' - cyan: '#5b8277' - white: '#b0afa8' - - bright: - black: '#676775' - red: '#c45c5c' - green: '#92b078' - yellow: '#e2b55a' - blue: '#81acc1' - magenta: '#b48ead' - cyan: '#7fac96' - white: '#faf6e5' - - ultramar_light: &light - primary: - background: '#faf6e5' - foreground: '#1b1e25' - - cursor: - cursor: '#1b1e25' - search: - matches: - foreground: '#000000' - background: '#b2872f' - - bar: - background: '#252832' - foreground: '#e5e9f0' - - normal: - black: '#151517' - red: '#b73030' - green: '#6d974b' - yellow: '#b2872f' - blue: '#3f6e90' - magenta: '#9c6992' - cyan: '#5b8277' - white: '#91908d' - - bright: - black: '#33333a' - red: '#c45c5c' - green: '#92b078' - yellow: '#e2b55a' - blue: '#75a2b8' - magenta: '#b48ead' - cyan: '#7fac96' - white: '#b0afa8' - -colors: *dark - -# Bell -# -# The bell is rung every time the BEL control character is received. -bell: - # Visual Bell Animation - # - # Animation effect for flashing the screen when the visual bell is rung. - # - # Values for `animation`: - # - Ease - # - EaseOut - # - EaseOutSine - # - EaseOutQuad - # - EaseOutCubic - # - EaseOutQuart - # - EaseOutQuint - # - EaseOutExpo - # - EaseOutCirc - # - Linear - #animation: EaseOutExpo - - # Duration of the visual bell flash. A `duration` of `0` will disable the - # visual bell animation. - #duration: 0 - - # Visual bell animation color. - #color: '#ffffff' - - # Bell Command - # - # This program is executed whenever the bell is rung. - # - # When set to `command: None`, no command will be executed. - # - command: - program: mpv - args: ["/home/yaroslav/.local/share/soundalerts/ding.ogg"] - # - #command: None - -# Background opacity -# -# 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 - -#selection: - #semantic_escape_chars: ",│`|:\"' ()[]{}<>\t" - - # When set to `true`, selected text will be copied to the primary clipboard. - #save_to_clipboard: false - -#cursor: - # Cursor style - # - # Values for `style`: - # - ▇ Block - # - _ Underline - # - | Beam - #style: Block - - # Vi mode cursor style - # - # If the vi mode cursor style is `None` or not specified, it will fall back to - # the style of the active value of the normal cursor. - # - # See `cursor.style` for available options. - #vi_mode_style: None - - # If this is `true`, the cursor will be rendered as a hollow box when the - # window is not focused. - #unfocused_hollow: true - - # Thickness of the cursor relative to the cell width as floating point number - # from `0.0` to `1.0`. - #thickness: 0.15 - -# 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. -# -# Default: -# - (macOS) /bin/bash --login -# - (Linux/BSD) user login shell -# - (Windows) powershell -#shell: -# program: /bin/bash -# args: -# - --login - -# Startup directory -# -# Directory the shell is started in. If this is unset, or `None`, the working -# directory of the parent process will be used. -#working_directory: None - -# WinPTY backend (Windows only) -# -# Alacritty defaults to using the newer ConPTY backend if it is available, -# since it resolves a lot of bugs and is quite a bit faster. If it is not -# available, the WinPTY backend will be used instead. -# -# Setting this option to `true` makes Alacritty use the legacy WinPTY backend, -# even if the ConPTY backend is available. -#winpty_backend: false - -# Send ESC (\x1b) before characters when alt is pressed. -#alt_send_esc: true - -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 } - - # If this is `true`, the cursor is temporarily hidden when typing. - hide_when_typing: true - - #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. - # - # When set to `launcher: None`, URL launching will be disabled completely. - # - # Default: - # - (macOS) open - # - (Linux/BSD) xdg-open - # - (Windows) explorer - #launcher: - # program: xdg-open - # args: [] - - # 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: None - -# Mouse bindings -# -# Mouse bindings are specified as a list of objects, much like the key -# bindings further below. -# -# To trigger mouse bindings when an application running within Alacritty captures the mouse, the -# `Shift` modifier is automatically added as a requirement. -# -# Each mouse binding will specify a: -# -# - `mouse`: -# -# - Middle -# - Left -# - Right -# - Numeric identifier such as `5` -# -# - `action` (see key bindings) -# -# And optionally: -# -# - `mods` (see key bindings) -#mouse_bindings: -# - { mouse: Middle, action: PasteSelection } - -# Key bindings -# -# Key bindings are specified as a list of objects. For example, this is the -# default paste binding: -# -# `- { key: V, mods: Control|Shift, action: Paste }` -# -# Each key binding will specify a: -# -# - `key`: Identifier of the key pressed -# -# - A-Z -# - F1-F24 -# - Key0-Key9 -# -# A full list with available key codes can be found here: -# https://docs.rs/glutin/*/glutin/event/enum.VirtualKeyCode.html#variants -# -# 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`. -# -# Then exactly one of: -# -# - `chars`: Send a byte sequence to the running application -# -# 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. -# -# - `action`: Execute a predefined action -# -# - ToggleViMode -# - SearchForward -# - SearchBackward -# - Copy -# - Paste -# - PasteSelection -# - IncreaseFontSize -# - DecreaseFontSize -# - ResetFontSize -# - ScrollPageUp -# - ScrollPageDown -# - ScrollHalfPageUp -# - ScrollHalfPageDown -# - ScrollLineUp -# - ScrollLineDown -# - ScrollToTop -# - ScrollToBottom -# - ClearHistory -# - Hide -# - Minimize -# - Quit -# - ToggleFullscreen -# - SpawnNewInstance -# - ClearLogNotice -# - ClearSelection -# - ReceiveChar -# - None -# -# (`mode: Vi` only): -# - Open -# - Up -# - Down -# - Left -# - Right -# - First -# - Last -# - FirstOccupied -# - High -# - Middle -# - Low -# - SemanticLeft -# - SemanticRight -# - SemanticLeftEnd -# - SemanticRightEnd -# - WordRight -# - WordLeft -# - WordRightEnd -# - WordLeftEnd -# - Bracket -# - ToggleNormalSelection -# - ToggleLineSelection -# - ToggleBlockSelection -# - ToggleSemanticSelection -# - SearchNext -# - SearchPrevious -# - SearchStart -# - SearchEnd -# -# (macOS only): -# - ToggleSimpleFullscreen: Enters fullscreen without occupying another space -# -# (Linux/BSD only): -# - CopySelection: Copies into selection buffer -# -# - `command`: Fork and execute a specified command plus arguments -# -# The `command` field must be a map containing a `program` string and an -# `args` array of command line parameter strings. For example: -# `{ program: "alacritty", args: ["-e", "vttest"] }` -# -# And optionally: -# -# - `mods`: Key modifiers to filter binding actions -# -# - Command -# - Control -# - Option -# - Super -# - Shift -# - Alt -# -# Multiple `mods` can be combined using `|` like this: -# `mods: Control|Shift`. -# Whitespace and capitalization are relevant and must match the example. -# -# - `mode`: Indicate a binding for only specific terminal reported modes -# -# This is mainly used to send applications the correct escape sequences -# when in different modes. -# -# - AppCursor -# - AppKeypad -# - Alt -# -# A `~` operator can be used before a mode to apply the binding whenever -# the mode is *not* active, e.g. `~Alt`. -# -# Bindings are always filled by default, but will be replaced when a new -# binding with the same triggers is defined. To unset a default binding, it can -# be mapped to the `ReceiveChar` action. Alternatively, you can use `None` for -# a no-op if you do not wish to receive input characters for that binding. -# -# If the same trigger is assigned to multiple actions, all of them are executed -# in the order they were defined in. -#key_bindings: - #- { key: Paste, action: Paste } - #- { key: Copy, action: Copy } - #- { key: L, mods: Control, action: ClearLogNotice } - #- { key: L, mods: Control, mode: ~Vi, chars: "\x0c" } - #- { key: PageUp, mods: Shift, mode: ~Alt, action: ScrollPageUp, } - #- { key: PageDown, mods: Shift, mode: ~Alt, action: ScrollPageDown } - #- { key: Home, mods: Shift, mode: ~Alt, action: ScrollToTop, } - #- { key: End, mods: Shift, mode: ~Alt, action: ScrollToBottom } - - # Vi Mode - #- { key: Space, mods: Shift|Control, mode: Vi, action: ScrollToBottom } - #- { key: Space, mods: Shift|Control, action: ToggleViMode } - #- { key: Escape, mode: Vi, action: ClearSelection } - #- { key: I, mode: Vi, action: ScrollToBottom } - #- { key: I, mode: Vi, action: ToggleViMode } - #- { key: Y, mods: Control, mode: Vi, action: ScrollLineUp } - #- { key: E, mods: Control, mode: Vi, action: ScrollLineDown } - #- { key: G, mode: Vi, action: ScrollToTop } - #- { key: G, mods: Shift, mode: Vi, action: ScrollToBottom } - #- { key: B, mods: Control, mode: Vi, action: ScrollPageUp } - #- { key: F, mods: Control, mode: Vi, action: ScrollPageDown } - #- { key: U, mods: Control, mode: Vi, action: ScrollHalfPageUp } - #- { key: D, mods: Control, mode: Vi, action: ScrollHalfPageDown } - #- { key: Y, mode: Vi, action: Copy } - #- { key: Y, mode: Vi, action: ClearSelection } - #- { key: Copy, mode: Vi, action: ClearSelection } - #- { key: V, mode: Vi, action: ToggleNormalSelection } - #- { key: V, mods: Shift, mode: Vi, action: ToggleLineSelection } - #- { key: V, mods: Control, mode: Vi, action: ToggleBlockSelection } - #- { key: V, mods: Alt, mode: Vi, action: ToggleSemanticSelection } - #- { key: Return, mode: Vi, action: Open } - #- { key: K, mode: Vi, action: Up } - #- { key: J, mode: Vi, action: Down } - #- { key: H, mode: Vi, action: Left } - #- { key: L, mode: Vi, action: Right } - #- { key: Up, mode: Vi, action: Up } - #- { key: Down, mode: Vi, action: Down } - #- { key: Left, mode: Vi, action: Left } - #- { key: Right, mode: Vi, action: Right } - #- { key: Key0, mode: Vi, action: First } - #- { key: Key4, mods: Shift, mode: Vi, action: Last } - #- { key: Key6, mods: Shift, mode: Vi, action: FirstOccupied } - #- { key: H, mods: Shift, mode: Vi, action: High } - #- { key: M, mods: Shift, mode: Vi, action: Middle } - #- { key: L, mods: Shift, mode: Vi, action: Low } - #- { key: B, mode: Vi, action: SemanticLeft } - #- { key: W, mode: Vi, action: SemanticRight } - #- { key: E, mode: Vi, action: SemanticRightEnd } - #- { key: B, mods: Shift, mode: Vi, action: WordLeft } - #- { key: W, mods: Shift, mode: Vi, action: WordRight } - #- { key: E, mods: Shift, mode: Vi, action: WordRightEnd } - #- { key: Key5, mods: Shift, mode: Vi, action: Bracket } - #- { key: Slash, mode: Vi, action: SearchForward } - #- { key: Slash, mods: Shift, mode: Vi, action: SearchBackward } - #- { key: N, mode: Vi, action: SearchNext } - #- { key: N, mods: Shift, mode: Vi, action: SearchPrevious } - - # (Windows, Linux, and BSD only) - #- { key: V, mods: Control|Shift, action: Paste } - #- { key: C, mods: Control|Shift, action: Copy } - #- { key: F, mods: Control|Shift, action: SearchForward } - #- { key: B, mods: Control|Shift, action: SearchBackward } - #- { key: C, mods: Control|Shift, mode: Vi, action: ClearSelection } - #- { key: Insert, mods: Shift, action: PasteSelection } - #- { key: Key0, mods: Control, action: ResetFontSize } - #- { key: Equals, mods: Control, action: IncreaseFontSize } - #- { key: Add, mods: Control, action: IncreaseFontSize } - #- { key: Subtract, mods: Control, action: DecreaseFontSize } - #- { key: Minus, mods: Control, action: DecreaseFontSize } - - # (Windows only) - #- { key: Return, mods: Alt, action: ToggleFullscreen } - - # (macOS only) - #- { key: K, mods: Command, mode: ~Vi, chars: "\x0c" } - #- { key: Key0, mods: Command, action: ResetFontSize } - #- { key: Equals, mods: Command, action: IncreaseFontSize } - #- { key: Add, mods: Command, action: IncreaseFontSize } - #- { key: Minus, mods: Command, action: DecreaseFontSize } - #- { key: K, mods: Command, action: ClearHistory } - #- { key: V, mods: Command, action: Paste } - #- { key: C, mods: Command, action: Copy } - #- { key: C, mods: Command, mode: Vi, action: ClearSelection } - #- { key: H, mods: Command, action: Hide } - #- { key: M, mods: Command, action: Minimize } - #- { key: Q, mods: Command, action: Quit } - #- { key: W, mods: Command, action: Quit } - #- { key: N, mods: Command, action: SpawnNewInstance } - #- { key: F, mods: Command|Control, action: ToggleFullscreen } - #- { key: F, mods: Command, action: SearchForward } - #- { key: B, mods: Command, action: SearchBackward } - -#debug: - # Display the time it takes to redraw each frame. - #render_timer: false - - # Keep the log file after quitting Alacritty. - #persistent_logging: false - - # Log level - # - # Values for `log_level`: - # - None - # - Error - # - Warn - # - Info - # - Debug - # - Trace - #log_level: Warn - - # Print all received window events. - #print_events: false - diff --git a/dotfiles/.config/alacritty/ultramar-dark.toml b/dotfiles/.config/alacritty/ultramar-dark.toml new file mode 100644 index 0000000..cd2ac69 --- /dev/null +++ b/dotfiles/.config/alacritty/ultramar-dark.toml @@ -0,0 +1,34 @@ +[colors.primary] +background = "#151517" +foreground = "#fcf8e2" + +[colors.bright] +black = "#676775" +blue = "#81acc1" +cyan = "#7fac96" +green = "#92b078" +magenta = "#b48ead" +red = "#c45c5c" +white = "#faf6e5" +yellow = "#e2b55a" + +[colors.cursor] +cursor = "#ffffff" + +[colors.normal] +black = "#33333a" +blue = "#3f6e90" +cyan = "#5b8277" +green = "#6d974b" +magenta = "#9c6992" +red = "#b73030" +white = "#b0afa8" +yellow = "#b2872f" + +[colors.footer_bar] +background = "#252832" +foreground = "#e5e9f0" + +[colors.search.matches] +background = "#b2872f" +foreground = "#000000" diff --git a/dotfiles/.config/alacritty/ultramar-light.toml b/dotfiles/.config/alacritty/ultramar-light.toml new file mode 100644 index 0000000..b93e837 --- /dev/null +++ b/dotfiles/.config/alacritty/ultramar-light.toml @@ -0,0 +1,34 @@ +[colors.primary] +background = "#faf6e5" +foreground = "#1b1e25" + +[colors.bright] +black = "#33333a" +blue = "#75a2b8" +cyan = "#7fac96" +green = "#92b078" +magenta = "#b48ead" +red = "#c45c5c" +white = "#b0afa8" +yellow = "#e2b55a" + +[colors.cursor] +cursor = "#1b1e25" + +[colors.normal] +black = "#151517" +blue = "#3f6e90" +cyan = "#5b8277" +green = "#6d974b" +magenta = "#9c6992" +red = "#b73030" +white = "#91908d" +yellow = "#b2872f" + +[colors.footer_bar] +background = "#e5e9f0" +foreground = "#252832" + +[colors.search.matches] +background = "#b2872f" +foreground = "#000000" diff --git a/dotfiles/.config/mimeo/default_arguments.txt b/dotfiles/.config/mimeo/default_arguments.txt index 9859621..009325f 100644 --- a/dotfiles/.config/mimeo/default_arguments.txt +++ b/dotfiles/.config/mimeo/default_arguments.txt @@ -1 +1 @@ ---quiet --term "foot %s" +--quiet --term "alacritty -e %s" diff --git a/dotfiles/.config/qutebrowser/config.py b/dotfiles/.config/qutebrowser/config.py index bcf1139..4990cea 100644 --- a/dotfiles/.config/qutebrowser/config.py +++ b/dotfiles/.config/qutebrowser/config.py @@ -28,7 +28,7 @@ ultramar = { 'green': '#6d974b' } -c.editor.command = [ "foot", "nvim", "{file}", "+normal {line}G{column0}l", ] +c.editor.command = [ "alacritty", "-e", "nvim", "{file}", "+normal {line}G{column0}l", ] ## Notifications for websites are retarded @@ -80,7 +80,7 @@ c.url.start_pages = "https://takeoff.mriya.space/" c.fonts.default_size = "10pt" ## Prefer dark mode in websites that support it -c.colors.webpage.preferred_color_scheme = "auto" +c.colors.webpage.preferred_color_scheme = "dark" ## Background color of the completion widget category headers. ## Type: QssColor diff --git a/dotfiles/.config/sway/config b/dotfiles/.config/sway/config index cb3623e..89d5b58 100644 --- a/dotfiles/.config/sway/config +++ b/dotfiles/.config/sway/config @@ -5,7 +5,8 @@ # Set mod key (Mod1=, Mod4=) set $mod Mod4 set $alt Mod1 -set $term foot +# For some reason using an env var breaks command shortcuts +set $term alacritty set $browser `$BROWSER` # set default desktop layout (default is tiling) @@ -134,7 +135,7 @@ seat * hide_cursor when-typing enable # Tex Shinobi Trackpoint input 1241:1031:USB-HID_Keyboard_Mouse { accel_profile adaptive - pointer_accel -0.3 + pointer_accel -0.5 middle_emulation enabled } @@ -210,7 +211,7 @@ bindsym --to-code { $mod+Shift+n exec networkmanager_dmenu $mod+Shift+c exec rofi -show calc -modi calc -no-show-match -no-sort $mod+grave exec rofi -show moji -modi "moji:rofimoji" - $mod+Shift+m exec $term -T "ncpamixer" 'ncpamixer' + $mod+Shift+m exec $term -T "ncpamixer" -e ncpamixer $mod+Ctrl+m exec rofi -show audio -modi "audio:rofiaudio" $mod+Shift+e exec rofi -show session -matching prefix -modi "session:rofisession" @@ -218,9 +219,9 @@ bindsym --to-code { $mod+s exec $browser $mod+t exec toggletorrent $mod+Ctrl+t exec launch-transmission - $mod+m exec $term ncmpcpp - $mod+n exec $term -T "newsboat" newsboat && killall -42 waybar - $mod+a exec $term -T "neomutt" neomutt + $mod+m exec $term -e ncmpcpp + $mod+n exec $term -T "newsboat" -e newsboat && killall -42 waybar + $mod+a exec $term -T "neomutt" -e neomutt $mod+c exec camtoggle # Password manager diff --git a/dotfiles/.config/zsh/.zshrc b/dotfiles/.config/zsh/.zshrc index 99ab1d1..0509006 100644 --- a/dotfiles/.config/zsh/.zshrc +++ b/dotfiles/.config/zsh/.zshrc @@ -76,9 +76,10 @@ zle -N zle-keymap-select [ -f "$HOME/.config/zsh/shortcuts" ] && . "$HOME/.config/zsh/shortcuts" if [ -f "$HOME/.cache/colorscheme" ]; then - trap "source $HOME/.cache/colorscheme && shtheme ultramar-\$COLORSCHEME" SIGUSR1 + # trap "source $HOME/.cache/colorscheme && shtheme ultramar-\$COLORSCHEME" SIGUSR1 + trap "source $HOME/.cache/colorscheme" SIGUSR1 source $HOME/.cache/colorscheme - shtheme ultramar-$COLORSCHEME + # shtheme ultramar-$COLORSCHEME fi if [ -f /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh ] diff --git a/dotfiles/.local/bin/chcolors b/dotfiles/.local/bin/chcolors index 30b520a..f4bdf6b 100755 --- a/dotfiles/.local/bin/chcolors +++ b/dotfiles/.local/bin/chcolors @@ -16,4 +16,6 @@ case $COLORSCHEME in esac echo "export COLORSCHEME=$COLORSCHEME" > $HOME/.cache/colorscheme +sed -i -r --follow-symlinks "s/(light|dark)/$COLORSCHEME/g" $HOME/.config/alacritty/alacritty.toml pkill -SIGUSR1 zsh +pkill -SIGUSR1 nvim diff --git a/dotfiles/.local/bin/ddquakemite b/dotfiles/.local/bin/ddquakemite index 4e1288f..b8df9b4 100755 --- a/dotfiles/.local/bin/ddquakemite +++ b/dotfiles/.local/bin/ddquakemite @@ -34,7 +34,7 @@ if [ "$ddstatus" = "-" ]; then elif [ "$ddstatus" = "+" ]; then swaymsg '[title="ddterminal"] move scratchpad' else - $TERMINAL -T "ddterminal" -o "locked-title=true" zsh -ic "tmuxatt" & + $TERMINAL -T "ddterminal" -e zsh -ic "tmuxatt" & sleep 0.2s reposition fi diff --git a/dotfiles/.local/bin/menuman b/dotfiles/.local/bin/menuman index 26c9bfc..62d3234 100755 --- a/dotfiles/.local/bin/menuman +++ b/dotfiles/.local/bin/menuman @@ -61,4 +61,4 @@ if [ ! -z "$isterminal" ]; then man "$chosen" && exit fi -$TERMINAL $SHELL -ic "man \"$chosen\"" +$TERMINAL -e $SHELL -ic "man \"$chosen\"" diff --git a/dotfiles/.local/bin/workspace b/dotfiles/.local/bin/workspace index c41275f..972d97d 100755 --- a/dotfiles/.local/bin/workspace +++ b/dotfiles/.local/bin/workspace @@ -37,8 +37,8 @@ if [ $displayw -lt 2560 ]; then fi cd "$1" -setsid $TERMINAL -a "$TERMINAL lf:$1" zsh -ic "lfcd" >/dev/null 2>&1 & sleep 0.1 -setsid $TERMINAL -a "$TERMINAL edit:$1" >/dev/null 2>&1 & sleep 0.1 +setsid $TERMINAL --class "$TERMINAL lf:$1" -e zsh -ic "lfcd" >/dev/null 2>&1 & sleep 0.1 +setsid $TERMINAL --class "$TERMINAL edit:$1" >/dev/null 2>&1 & sleep 0.1 sleep 0.2 swaymsg "[app_id=\"$TERMINAL lf:$1\"] focus; resize set width ${sidebarw}ppt; split v" diff --git a/dotfiles/.profile b/dotfiles/.profile index 673ab4e..a675b1a 100644 --- a/dotfiles/.profile +++ b/dotfiles/.profile @@ -10,6 +10,8 @@ export QT_WAYLAND_DISABLE_WINDOWDECORATION=0 export QT_QPA_PLATFORMTHEME="qt5ct" export _JAVA_AWT_WM_NONREPARENTING=1 export MOZ_ENABLE_WAYLAND=1 +# Fixes Qt's webview scaling +export QT_SCALE_FACTOR_ROUNDING_POLICY=RoundPreferFloor # Input method export GTK_IM_MODULE=fcitx @@ -19,7 +21,7 @@ export XMODIFIERS='@im=fcitx' # User-specific environment and startup programs: export LANG=en_US.UTF-8 -export TERMINAL=foot +export TERMINAL=alacritty export EDITOR="nvim" export PAGER="less -R -j.5" export MANPAGER='nvim +Man!' -- cgit v1.2.3