From 69fa862744473498be89685db35fddb4eff577c3 Mon Sep 17 00:00:00 2001 From: "Adam T. Carpenter" Date: Fri, 15 Sep 2023 17:42:27 -0400 Subject: feat: update sway config, theming gtk and alacritty, sans serif font --- .config/alacritty/alacritty.yml | 522 ++-------------------------------------- .config/fontconfig/fonts.conf | 2 +- .config/gtk-3.0/settings.ini | 2 +- .config/mpv/mpv.conf | 1 + .config/sway/config | 65 +++-- 5 files changed, 51 insertions(+), 541 deletions(-) diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml index cb0a960..248daee 100644 --- a/.config/alacritty/alacritty.yml +++ b/.config/alacritty/alacritty.yml @@ -1,519 +1,39 @@ -# 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: xterm-256color - window: - # Window dimensions (changes require restart) - # - # Specified in number of columns/lines, not pixels. - # If both are `0`, this setting is ignored. - #dimensions: - #columns: 24 - #lines: 80 - - # 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: 0 - # y: 0 - - # Spread additional padding evenly around the terminal content. - #dynamic_padding: false - - # 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 - - # 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: dark - -#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 - - # 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: 4 - -# Font configuration + opacity: 0.9 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: 13 - - # 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 upwards. - #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` - # - # macOS >= 10.14.x: - # - # If the font quality on non-retina display looks bad then set - # `use_thin_strokes` to `true` and enable font smoothing by running the - # following command: - # `defaults write -g CGFontRenderingFontSmoothingDisabled -bool NO` - # - # This is a global setting and will require a log out or restart to take - # effect. - #use_thin_strokes: true - -# If `true`, bold text is drawn using the bright color variants. -#draw_bold_text_with_bright_colors: true - colors: - # Default colors primary: - background: '0x142436' - foreground: '0xffffff' - - # Normal colors + background: '#060A06' + foreground: '#faffff' normal: - black: '0x687580' - red: '0xfe8282' - green: '0x3d7d84' - yellow: '0xe6bc8e' - blue: '0x2d4e76' - magenta: '0x616d8e' - cyan: '0x3f938d' - white: '0x93a1a1' - - # Bright colors + black: '#060A06' + red: '#876E5A' + green: '#6F8A41' + yellow: '#919962' + blue: '#587291' + magenta: '#9EA09F' + cyan: '#728AA5' + white: '#d1d5d9' bright: - black: '0x687580' - red: '0xfe8282' - green: '0x3d7d84' - yellow: '0xe6bc8e' - blue: '0x2d4e76' - magenta: '0x616d8e' - cyan: '0x3f938d' - white: '0x93a1a1' - -# 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. -# -# 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 -# -# 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: 0.85 - -#selection: - #semantic_escape_chars: ",│`|:\"' ()[]{}<>\t" - - # When set to `true`, selected text will be copied to the primary clipboard. - #save_to_clipboard: false - -# Allow terminal applications to change Alacritty's window title. -#dynamic_title: true - + black: '#172a17' + red: '#be8d66' + green: '#93c047' + yellow: '#c8d76f' + blue: '#6392cb' + magenta: '#b8e4ce' + cyan: '#82b2e8' + white: '#faffff' cursor: - # Cursor style - # - # Values for `style`: - # - ▇ Block - # - _ Underline - # - | Beam 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) + text: '#060A06' + cursor: '#d1d5d9' 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 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 - -#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 - - # Record all characters and escape sequences as test data. - #ref_test: false - 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: 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. - # - # When set to `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. -# -# 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 -# -# - Copy -# - Paste -# - PasteSelection -# - IncreaseFontSize -# - DecreaseFontSize -# - ResetFontSize -# - ScrollPageUp -# - ScrollPageDown -# - ScrollLineUp -# - ScrollLineDown -# - ScrollToTop -# - ScrollToBottom -# - ClearHistory -# - Hide -# - Minimize -# - Quit -# - ToggleFullscreen -# - SpawnNewInstance -# - ClearLogNotice -# - ReceiveChar -# - None -# -# (macOS only): -# - ToggleSimpleFullscreen: Enters fullscreen without occupying another space -# -# - `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. -#key_bindings: - # (Windows, Linux, and BSD only) - #- { key: V, mods: Control|Shift, action: Paste } - #- { key: C, mods: Control|Shift, action: Copy } - #- { 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: 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: K, mods: Command, chars: "\x0c" } - #- { key: V, mods: Command, action: Paste } - #- { key: C, mods: Command, action: Copy } - #- { 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: F, mods: Command|Control, action: ToggleFullscreen } - - #- { key: Paste, action: Paste } - #- { key: Copy, action: Copy } - #- { key: L, mods: Control, action: ClearLogNotice } - #- { key: L, mods: Control, chars: "\x0c" } - #- { key: PageUp, mods: Shift, action: ScrollPageUp, mode: ~Alt } - #- { key: PageDown, mods: Shift, action: ScrollPageDown, mode: ~Alt } - #- { key: Home, mods: Shift, action: ScrollToTop, mode: ~Alt } - #- { key: End, mods: Shift, action: ScrollToBottom, mode: ~Alt } diff --git a/.config/fontconfig/fonts.conf b/.config/fontconfig/fonts.conf index e3c2369..b102e05 100644 --- a/.config/fontconfig/fonts.conf +++ b/.config/fontconfig/fonts.conf @@ -20,7 +20,7 @@ sans-serif - Iosevka Etoile + Iosevka Aile Twitter Color Emoji Material Design Icons diff --git a/.config/gtk-3.0/settings.ini b/.config/gtk-3.0/settings.ini index ffb3a76..a640e84 100644 --- a/.config/gtk-3.0/settings.ini +++ b/.config/gtk-3.0/settings.ini @@ -1,3 +1,3 @@ [Settings] -gtk-theme-name=oomox-atc-solarized +gtk-theme-name=FlatColor diff --git a/.config/mpv/mpv.conf b/.config/mpv/mpv.conf index 0563b98..7a5e313 100644 --- a/.config/mpv/mpv.conf +++ b/.config/mpv/mpv.conf @@ -1,2 +1,3 @@ #vo=xv vo=gpu +ytdl-format=bestvideo[height<=720]+bestaudio/best[height<=720] diff --git a/.config/sway/config b/.config/sway/config index 8011c8a..072cd8e 100644 --- a/.config/sway/config +++ b/.config/sway/config @@ -2,12 +2,12 @@ ### Output configuration output eDP-1 { - background ~/.local/share/wallpaper.svg tile + background ~/pictures/wallpapers/hudson-wall-edit.jpg fill resolution 1920x1080 } output DP-3 { - background ~/.local/share/wallpaper.svg tile + background ~/pictures/wallpapers/hudson-wall-edit.jpg fill resolution 2560x1440 } @@ -21,16 +21,16 @@ set $sigaudio pkill -75 i3blocks #workspace_auto_back_and_forth yes -set $ws1 "1:󰈹" -set $ws2 "2:󰲢" -set $ws3 "3:󰲤" -set $ws4 "4:󰲦" -set $ws5 "5:󰲨" -set $ws6 "6:󰲪" -set $ws7 "7:󰲬" -set $ws8 "8:󰲮" -set $ws9 "9:󰲰" -set $ws10 "10:󰲞" +set $ws1 "1" +set $ws2 "2" +set $ws3 "3" +set $ws4 "4" +set $ws5 "5" +set $ws6 "6" +set $ws7 "7" +set $ws8 "8" +set $ws9 "9" +set $ws10 "10" workspace $ws1 output primary workspace $ws2 output primary @@ -144,9 +144,8 @@ bindsym Mod1+F12 exec mixer vol 0 && $sigaudio bindsym XF86AudioLowerVolume exec mixer vol -5 && $sigaudio bindsym XF86AudioRaiseVolume exec mixer vol +5 && $sigaudio bindsym XF86AudioMute exec mixer vol 0 && $sigaudio -#bindsym --release Print exec import -window root ~/`date +"%Y-%m-%d-%H-%M-%S"`.png -#bindsym --release shift+Print exec import -monitor ~/`date +"%Y-%m-%d-%H-%M-%S"`.png -bindsym Mod1+Pause exec swaylock ; exec doas acpiconf -s3 +bindsym --release Print exec grim +bindsym Mod1+Pause exec swaylock --image ~/pictures/wallpapers/hudson-wall-edit.jpg ; exec doas acpiconf -s3 ## COLORS @@ -158,42 +157,32 @@ client.unfocused #1C433F #3F938D #ffffff ## BARS bar { - modifier Mod1 - strip_workspace_numbers yes - position bottom - status_command i3blocks - - colors { - background #3F938D - statusline #ffffff - separator #ffffff - # class border background foreground - focused_workspace #A2E5C6 #A2E5C6 #000000 - inactive_workspace #1C433F #3F938D #ffffff - urgent_workspace #1C433F #3F938D #ffffff - } + swaybar_command waybar } ## MODES -set $mode_record "󱊫 webcam 󱊬 record" +set $mode_record "󱊫 record 󱊬 webcam 󱊭 full HD 󱊮 quad HD" mode $mode_record { - bindsym Mod1+Escape mode default - bindsym Mod1+F1 exec killall pwcview || pwcview -s vga - bindsym Mod1+F2 exec killall -INT wf-recorder || wf-recorder --audio=oss_input.dsp4 -f ~/recording-$(date +%Y-%m-%d-%T).mp4 ; mode default + bindsym Escape mode default + bindsym F1 exec killall -INT wf-recorder || wf-recorder --audio=oss_input.dsp4 -f ~/recording-$(date +%Y-%m-%d-%T).mp4 ; mode default + bindsym F2 exec killall pwcview || pwcview -s vga + bindsym F3 output DP-3 resolution 1920x1080 + bindsym F4 output DP-3 resolution 2560x1440 } set $mode_modes "󱊷 default 󱊫 recording" bindsym Mod1+Escape mode $mode_modes mode $mode_modes { - bindsym Mod1+Escape mode default - bindsym Mod1+F1 mode $mode_record + bindsym Escape mode default + bindsym F1 mode $mode_record } ## ASSIGNMENTS -assign [class="Firefox"] 2 -assign [class="Thunderbird"] 3 -for_window [class="pwcview"] floating enable +assign [class="Firefox"] $ws1 +for_window [class="Thunderbird"] floating enable +for_window [class="pwcview"] floating enable ; sticky enable +for_window [title="wpgtk*"] floating enable include /usr/local/etc/sway/config.d/* -- cgit v1.2.3