diff --git a/alacritty/.config/alacritty/alacritty.yml b/alacritty/.config/alacritty/alacritty.yml index 7df87b1ca..c1dc6a15b 100644 --- a/alacritty/.config/alacritty/alacritty.yml +++ b/alacritty/.config/alacritty/alacritty.yml @@ -1,5 +1,16 @@ # Configuration for Alacritty, the GPU enhanced terminal emulator. +# Import additional configuration files +# +# Imports are loaded in order, skipping all missing files, with the importing +# file being loaded last. If a field is already present in a previous import, it +# will be replaced. +# +# All imports must either be absolute paths starting with `/`, or paths relative +# to the user's home directory starting with `~/`. +#import: +# - /path/to/alacritty.yml + # Any items in the `env` entry below will be added as # environment variables. Some entries may override variables # set by alacritty itself. @@ -10,13 +21,14 @@ env: # 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 + TERM: alacritty window: # Window dimensions (changes require restart) # - # Specified in number of columns/lines, not pixels. - # If both are `0`, this setting is ignored. + # Number of lines/columns (not pixels) in the terminal. The number of columns + # must be at least `2`, while using a value of `0` for columns and lines will + # fall back to the window manager's recommended size. #dimensions: # columns: 0 # lines: 0 @@ -35,10 +47,10 @@ window: # by DPI and the specified value is always added at both opposing sides. padding: x: 20 - y: 10 + y: 20 # Spread additional padding evenly around the terminal content. - dynamic_padding: true + dynamic_padding: false # Window decorations # @@ -48,9 +60,15 @@ window: # # Values for `decorations` (macOS only): # - transparent: Title bar, transparent background and title bar buttons - # - buttonless: Title bar, transparent background, but no title bar buttons + # - buttonless: Title bar, transparent background and no title bar buttons #decorations: full + # 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. + opacity: 0.85 + # Startup Mode (changes require restart) # # Values for `startup_mode`: @@ -65,6 +83,9 @@ window: # 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 @@ -74,18 +95,17 @@ window: # 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. + # 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: 5000 + 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 + # Scrolling distance multiplier. + #multiplier: 3 # Font configuration font: @@ -97,14 +117,6 @@ font: # - (macOS) Menlo # - (Linux/BSD) monospace # - (Windows) Consolas - # family: SauceCodePro Nerd Font - # family: CodeNewRoman Nerd Font - # family: RobotoMono Nerd Font - # family: Hack - # family: JetBrains Mono - # family: UbuntuMono Nerd Font - # family: Monofur Nerd Font - # family: TerminessTTF Nerd Font family: SauceCodePro Nerd Font # The `style` can be specified to pick a specific face. @@ -116,14 +128,6 @@ font: # # If the bold family is not specified, it will fall back to the # value specified for the normal font. - # family: SauceCodePro Nerd Font - # family: CodeNewRoman Nerd Font - # family: RobotoMono Nerd Font - # family: Hack - # family: JetBrains Mono - # family: UbuntuMono Nerd Font - # family: Monofur Nerd Font - # family: TerminessTTF Nerd Font family: SauceCodePro Nerd Font # The `style` can be specified to pick a specific face. @@ -135,14 +139,6 @@ font: # # If the italic family is not specified, it will fall back to the # value specified for the normal font. - # family: SauceCodePro Nerd Font Mono - # family: CodeNewRoman Nerd Font - # family: RobotoMono Nerd Font - # family: Hack - # family: JetBrains Mono - # family: UbuntuMono Nerd Font - # family: Monofuritalic Nerd Font Mono - # family: TerminessTTF Nerd Font family: SauceCodePro Nerd Font # The `style` can be specified to pick a specific face. @@ -154,14 +150,6 @@ font: # # If the bold italic family is not specified, it will fall back to the # value specified for the normal font. - # family: SauceCodePro Nerd Font Mono - # family: CodeNewRoman Nerd Font - # family: RobotoMono Nerd Font - # family: Hack - # family: JetBrains Mono - # family: UbuntuMono Nerd Font - # family: Monofuritalic Nerd Font Mono - # family: TerminessTTF Nerd Font family: SauceCodePro Nerd Font # The `style` can be specified to pick a specific face. @@ -170,68 +158,56 @@ font: # Point size size: 7.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 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: 1 + 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 +# 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` - # - # 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 +# 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: true - -# Colors (Tomorrow Night Bright) +#draw_bold_text_with_bright_colors: false schemes: - dracula: &dracula - # Default colors + dracula: &dracula # Default colors primary: - background: '0x282a36' - foreground: '0xf8f8f2' + background: "0x282a36" + foreground: "0xf8f8f2" # Normal colors normal: - black: '0x000000' - red: '0xff5555' - green: '0x50fa7b' - yellow: '0xf1fa8c' - blue: '0xbd93f9' - magenta: '0xff79c6' - cyan: '0x8be9fd' - white: '0xbfbfbf' + black: "0x000000" + red: "0xff5555" + green: "0x50fa7b" + yellow: "0xf1fa8c" + blue: "0xbd93f9" + magenta: "0xff79c6" + cyan: "0x8be9fd" + white: "0xbfbfbf" # Bright colors bright: - black: '0x4d4d4d' - red: '0xff6e67' - green: '0x5af78e' - yellow: '0xf4f99d' - blue: '0xcaa9fa' - magenta: '0xff92d0' - cyan: '0x9aedfe' - white: '0xe6e6e6' + black: "0x4d4d4d" + red: "0xff6e67" + green: "0x5af78e" + yellow: "0xf4f99d" + blue: "0xcaa9fa" + magenta: "0xff92d0" + cyan: "0x9aedfe" + white: "0xe6e6e6" cursor: text: CellBackground @@ -241,63 +217,63 @@ schemes: cursor: CellForeground search: matches: - foreground: '0x44475a' - background: '0x50fa7b' + foreground: "0x44475a" + background: "0x50fa7b" focused_match: - foreground: '0x44475a' - background: '0xffb86c' + foreground: "0x44475a" + background: "0xffb86c" bar: - background: '0x282a36' - foreground: '0xf8f8f2' + background: "0x282a36" + foreground: "0xf8f8f2" line_indicator: foreground: None background: None selection: text: CellForeground - background: '0x44475a' + background: "0x44475a" + + minimal-mistakes: &minimal-mistakes # Minimal-Mistakes colors + transparent_background_colors: true - colors: &repo - # Default colors primary: - background: '0x282a36' - foreground: '0xf8f8f2' + background: "0x283036" + foreground: "0xe5e9f0" # Colors the cursor will use if `custom_cursor_colors` is true cursor: - text: '0x282a36' - cursor: '0xf8f8f2' + text: "0x283036" + cursor: "0xe5e9f0" # Normal colors normal: - black: '0x21222c' - red: '0xff5555' - green: '0x50fa7b' - yellow: '0xf1fa8c' - blue: '0x93adf9' - magenta: '0xff79c6' - cyan: '0x8be9fd' - white: '0xf8f8f2' + black: "0x283036" + red: "0xff5959" + green: "0x59ff59" + yellow: "0xffff59" + blue: "0x9059ff" + magenta: "0xff59f9" + cyan: "0x59fff9" + white: "0xe5e9f0" # Bright colors bright: - black: '0x4d4d4d' - red: '0xff6e6e' - green: '0x69ff94' - yellow: '0xffffa5' - blue: '0xacb6ff' - magenta: '0xff92df' - cyan: '0xa4ffff' - white: '0xffffff' + black: "0x434c5e" + red: "0xffa6a6" + green: "0xa6ffa6" + yellow: "0xffffa6" + blue: "0xc5a6ff" + magenta: "0xffa6fc" + cyan: "0xa6fffc" + white: "0xe5e9f0" -colors: *repo - -# Visual Bell +colors: *minimal-mistakes +# 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. +# 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 @@ -310,49 +286,83 @@ colors: *repo # - EaseOutExpo # - EaseOutCirc # - Linear -# -# Specifying a `duration` of `0` will disable the visual bell. -#visual_bell: -# animation: EaseOutExpo -# duration: 0 -# color: '0xffffff' +#animation: EaseOutExpo -# Background opacity +# Duration of the visual bell flash in milliseconds. A `duration` of `0` will +# disable the visual bell animation. +#duration: 0 + +# Visual bell animation color. +#color: '#ffffff' + +# Bell Command # -# 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 -window.opacity: 0.85 +# This program is executed whenever the bell is rung. +# +# When set to `command: None`, no command will be executed. +# +# Example: +# command: +# program: notify-send +# args: ["Hello, World!"] +# +#command: None #selection: - #semantic_escape_chars: ",│`|:\"' ()[]{}<>\t" +# This string contains all characters that are used as separators for +# "semantic words" in Alacritty. +#semantic_escape_chars: ",│`|:\"' ()[]{}<>\t" - # When set to `true`, selected text will be copied to the primary clipboard. - #save_to_clipboard: false +# 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 +#cursor: +# Cursor style +#style: +# Cursor shape +# +# Values for `shape`: +# - ▇ Block +# - _ Underline +# - | Beam +#shape: Block -cursor: - # Cursor style - # - # Values for `style`: - # - ▇ Block - # - _ Underline - # - | Beam - style: Underline +# Cursor blinking state +# +# Values for `blinking`: +# - Never: Prevent the cursor from ever blinking +# - Off: Disable blinking by default +# - On: Enable blinking by default +# - Always: Force the cursor to always blink +#blinking: Off - # If this is `true`, the cursor will be rendered as a hollow box when the - # window is not focused. - unfocused_hollow: true +# 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 + +# Cursor blinking interval in milliseconds. +#blink_interval: 750 + +# 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 +#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. +# 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 @@ -367,84 +377,79 @@ live_config_reload: true # # 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 +#working_directory: None # 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 +# Offer IPC using `alacritty msg` (unix only) +#ipc_socket: 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 } +# 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 +# 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: [] +# Regex hints +# +# Terminal hints can be used to find text in the visible part of the terminal +# and pipe it to other applications. +#hints: +# Keys used for the hint labels. +#alphabet: "jfkdls;ahgurieowpq" - # 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 +# List with all available hints +# +# Each hint must have a `regex` and either an `action` or a `command` field. +# The fields `mouse`, `binding` and `post_processing` are optional. +# +# The fields `command`, `binding.key`, `binding.mods`, `binding.mode` and +# `mouse.mods` accept the same values as they do in the `key_bindings` section. +# +# The `mouse.enabled` field controls if the hint should be underlined while +# the mouse with all `mouse.mods` keys held or the vi mode cursor is above it. +# +# If the `post_processing` field is set to `true`, heuristics will be used to +# shorten the match if there are characters likely not to be part of the hint +# (e.g. a trailing `.`). This is most useful for URIs. +# +# Values for `action`: +# - Copy +# Copy the hint's text to the clipboard. +# - Paste +# Paste the hint's text to the terminal or search. +# - Select +# Select the hint's text. +# - MoveViModeCursor +# Move the vi mode cursor to the beginning of the hint. +#enabled: +# - regex: "(ipfs:|ipns:|magnet:|mailto:|gemini:|gopher:|https:|http:|news:|file:|git:|ssh:|ftp:)\ +# [^\u0000-\u001F\u007F-\u009F<>\"\\s{-}\\^⟨⟩`]+" +# command: xdg-open +# post_processing: true +# mouse: +# enabled: true +# mods: None +# binding: +# key: U +# mods: Control|Shift # 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`: @@ -454,13 +459,20 @@ working_directory: None # - Right # - Numeric identifier such as `5` # -# - `action` (see key bindings) +# - `action` (see key bindings for actions not exclusive to mouse mode) +# +# - Mouse exclusive actions: +# +# - ExpandSelection +# Expand the selection to the current mouse cursor location. # # And optionally: # # - `mods` (see key bindings) #mouse_bindings: -# - { mouse: Middle, action: PasteSelection } +# - { mouse: Right, action: ExpandSelection } +# - { mouse: Right, mods: Control, action: ExpandSelection } +# - { mouse: Middle, mode: ~Vi, action: PasteSelection } # Key bindings # @@ -500,30 +512,131 @@ working_directory: None # # - `action`: Execute a predefined action # +# - ToggleViMode +# - SearchForward +# Start searching toward the right of the search origin. +# - SearchBackward +# Start searching toward the left of the search origin. # - Copy # - Paste -# - PasteSelection # - IncreaseFontSize # - DecreaseFontSize # - ResetFontSize # - ScrollPageUp # - ScrollPageDown +# - ScrollHalfPageUp +# - ScrollHalfPageDown # - ScrollLineUp # - ScrollLineDown # - ScrollToTop # - ScrollToBottom # - ClearHistory +# Remove the terminal's scrollback history. # - Hide +# Hide the Alacritty window. # - Minimize +# Minimize the Alacritty window. # - Quit +# Quit Alacritty. # - ToggleFullscreen # - SpawnNewInstance +# Spawn a new instance of Alacritty. +# - CreateNewWindow +# Create a new Alacritty window from the current process. # - ClearLogNotice +# Clear Alacritty's UI warning and error notice. +# - ClearSelection +# Remove the active selection. # - ReceiveChar # - None # -# (macOS only): -# - ToggleSimpleFullscreen: Enters fullscreen without occupying another space +# - Vi mode exclusive actions: +# +# - Open +# Perform the action of the first matching hint under the vi mode cursor +# with `mouse.enabled` set to `true`. +# - ToggleNormalSelection +# - ToggleLineSelection +# - ToggleBlockSelection +# - ToggleSemanticSelection +# Toggle semantic selection based on `selection.semantic_escape_chars`. +# +# - Vi mode exclusive cursor motion actions: +# +# - Up +# One line up. +# - Down +# One line down. +# - Left +# One character left. +# - Right +# One character right. +# - First +# First column, or beginning of the line when already at the first column. +# - Last +# Last column, or beginning of the line when already at the last column. +# - FirstOccupied +# First non-empty cell in this terminal row, or first non-empty cell of +# the line when already at the first cell of the row. +# - High +# Top of the screen. +# - Middle +# Center of the screen. +# - Low +# Bottom of the screen. +# - SemanticLeft +# Start of the previous semantically separated word. +# - SemanticRight +# Start of the next semantically separated word. +# - SemanticLeftEnd +# End of the previous semantically separated word. +# - SemanticRightEnd +# End of the next semantically separated word. +# - WordLeft +# Start of the previous whitespace separated word. +# - WordRight +# Start of the next whitespace separated word. +# - WordLeftEnd +# End of the previous whitespace separated word. +# - WordRightEnd +# End of the next whitespace separated word. +# - Bracket +# Character matching the bracket at the cursor's location. +# - SearchNext +# Beginning of the next match. +# - SearchPrevious +# Beginning of the previous match. +# - SearchStart +# Start of the match to the left of the vi mode cursor. +# - SearchEnd +# End of the match to the right of the vi mode cursor. +# +# - Search mode exclusive actions: +# - SearchFocusNext +# Move the focus to the next search match. +# - SearchFocusPrevious +# Move the focus to the previous search match. +# - SearchConfirm +# - SearchCancel +# - SearchClear +# Reset the search regex. +# - SearchDeleteWord +# Delete the last word in the search regex. +# - SearchHistoryPrevious +# Go to the previous regex in the search history. +# - SearchHistoryNext +# Go to the next regex in the search history. +# +# - macOS exclusive actions: +# - ToggleSimpleFullscreen +# Enter fullscreen without occupying another space. +# +# - Linux/BSD exclusive actions: +# +# - CopySelection +# Copy from the selection buffer. +# - PasteSelection +# Paste from the selection buffer. # # - `command`: Fork and execute a specified command plus arguments # @@ -553,7 +666,9 @@ working_directory: None # # - AppCursor # - AppKeypad +# - Search # - Alt +# - Vi # # A `~` operator can be used before a mode to apply the binding whenever # the mode is *not* active, e.g. `~Alt`. @@ -562,26 +677,137 @@ working_directory: None # 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: F, mods: Control|Shift, action: SearchForward } - - { key: B, mods: Control|Shift, action: SearchBackward } - - { key: C, mods: Control|Shift, action: ClearSelection } - - { key: Insert, mods: Shift, action: PasteSelection } - - { key: Key0, mods: Control, action: ResetFontSize } - - { key: Equals, mods: Control, action: IncreaseFontSize } - - { key: Plus, mods: Control, action: IncreaseFontSize } - - { key: NumpadAdd, mods: Control, action: IncreaseFontSize } - - { key: Minus, mods: Control, action: DecreaseFontSize } - - { key: NumpadSubtract, mods: Control, action: DecreaseFontSize } +# +# 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|~Search, 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 } - - { 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 } +# Vi Mode +#- { key: Space, mods: Shift|Control, mode: ~Search, action: ToggleViMode } +#- { key: Space, mods: Shift|Control, mode: Vi|~Search, action: ScrollToBottom } +#- { key: Escape, mode: Vi|~Search, action: ClearSelection } +#- { key: I, mode: Vi|~Search, action: ToggleViMode } +#- { key: I, mode: Vi|~Search, action: ScrollToBottom } +#- { key: C, mods: Control, mode: Vi|~Search, action: ToggleViMode } +#- { key: Y, mods: Control, mode: Vi|~Search, action: ScrollLineUp } +#- { key: E, mods: Control, mode: Vi|~Search, action: ScrollLineDown } +#- { key: G, mode: Vi|~Search, action: ScrollToTop } +#- { key: G, mods: Shift, mode: Vi|~Search, action: ScrollToBottom } +#- { key: B, mods: Control, mode: Vi|~Search, action: ScrollPageUp } +#- { key: F, mods: Control, mode: Vi|~Search, action: ScrollPageDown } +#- { key: U, mods: Control, mode: Vi|~Search, action: ScrollHalfPageUp } +#- { key: D, mods: Control, mode: Vi|~Search, action: ScrollHalfPageDown } +#- { key: Y, mode: Vi|~Search, action: Copy } +#- { key: Y, mode: Vi|~Search, action: ClearSelection } +#- { key: Copy, mode: Vi|~Search, action: ClearSelection } +#- { key: V, mode: Vi|~Search, action: ToggleNormalSelection } +#- { key: V, mods: Shift, mode: Vi|~Search, action: ToggleLineSelection } +#- { key: V, mods: Control, mode: Vi|~Search, action: ToggleBlockSelection } +#- { key: V, mods: Alt, mode: Vi|~Search, action: ToggleSemanticSelection } +#- { key: Return, mode: Vi|~Search, action: Open } +#- { key: K, mode: Vi|~Search, action: Up } +#- { key: J, mode: Vi|~Search, action: Down } +#- { key: H, mode: Vi|~Search, action: Left } +#- { key: L, mode: Vi|~Search, action: Right } +#- { key: Up, mode: Vi|~Search, action: Up } +#- { key: Down, mode: Vi|~Search, action: Down } +#- { key: Left, mode: Vi|~Search, action: Left } +#- { key: Right, mode: Vi|~Search, action: Right } +#- { key: Key0, mode: Vi|~Search, action: First } +#- { key: Key4, mods: Shift, mode: Vi|~Search, action: Last } +#- { key: Key6, mods: Shift, mode: Vi|~Search, action: FirstOccupied } +#- { key: H, mods: Shift, mode: Vi|~Search, action: High } +#- { key: M, mods: Shift, mode: Vi|~Search, action: Middle } +#- { key: L, mods: Shift, mode: Vi|~Search, action: Low } +#- { key: B, mode: Vi|~Search, action: SemanticLeft } +#- { key: W, mode: Vi|~Search, action: SemanticRight } +#- { key: E, mode: Vi|~Search, action: SemanticRightEnd } +#- { key: B, mods: Shift, mode: Vi|~Search, action: WordLeft } +#- { key: W, mods: Shift, mode: Vi|~Search, action: WordRight } +#- { key: E, mods: Shift, mode: Vi|~Search, action: WordRightEnd } +#- { key: Key5, mods: Shift, mode: Vi|~Search, action: Bracket } +#- { key: Slash, mode: Vi|~Search, action: SearchForward } +#- { key: Slash, mods: Shift, mode: Vi|~Search, action: SearchBackward } +#- { key: N, mode: Vi|~Search, action: SearchNext } +#- { key: N, mods: Shift, mode: Vi|~Search, action: SearchPrevious } + +# Search Mode +#- { key: Return, mode: Search|Vi, action: SearchConfirm } +#- { key: Escape, mode: Search, action: SearchCancel } +#- { key: C, mods: Control, mode: Search, action: SearchCancel } +#- { key: U, mods: Control, mode: Search, action: SearchClear } +#- { key: W, mods: Control, mode: Search, action: SearchDeleteWord } +#- { key: P, mods: Control, mode: Search, action: SearchHistoryPrevious } +#- { key: N, mods: Control, mode: Search, action: SearchHistoryNext } +#- { key: Up, mode: Search, action: SearchHistoryPrevious } +#- { key: Down, mode: Search, action: SearchHistoryNext } +#- { key: Return, mode: Search|~Vi, action: SearchFocusNext } +#- { key: Return, mods: Shift, mode: Search|~Vi, action: SearchFocusPrevious } + +# (Windows, Linux, and BSD only) +#- { key: V, mods: Control|Shift, mode: ~Vi, action: Paste } +#- { key: C, mods: Control|Shift, action: Copy } +#- { key: F, mods: Control|Shift, mode: ~Search, action: SearchForward } +#- { key: B, mods: Control|Shift, mode: ~Search, action: SearchBackward } +#- { key: C, mods: Control|Shift, mode: Vi|~Search, action: ClearSelection } +#- { key: Insert, mods: Shift, action: PasteSelection } +#- { key: Key0, mods: Control, action: ResetFontSize } +#- { key: Equals, mods: Control, action: IncreaseFontSize } +#- { key: Plus, mods: Control, action: IncreaseFontSize } +#- { key: NumpadAdd, mods: Control, action: IncreaseFontSize } +#- { key: Minus, mods: Control, action: DecreaseFontSize } +#- { key: NumpadSubtract, mods: Control, action: DecreaseFontSize } + +# (Windows only) +#- { key: Return, mods: Alt, action: ToggleFullscreen } + +# (macOS only) +#- { key: K, mods: Command, mode: ~Vi|~Search, chars: "\x0c" } +#- { key: K, mods: Command, mode: ~Vi|~Search, action: ClearHistory } +#- { key: Key0, mods: Command, action: ResetFontSize } +#- { key: Equals, mods: Command, action: IncreaseFontSize } +#- { key: Plus, mods: Command, action: IncreaseFontSize } +#- { key: NumpadAdd, mods: Command, action: IncreaseFontSize } +#- { key: Minus, mods: Command, action: DecreaseFontSize } +#- { key: NumpadSubtract, mods: Command, action: DecreaseFontSize } +#- { key: V, mods: Command, action: Paste } +#- { key: C, mods: Command, action: Copy } +#- { key: C, mods: Command, mode: Vi|~Search, action: ClearSelection } +#- { key: H, mods: Command, action: Hide } +#- { key: H, mods: Command|Alt, action: HideOtherApplications } +#- { 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, mode: ~Search, action: SearchForward } +#- { key: B, mods: Command, mode: ~Search, 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`: +# - Off +# - Error +# - Warn +# - Info +# - Debug +# - Trace +#log_level: Warn + +# Print all received window events. +#print_events: false diff --git a/ckb-next/.config/ckb-next/ckb-next.conf b/ckb-next/.config/ckb-next/ckb-next.conf index 51bbdf13f..55f7bebe0 100644 --- a/ckb-next/.config/ckb-next/ckb-next.conf +++ b/ckb-next/.config/ckb-next/ckb-next.conf @@ -53,7 +53,7 @@ 0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\0\Lighting\Animations\%7BA97F00C0-5217-4F43-ADC6-67207554972E%7D\ScriptGuid={E0BBA19E-C328-4C0E-8E3C-A06D5722B4FC} 0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\0\Lighting\Animations\%7BA97F00C0-5217-4F43-ADC6-67207554972E%7D\ScriptName=Wave 0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\0\Lighting\Animations\%7BA97F00C0-5217-4F43-ADC6-67207554972E%7D\UseRealNames=true -0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\0\Lighting\Brightness=0 +0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\0\Lighting\Brightness=3 0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\0\Lighting\KeyMap=K68 GB 0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\0\Lighting\Keys\0=#ffffff 0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\0\Lighting\Keys\1=#ffffff @@ -196,7 +196,7 @@ 0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\0\Lighting\Keys\y=#ffffff 0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\0\Lighting\Keys\z=#ffffff 0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\0\Lighting\UseRealNames=true -0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\0\Modified=aeda7655 +0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\0\Modified=5bc1931 0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\0\Name=Rainbow 0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\0\Performance\AngleSnap=false 0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\0\Performance\DPI\0=@Point(400 400) @@ -424,7 +424,7 @@ 0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\1\Lighting\Keys\y=#ff0000 0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\1\Lighting\Keys\z=#ff0000 0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\1\Lighting\UseRealNames=true -0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\1\Modified=b5a4931d +0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\1\Modified=69782338 0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\1\Name=Breathing 0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\1\Performance\AngleSnap=false 0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\1\Performance\DPI\0=@Point(400 400) @@ -529,7 +529,7 @@ 0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\2\Lighting\Animations\%7BE3CF82E0-AEED-45C9-AB33-88D432CA9F40%7D\ScriptGuid={097D69F0-70B2-48B8-AFE2-25A1CDB02C9D} 0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\2\Lighting\Animations\%7BE3CF82E0-AEED-45C9-AB33-88D432CA9F40%7D\ScriptName=Ripple 0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\2\Lighting\Animations\%7BE3CF82E0-AEED-45C9-AB33-88D432CA9F40%7D\UseRealNames=true -0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\2\Lighting\Brightness=0 +0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\2\Lighting\Brightness=2 0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\2\Lighting\KeyMap=K68 GB 0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\2\Lighting\Keys\0=#aa00ff 0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\2\Lighting\Keys\1=#aa00ff @@ -674,7 +674,7 @@ 0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\2\Lighting\Keys\y=#aa00ff 0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\2\Lighting\Keys\z=#aa00ff 0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\2\Lighting\UseRealNames=true -0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\2\Modified=596c1ed6 +0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\2\Modified=102e3ba7 0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\2\Name=Trippy 0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\2\Performance\AngleSnap=false 0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\2\Performance\DPI\0=@Point(400 400) @@ -732,7 +732,7 @@ 0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\CurrentMode={51EB6E3A-27A0-4AD6-A35C-6B67E0329A3D} 0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\HwModified=7ffd 0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\ModeCount=3 -0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\Modified=91bd0d46 +0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\Modified=f2ffa8c 0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\Name=Multi 0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\0\Binding\KeyMap=K68 GB 0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\0\Binding\UseRealNames=true @@ -928,7 +928,7 @@ 0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\0\Lighting\Keys\y=#ffffff 0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\0\Lighting\Keys\z=#ffffff 0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\0\Lighting\UseRealNames=true -0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\0\Modified=7d7a3f1d +0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\0\Modified=af8b487b 0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\0\Name=Rainbow 0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\0\Performance\AngleSnap=false 0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\0\Performance\DPI\0=@Point(400 400) @@ -1156,7 +1156,7 @@ 0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\1\Lighting\Keys\y=#ff0000 0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\1\Lighting\Keys\z=#ff0000 0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\1\Lighting\UseRealNames=true -0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\1\Modified=756de3e7 +0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\1\Modified=226b4c9c 0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\1\Name=Breathing 0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\1\Performance\AngleSnap=false 0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\1\Performance\DPI\0=@Point(400 400) @@ -1406,7 +1406,7 @@ 0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\2\Lighting\Keys\y=#aa00ff 0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\2\Lighting\Keys\z=#aa00ff 0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\2\Lighting\UseRealNames=true -0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\2\Modified=3b94a266 +0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\2\Modified=34f78058 0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\2\Name=Trippy 0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\2\Performance\AngleSnap=false 0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\2\Performance\DPI\0=@Point(400 400) @@ -1464,7 +1464,7 @@ 0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\CurrentMode={11C11AE3-3195-4DFC-B8AC-2FEA703414E5} 0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\HwModified=40b6f054 0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\ModeCount=3 -0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\Modified=4e4b9da1 +0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\Modified=434615bb 0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\Name=Demo [Popups] @@ -1473,7 +1473,7 @@ BGWarning=true [Program] CkbMigrationChecked=true CkbNextIniMigrationChecked=true -GlobalBrightness=0 +GlobalBrightness=2 NewDidLoginItem=true RGBIcon=true SettingsVersion=1 diff --git a/dconf/.config/dconf/user b/dconf/.config/dconf/user index f64483f4d..c0d76588d 100644 Binary files a/dconf/.config/dconf/user and b/dconf/.config/dconf/user differ diff --git a/fish/.config/fish/config.fish b/fish/.config/fish/config.fish index 88e8c4324..b23c03b25 100644 --- a/fish/.config/fish/config.fish +++ b/fish/.config/fish/config.fish @@ -48,6 +48,10 @@ for file in "$HOME/.config/fish/aliases/"* source $file end +for file in "$HOME/.config/fish/plugins/"* + source $file +end + # Keybinding bind \ec __history_previous_command bind \e\e __sudope diff --git a/fish/.config/fish/plugins/sudo_prompt.fish b/fish/.config/fish/plugins/sudo_prompt.fish new file mode 100644 index 000000000..e15e1e4d4 --- /dev/null +++ b/fish/.config/fish/plugins/sudo_prompt.fish @@ -0,0 +1,35 @@ +# ------------------------------------------------------------------------------ +# Description +# ----------- +# +# sudo prompt in color +# +function sudo + + # ------------------------------------------------------------------------------ + # Setup colors + #Bold Colors + set -l bnormal (set_color -o normal) + set -l bblack (set_color -o brblack) + set -l bred (set_color -o brred) + set -l bgreen (set_color -o brgreen) + set -l byellow (set_color -o bryellow) + set -l bblue (set_color -o brblue) + set -l bmagenta (set_color -o brmagenta) + set -l bcyan (set_color -o brcyan) + set -l bwhite (set_color -o brwhite) + + #Normal Colors + set -l normal (set_color normal) + set -l black (set_color black) + set -l red (set_color red) + set -l green (set_color green) + set -l yellow (set_color yellow) + set -l blue (set_color blue) + set -l magenta (set_color magenta) + set -l cyan (set_color cyan) + set -l white (set_color white) + # ------------------------------------------------------------------------------ + + command sudo -p "$red$yellow [sudo]$green password for %u: $normal" $argv +end diff --git a/gimp/.config/GIMP/2.10/action-history b/gimp/.config/GIMP/2.10/action-history index 0d2a440a8..800bbf4a4 100755 --- a/gimp/.config/GIMP/2.10/action-history +++ b/gimp/.config/GIMP/2.10/action-history @@ -1,6 +1,6 @@ # GIMP action-history -(history-item "file-quit" 1) +(history-item "file-quit" 2) (history-item "select-none" 3) (history-item "layers-new" 0) (history-item "tools-scale" 3) diff --git a/gimp/.config/GIMP/2.10/colorrc b/gimp/.config/GIMP/2.10/colorrc index 1c9cd63e7..f9c161d32 100755 --- a/gimp/.config/GIMP/2.10/colorrc +++ b/gimp/.config/GIMP/2.10/colorrc @@ -3,6 +3,7 @@ # This file holds a list of recently used colors. (color-history + (color-rgba 0.1803921568627451 0.20392156862745098 0.25098039215686274 1) (color-rgba 0.49411764705882355 0.49411764705882355 1 1) (color-rgba 1 1 1 1) (color-rgba 1 1 1 4.6663864120431995e-310) diff --git a/gimp/.config/GIMP/2.10/contextrc b/gimp/.config/GIMP/2.10/contextrc index c4585ddde..74b7fe15a 100755 --- a/gimp/.config/GIMP/2.10/contextrc +++ b/gimp/.config/GIMP/2.10/contextrc @@ -1,8 +1,8 @@ # GIMP user context -(tool "gimp-scale-tool") +(tool "gimp-bucket-fill-tool") (paint-info "gimp-paintbrush") -(foreground (color-rgb 0.49411764705882355 0.49411764705882355 1)) +(foreground (color-rgb 0.1803921568627451 0.20392156862745098 0.25098039215686274)) (brush "2. Hardness 025") (dynamics "Dynamics Off") (mybrush "100% Opaque") diff --git a/gimp/.config/GIMP/2.10/devicerc b/gimp/.config/GIMP/2.10/devicerc index ec5013c91..90271df87 100755 --- a/gimp/.config/GIMP/2.10/devicerc +++ b/gimp/.config/GIMP/2.10/devicerc @@ -3,16 +3,19 @@ (GimpDeviceInfo "Core Pointer" (icon-name "gimp-cursor") (name "Core Pointer") - (tool-options "GimpTransformGridOptions" - (tool "gimp-scale-tool") - (interpolation linear)) + (tool-options "GimpBucketFillOptions" + (tool "gimp-bucket-fill-tool") + (foreground (color-rgb 0.1803921568627451 0.20392156862745098 0.25098039215686274)) + (pattern "Pine") + (brush-size 51) + (brush-hardness 0.5)) (use-fg-bg yes) (use-opacity-paint-mode no) (use-brush no) (use-dynamics no) (use-mypaint-brush no) (use-gradient no) - (use-pattern no) + (use-pattern yes) (use-palette no) (use-font no) (mode screen) diff --git a/gimp/.config/GIMP/2.10/menurc b/gimp/.config/GIMP/2.10/menurc index 2580cbf92..60cab4c3a 100755 --- a/gimp/.config/GIMP/2.10/menurc +++ b/gimp/.config/GIMP/2.10/menurc @@ -56,18 +56,18 @@ ; (gtk_accel_path "/context/context-foreground-value-increase-skip" "") ; (gtk_accel_path "/plug-in/script-fu-addborder" "") ; (gtk_accel_path "/view/view-display-intent-absolute-colorimetric" "") +; (gtk_accel_path "/filters/filters-focus-blur" "") ; (gtk_accel_path "/context/context-background-red-decrease" "") ; (gtk_accel_path "/tools/tools-airbrush-rate-maximum" "") ; (gtk_accel_path "/vectors/vectors-color-tag-menu" "") -; (gtk_accel_path "/filters/filters-focus-blur" "") ; (gtk_accel_path "/view/view-fullscreen" "F11") -; (gtk_accel_path "/context/context-brush-radius-decrease-skip" "") ; (gtk_accel_path "/dialogs/dialogs-brushes" "b") +; (gtk_accel_path "/context/context-brush-radius-decrease-skip" "") +; (gtk_accel_path "/view/view-zoom-2-1" "2") ; (gtk_accel_path "/tools/tools-spacing-minimum" "") ; (gtk_accel_path "/context/context-foreground-blue-maximum" "") -; (gtk_accel_path "/view/view-zoom-2-1" "2") -; (gtk_accel_path "/view/view-snap-to-vectors" "") ; (gtk_accel_path "/context/context-foreground-red-increase" "") +; (gtk_accel_path "/view/view-snap-to-vectors" "") ; (gtk_accel_path "/image/image-properties" "Return") ; (gtk_accel_path "/drawable/drawable-rotate-270" "") ; (gtk_accel_path "/tools/tools-hardness-increase-percent" "") @@ -596,6 +596,7 @@ ; (gtk_accel_path "/layers/layers-alpha-selection-subtract" "") ; (gtk_accel_path "/channels/channels-select-top" "") ; (gtk_accel_path "/plug-in/script-fu-sota-chrome-it" "") +; (gtk_accel_path "/view/view-move-to-screen-:0.0" "") ; (gtk_accel_path "/plug-in/gimp-palette-export-python" "") ; (gtk_accel_path "/context/context-swatch-foreground-next" "0") ; (gtk_accel_path "/select/selection-popup" "") @@ -688,8 +689,8 @@ ; (gtk_accel_path "/filters/filters-artistic-menu" "") ; (gtk_accel_path "/filters/filters-offset" "o") ; (gtk_accel_path "/filters/filters-softglow" "") -; (gtk_accel_path "/vectors/vectors-select-top" "") ; (gtk_accel_path "/context/context-brush-shape-square" "") +; (gtk_accel_path "/vectors/vectors-select-top" "") ; (gtk_accel_path "/tools/tools-opacity-minimum" "") ; (gtk_accel_path "/channels/channels-raise-to-top" "") ; (gtk_accel_path "/filters/filters-reinhard-2005" "") @@ -709,13 +710,13 @@ ; (gtk_accel_path "/plug-in/plug-in-ccanalyze" "") ; (gtk_accel_path "/plug-in/plug-in-separate-separate" "") ; (gtk_accel_path "/select/select-flood" "") -; (gtk_accel_path "/image/image-color-management-menu" "") +; (gtk_accel_path "/tools/tools-hardness-set-to-default" "") ; (gtk_accel_path "/tools/tools-bucket-fill" "b") ; (gtk_accel_path "/tools/tools-angle-set" "") ; (gtk_accel_path "/tools/tools-ink-blob-aspect-set" "") ; (gtk_accel_path "/tools/tools-size-increase" "bracketright") ; (gtk_accel_path "/tools/tools-force-increase-percent" "") -; (gtk_accel_path "/tools/tools-hardness-set-to-default" "") +; (gtk_accel_path "/image/image-color-management-menu" "") ; (gtk_accel_path "/channels/channels-selection-replace" "") ; (gtk_accel_path "/dockable/dialogs-layers" "l") ; (gtk_accel_path "/view/view-zoom-fit-in" "j") @@ -753,26 +754,25 @@ ; (gtk_accel_path "/filters/filters-color-exchange" "") ; (gtk_accel_path "/tools/tools-warp-effect-size-set" "") ; (gtk_accel_path "/view/view-display-intent-perceptual" "") -; (gtk_accel_path "/dock/dock-open-display" "") ; (gtk_accel_path "/dialogs/dialogs-navigation" "") -; (gtk_accel_path "/quick-mask/quick-mask-invert-on" "") +; (gtk_accel_path "/dock/dock-open-display" "") ; (gtk_accel_path "/context/context-paint-mode-previous" "") ; (gtk_accel_path "/plug-in/plug-in-hot" "") ; (gtk_accel_path "/tools/tools-aspect-decrease-skip" "") ; (gtk_accel_path "/view/view-zoom-out-skip" "") ; (gtk_accel_path "/dialogs/dialogs-keyboard-shortcuts" "") ; (gtk_accel_path "/view/view-zoom-maximum" "") -; (gtk_accel_path "/dockable/dockable-preview-size-tiny" "") ; (gtk_accel_path "/dialogs/dialogs-input-devices" "") ; (gtk_accel_path "/dockable/dialogs-document-history" "") -; (gtk_accel_path "/plug-in/script-fu-set-cmap" "") +; (gtk_accel_path "/quick-mask/quick-mask-invert-on" "") ; (gtk_accel_path "/context/context-swatch-foreground-first" "") ; (gtk_accel_path "/file/file-export" "e") -; (gtk_accel_path "/view/view-flip-vertically" "") +; (gtk_accel_path "/plug-in/script-fu-set-cmap" "") ; (gtk_accel_path "/layers/layers-text-discard" "") ; (gtk_accel_path "/context/context-foreground-red-maximum" "") +; (gtk_accel_path "/filters/filters-edge-sobel" "") +; (gtk_accel_path "/dockable/dockable-preview-size-tiny" "") ; (gtk_accel_path "/plug-in/script-fu-guide-new-percent" "") -; (gtk_accel_path "/view/view-move-to-screen-:1.0" "") ; (gtk_accel_path "/view/view-show-scrollbars" "") ; (gtk_accel_path "/filters/filters-render-noise-menu" "") ; (gtk_accel_path "/channels/channels-delete" "") @@ -786,11 +786,11 @@ ; (gtk_accel_path "/context/context-background-red-increase-skip" "") ; (gtk_accel_path "/vectors/vectors-popup" "") ; (gtk_accel_path "/image/image-rotate-90" "") -; (gtk_accel_path "/filters/filters-edge-sobel" "") ; (gtk_accel_path "/edit/edit-fill-bg" "period") +; (gtk_accel_path "/layers/layers-mode-next" "") ; (gtk_accel_path "/context/context-palette-menu" "") ; (gtk_accel_path "/layers/layers-properties-menu" "") -; (gtk_accel_path "/layers/layers-mode-next" "") +; (gtk_accel_path "/view/view-flip-vertically" "") ; (gtk_accel_path "/context/context-foreground-hue-increase" "") ; (gtk_accel_path "/select/select-invert" "i") (gtk_accel_path "/tools/tools-iscissors" "") @@ -867,8 +867,8 @@ ; (gtk_accel_path "/context/context-background-saturation-minimum" "") ; (gtk_accel_path "/layers/layers-lock-alpha" "") ; (gtk_accel_path "/tools/tools-transform-menu" "") -; (gtk_accel_path "/plug-in/plug-in-borderaverage" "") ; (gtk_accel_path "/view/view-padding-color-theme" "") +; (gtk_accel_path "/plug-in/plug-in-borderaverage" "") ; (gtk_accel_path "/plug-in/script-fu-gradient-example" "") ; (gtk_accel_path "/filters/filters-color-rotate" "") ; (gtk_accel_path "/dockable/dialogs-dynamics" "") @@ -987,18 +987,18 @@ ; (gtk_accel_path "/vectors/vectors-selection-to-vectors" "") ; (gtk_accel_path "/edit/edit-named-copy-visible" "") ; (gtk_accel_path "/dockable/dialogs-brushes" "b") +; (gtk_accel_path "/dockable/dockable-preview-size-small" "") ; (gtk_accel_path "/drawable/drawable-rotate-180" "") -; (gtk_accel_path "/filters/filters-decor-menu" "") ; (gtk_accel_path "/layers/layers-composite-mode-menu" "") ; (gtk_accel_path "/tools/tools-airbrush-rate-decrease" "") ; (gtk_accel_path "/image/image-convert-gamma" "") ; (gtk_accel_path "/context/context-foreground-hue-increase-skip" "") -; (gtk_accel_path "/channels/channels-popup" "") +; (gtk_accel_path "/filters/filters-decor-menu" "") ; (gtk_accel_path "/channels/channels-color-tag-yellow" "") -; (gtk_accel_path "/dockable/dockable-preview-size-small" "") +; (gtk_accel_path "/layers/layers-alpha-selection-intersect" "") ; (gtk_accel_path "/image/image-guides-menu" "") ; (gtk_accel_path "/tools/tools-force-increase" "") -; (gtk_accel_path "/layers/layers-alpha-selection-intersect" "") +; (gtk_accel_path "/channels/channels-popup" "") ; (gtk_accel_path "/context/context-brush-select-next" "") ; (gtk_accel_path "/filters/filters-waterpixels" "") ; (gtk_accel_path "/context/context-brush-spacing-increase" "") @@ -1013,6 +1013,7 @@ ; (gtk_accel_path "/filters/filters-mean-curvature-blur" "") ; (gtk_accel_path "/layers/layers-color-tag-yellow" "") ; (gtk_accel_path "/context/context-brush-aspect-decrease-skip" "") +; (gtk_accel_path "/dock/dock-move-to-screen-:0.0" "") ; (gtk_accel_path "/filters/filters-animation-menu" "") ; (gtk_accel_path "/filters/filters-noise-reduction" "") ; (gtk_accel_path "/dialogs/dialogs-gradients" "g") @@ -1172,7 +1173,6 @@ ; (gtk_accel_path "/edit/edit-fill-fg" "comma") (gtk_accel_path "/tools/tools-scale" "t") ; (gtk_accel_path "/context/context-brush-select-last" "") -; (gtk_accel_path "/dock/dock-move-to-screen-:1.0" "") ; (gtk_accel_path "/plug-in/script-fu-distress-selection" "") ; (gtk_accel_path "/edit/undo-popup" "") ; (gtk_accel_path "/layers/layers-mode-first" "") @@ -1240,8 +1240,8 @@ ; (gtk_accel_path "/view/view-rotate-270" "") ; (gtk_accel_path "/vectors/vectors-lower-to-bottom" "") ; (gtk_accel_path "/context/context-colormap-background-set" "") -; (gtk_accel_path "/layers/layers-color-tag-gray" "") ; (gtk_accel_path "/tools/tools-paintbrush-size-set" "") +; (gtk_accel_path "/layers/layers-color-tag-gray" "") ; (gtk_accel_path "/dock/dock-show-image-menu" "") ; (gtk_accel_path "/context/context-brush-hardness-increase-skip" "") ; (gtk_accel_path "/plug-in/script-fu-selection-to-pattern" "") diff --git a/gimp/.config/GIMP/2.10/pluginrc b/gimp/.config/GIMP/2.10/pluginrc index e0504479d..cf0d112e4 100644 --- a/gimp/.config/GIMP/2.10/pluginrc +++ b/gimp/.config/GIMP/2.10/pluginrc @@ -4313,7 +4313,7 @@ (proc-arg 13 "image" "Input image") (proc-arg 16 "drawable" "Input drawable (unused)") (proc-arg 13 "result" "Resulting image"))) -(plug-in-def "${gimp_plug_in_dir}/plug-ins/file-jxl/file-jxl" 1640434877 +(plug-in-def "${gimp_plug_in_dir}/plug-ins/file-jxl/file-jxl" 1643504923 (proc-def "file-jxl-load" 1 "Loads JPEG XL image files" "Loads JPEG XL image files" diff --git a/gimp/.config/GIMP/2.10/sessionrc b/gimp/.config/GIMP/2.10/sessionrc index 64f8a2f9f..750fd8379 100755 --- a/gimp/.config/GIMP/2.10/sessionrc +++ b/gimp/.config/GIMP/2.10/sessionrc @@ -87,7 +87,8 @@ (size 671 476)) (session-info "toplevel" (factory-entry "gimp-toolbox-color-dialog") - (position 1294 17)) + (position 1293 16) + (monitor 1)) (session-info "toplevel" (factory-entry "gimp-operation-tool-dialog") (position 1518 93)) @@ -107,6 +108,10 @@ (factory-entry "gimp-levels-tool-dialog") (position 1635 99) (size 462 593)) +(session-info "toplevel" + (factory-entry "gimp-scale-tool-dialog") + (position 1024 445) + (monitor 1)) (hide-docks no) (single-window-mode yes) diff --git a/gimp/.config/GIMP/2.10/tags.xml b/gimp/.config/GIMP/2.10/tags.xml index 6341b9d87..3063d89dd 100755 --- a/gimp/.config/GIMP/2.10/tags.xml +++ b/gimp/.config/GIMP/2.10/tags.xml @@ -1423,7 +1423,7 @@ - + @@ -5629,6 +5629,9 @@ + + + @@ -9226,6 +9229,9 @@ + + + @@ -10018,6 +10024,9 @@ + + + diff --git a/gimp/.config/GIMP/2.10/tool-options/gimp-airbrush-tool b/gimp/.config/GIMP/2.10/tool-options/gimp-airbrush-tool index f942b8099..8a3df9f3e 100644 --- a/gimp/.config/GIMP/2.10/tool-options/gimp-airbrush-tool +++ b/gimp/.config/GIMP/2.10/tool-options/gimp-airbrush-tool @@ -1,6 +1,6 @@ # GIMP gimp-airbrush-tool options -(foreground (color-rgb 0.49411764705882355 0.49411764705882355 1)) +(foreground (color-rgb 0.1803921568627451 0.20392156862745098 0.25098039215686274)) (brush "2. Hardness 025") (dynamics "Dynamics Off") (gradient "FG to BG (RGB)") diff --git a/gimp/.config/GIMP/2.10/tool-options/gimp-bucket-fill-tool b/gimp/.config/GIMP/2.10/tool-options/gimp-bucket-fill-tool index 030d40710..116e3f741 100644 --- a/gimp/.config/GIMP/2.10/tool-options/gimp-bucket-fill-tool +++ b/gimp/.config/GIMP/2.10/tool-options/gimp-bucket-fill-tool @@ -1,6 +1,6 @@ # GIMP gimp-bucket-fill-tool options -(foreground (color-rgb 0.49411764705882355 0.49411764705882355 1)) +(foreground (color-rgb 0.1803921568627451 0.20392156862745098 0.25098039215686274)) (pattern "Pine") (brush-size 51) (brush-hardness 0.5) diff --git a/gimp/.config/GIMP/2.10/tool-options/gimp-clone-tool b/gimp/.config/GIMP/2.10/tool-options/gimp-clone-tool index 3ff14f7d5..d6957fcbf 100644 --- a/gimp/.config/GIMP/2.10/tool-options/gimp-clone-tool +++ b/gimp/.config/GIMP/2.10/tool-options/gimp-clone-tool @@ -1,6 +1,6 @@ # GIMP gimp-clone-tool options -(foreground (color-rgb 0.49411764705882355 0.49411764705882355 1)) +(foreground (color-rgb 0.1803921568627451 0.20392156862745098 0.25098039215686274)) (brush "2. Hardness 025") (dynamics "Dynamics Off") (pattern "Pine") diff --git a/gimp/.config/GIMP/2.10/tool-options/gimp-color-picker-tool b/gimp/.config/GIMP/2.10/tool-options/gimp-color-picker-tool index d6b0c0c96..8cddf7f1c 100644 --- a/gimp/.config/GIMP/2.10/tool-options/gimp-color-picker-tool +++ b/gimp/.config/GIMP/2.10/tool-options/gimp-color-picker-tool @@ -1,5 +1,5 @@ # GIMP gimp-color-picker-tool options -(foreground (color-rgb 0.49411764705882355 0.49411764705882355 1)) +(foreground (color-rgb 0.1803921568627451 0.20392156862745098 0.25098039215686274)) # end of gimp-color-picker-tool options diff --git a/gimp/.config/GIMP/2.10/tool-options/gimp-convolve-tool b/gimp/.config/GIMP/2.10/tool-options/gimp-convolve-tool index d1746824d..155adbffd 100644 --- a/gimp/.config/GIMP/2.10/tool-options/gimp-convolve-tool +++ b/gimp/.config/GIMP/2.10/tool-options/gimp-convolve-tool @@ -1,6 +1,6 @@ # GIMP gimp-convolve-tool options -(foreground (color-rgb 0.49411764705882355 0.49411764705882355 1)) +(foreground (color-rgb 0.1803921568627451 0.20392156862745098 0.25098039215686274)) (brush "2. Hardness 025") (dynamics "Dynamics Off") (palette "Standard") diff --git a/gimp/.config/GIMP/2.10/tool-options/gimp-crop-tool b/gimp/.config/GIMP/2.10/tool-options/gimp-crop-tool index b0981e4dd..e2b79dfd7 100644 --- a/gimp/.config/GIMP/2.10/tool-options/gimp-crop-tool +++ b/gimp/.config/GIMP/2.10/tool-options/gimp-crop-tool @@ -4,7 +4,7 @@ (aspect-numerator 1152) (desired-fixed-size-height 0) (desired-fixed-size-width 0) -(foreground (color-rgb 0.49411764705882355 0.49411764705882355 1)) +(foreground (color-rgb 0.1803921568627451 0.20392156862745098 0.25098039215686274)) (pattern "Pine") # end of gimp-crop-tool options diff --git a/gimp/.config/GIMP/2.10/tool-options/gimp-dodge-burn-tool b/gimp/.config/GIMP/2.10/tool-options/gimp-dodge-burn-tool index 34bc27dd3..42e4e4bec 100644 --- a/gimp/.config/GIMP/2.10/tool-options/gimp-dodge-burn-tool +++ b/gimp/.config/GIMP/2.10/tool-options/gimp-dodge-burn-tool @@ -1,6 +1,6 @@ # GIMP gimp-dodge-burn-tool options -(foreground (color-rgb 0.49411764705882355 0.49411764705882355 1)) +(foreground (color-rgb 0.1803921568627451 0.20392156862745098 0.25098039215686274)) (brush "2. Hardness 025") (dynamics "Dynamics Off") (palette "Standard") diff --git a/gimp/.config/GIMP/2.10/tool-options/gimp-eraser-tool b/gimp/.config/GIMP/2.10/tool-options/gimp-eraser-tool index 6cff05ddd..dc3031b91 100644 --- a/gimp/.config/GIMP/2.10/tool-options/gimp-eraser-tool +++ b/gimp/.config/GIMP/2.10/tool-options/gimp-eraser-tool @@ -1,6 +1,6 @@ # GIMP gimp-eraser-tool options -(foreground (color-rgb 0.49411764705882355 0.49411764705882355 1)) +(foreground (color-rgb 0.1803921568627451 0.20392156862745098 0.25098039215686274)) (brush "2. Hardness 025") (dynamics "Dynamics Off") (palette "Standard") diff --git a/gimp/.config/GIMP/2.10/tool-options/gimp-foreground-select-tool b/gimp/.config/GIMP/2.10/tool-options/gimp-foreground-select-tool index 1b28b97c8..371c65801 100644 --- a/gimp/.config/GIMP/2.10/tool-options/gimp-foreground-select-tool +++ b/gimp/.config/GIMP/2.10/tool-options/gimp-foreground-select-tool @@ -1,5 +1,5 @@ # GIMP gimp-foreground-select-tool options -(foreground (color-rgb 0.49411764705882355 0.49411764705882355 1)) +(foreground (color-rgb 0.1803921568627451 0.20392156862745098 0.25098039215686274)) # end of gimp-foreground-select-tool options diff --git a/gimp/.config/GIMP/2.10/tool-options/gimp-gradient-tool b/gimp/.config/GIMP/2.10/tool-options/gimp-gradient-tool index aa2fea8fe..030c2b066 100644 --- a/gimp/.config/GIMP/2.10/tool-options/gimp-gradient-tool +++ b/gimp/.config/GIMP/2.10/tool-options/gimp-gradient-tool @@ -1,6 +1,6 @@ # GIMP gimp-gradient-tool options -(foreground (color-rgb 0.49411764705882355 0.49411764705882355 1)) +(foreground (color-rgb 0.1803921568627451 0.20392156862745098 0.25098039215686274)) (gradient "FG to BG (RGB)") (brush-size 51) (brush-spacing 0.050000000000000003) diff --git a/gimp/.config/GIMP/2.10/tool-options/gimp-heal-tool b/gimp/.config/GIMP/2.10/tool-options/gimp-heal-tool index 708b6728a..35d3cd416 100644 --- a/gimp/.config/GIMP/2.10/tool-options/gimp-heal-tool +++ b/gimp/.config/GIMP/2.10/tool-options/gimp-heal-tool @@ -1,6 +1,6 @@ # GIMP gimp-heal-tool options -(foreground (color-rgb 0.49411764705882355 0.49411764705882355 1)) +(foreground (color-rgb 0.1803921568627451 0.20392156862745098 0.25098039215686274)) (brush "2. Hardness 025") (dynamics "Dynamics Off") (palette "Standard") diff --git a/gimp/.config/GIMP/2.10/tool-options/gimp-ink-tool b/gimp/.config/GIMP/2.10/tool-options/gimp-ink-tool index 7d0c13781..ce0a27878 100644 --- a/gimp/.config/GIMP/2.10/tool-options/gimp-ink-tool +++ b/gimp/.config/GIMP/2.10/tool-options/gimp-ink-tool @@ -1,6 +1,6 @@ # GIMP gimp-ink-tool options -(foreground (color-rgb 0.49411764705882355 0.49411764705882355 1)) +(foreground (color-rgb 0.1803921568627451 0.20392156862745098 0.25098039215686274)) (brush-size 51) (brush-hardness 0.5) diff --git a/gimp/.config/GIMP/2.10/tool-options/gimp-mypaint-brush-tool b/gimp/.config/GIMP/2.10/tool-options/gimp-mypaint-brush-tool index 3a4a16a1a..5772af9c5 100644 --- a/gimp/.config/GIMP/2.10/tool-options/gimp-mypaint-brush-tool +++ b/gimp/.config/GIMP/2.10/tool-options/gimp-mypaint-brush-tool @@ -1,6 +1,6 @@ # GIMP gimp-mypaint-brush-tool options -(foreground (color-rgb 0.49411764705882355 0.49411764705882355 1)) +(foreground (color-rgb 0.1803921568627451 0.20392156862745098 0.25098039215686274)) (mybrush "100% Opaque") (brush-size 51) (brush-hardness 0.5) diff --git a/gimp/.config/GIMP/2.10/tool-options/gimp-operation-tool b/gimp/.config/GIMP/2.10/tool-options/gimp-operation-tool index 1d9d0c509..0020038ad 100644 --- a/gimp/.config/GIMP/2.10/tool-options/gimp-operation-tool +++ b/gimp/.config/GIMP/2.10/tool-options/gimp-operation-tool @@ -1,5 +1,5 @@ # GIMP gimp-operation-tool options -(foreground (color-rgb 0.49411764705882355 0.49411764705882355 1)) +(foreground (color-rgb 0.1803921568627451 0.20392156862745098 0.25098039215686274)) # end of gimp-operation-tool options diff --git a/gimp/.config/GIMP/2.10/tool-options/gimp-paintbrush-tool b/gimp/.config/GIMP/2.10/tool-options/gimp-paintbrush-tool index 267e6b336..9b51ae225 100644 --- a/gimp/.config/GIMP/2.10/tool-options/gimp-paintbrush-tool +++ b/gimp/.config/GIMP/2.10/tool-options/gimp-paintbrush-tool @@ -1,6 +1,6 @@ # GIMP gimp-paintbrush-tool options -(foreground (color-rgb 0.49411764705882355 0.49411764705882355 1)) +(foreground (color-rgb 0.1803921568627451 0.20392156862745098 0.25098039215686274)) (brush "2. Hardness 025") (dynamics "Dynamics Off") (gradient "FG to BG (RGB)") diff --git a/gimp/.config/GIMP/2.10/tool-options/gimp-pencil-tool b/gimp/.config/GIMP/2.10/tool-options/gimp-pencil-tool index b3b4e0e7e..04381f2e8 100644 --- a/gimp/.config/GIMP/2.10/tool-options/gimp-pencil-tool +++ b/gimp/.config/GIMP/2.10/tool-options/gimp-pencil-tool @@ -1,6 +1,6 @@ # GIMP gimp-pencil-tool options -(foreground (color-rgb 0.49411764705882355 0.49411764705882355 1)) +(foreground (color-rgb 0.1803921568627451 0.20392156862745098 0.25098039215686274)) (brush "2. Hardness 025") (dynamics "Dynamics Off") (gradient "FG to BG (RGB)") diff --git a/gimp/.config/GIMP/2.10/tool-options/gimp-perspective-clone-tool b/gimp/.config/GIMP/2.10/tool-options/gimp-perspective-clone-tool index 7c84c362a..769c440d6 100644 --- a/gimp/.config/GIMP/2.10/tool-options/gimp-perspective-clone-tool +++ b/gimp/.config/GIMP/2.10/tool-options/gimp-perspective-clone-tool @@ -1,6 +1,6 @@ # GIMP gimp-perspective-clone-tool options -(foreground (color-rgb 0.49411764705882355 0.49411764705882355 1)) +(foreground (color-rgb 0.1803921568627451 0.20392156862745098 0.25098039215686274)) (brush "2. Hardness 025") (dynamics "Dynamics Off") (pattern "Pine") diff --git a/gimp/.config/GIMP/2.10/tool-options/gimp-smudge-tool b/gimp/.config/GIMP/2.10/tool-options/gimp-smudge-tool index 3d55ad707..2b736a93c 100644 --- a/gimp/.config/GIMP/2.10/tool-options/gimp-smudge-tool +++ b/gimp/.config/GIMP/2.10/tool-options/gimp-smudge-tool @@ -1,6 +1,6 @@ # GIMP gimp-smudge-tool options -(foreground (color-rgb 0.49411764705882355 0.49411764705882355 1)) +(foreground (color-rgb 0.1803921568627451 0.20392156862745098 0.25098039215686274)) (brush "2. Hardness 025") (dynamics "Dynamics Off") (gradient "FG to BG (RGB)") diff --git a/gimp/.config/GIMP/2.10/tool-options/gimp-text-tool b/gimp/.config/GIMP/2.10/tool-options/gimp-text-tool index b053f4bba..dc83fe1b2 100644 --- a/gimp/.config/GIMP/2.10/tool-options/gimp-text-tool +++ b/gimp/.config/GIMP/2.10/tool-options/gimp-text-tool @@ -1,6 +1,6 @@ # GIMP gimp-text-tool options -(foreground (color-rgb 0.49411764705882355 0.49411764705882355 1)) +(foreground (color-rgb 0.1803921568627451 0.20392156862745098 0.25098039215686274)) (palette "Standard") (font "AajaxSurrealFreak") (font-size 24) diff --git a/gimp/.config/GIMP/2.10/tool-options/gimp-vector-tool b/gimp/.config/GIMP/2.10/tool-options/gimp-vector-tool index 2f3dd79ed..d8bd9136f 100644 --- a/gimp/.config/GIMP/2.10/tool-options/gimp-vector-tool +++ b/gimp/.config/GIMP/2.10/tool-options/gimp-vector-tool @@ -1,6 +1,6 @@ # GIMP gimp-vector-tool options -(foreground (color-rgb 0.49411764705882355 0.49411764705882355 1)) +(foreground (color-rgb 0.1803921568627451 0.20392156862745098 0.25098039215686274)) (brush "2. Hardness 025") (dynamics "Dynamics Off") (pattern "Pine") diff --git a/gtk-2.0/.gtkrc-2.0 b/gtk-2.0/.gtkrc-2.0 index f618ef562..055e3f209 100644 --- a/gtk-2.0/.gtkrc-2.0 +++ b/gtk-2.0/.gtkrc-2.0 @@ -1,5 +1,6 @@ -gtk-theme-name="themix-Dracula" -gtk-icon-theme-name="themix-Dracula" +include "/home/repo/.gtkrc-2.0.mine" +gtk-theme-name="Minimal-Mistakes" +gtk-icon-theme-name="Papirus-Minimal-Mistakes" gtk-font-name="SauceCodePro Nerd Font 10" gtk-cursor-theme-name="capitaine-cursors-light" gtk-cursor-theme-size=0 @@ -11,6 +12,6 @@ gtk-enable-event-sounds=1 gtk-enable-input-feedback-sounds=1 gtk-xft-antialias=1 gtk-xft-hinting=1 -gtk-xft-hintstyle="hintslight" +gtk-xft-hintstyle="hintmedium" gtk-xft-rgba="rgb" gtk-modules="gail:atk-bridge" diff --git a/gtk-3.0/.config/gtk-3.0/settings.ini b/gtk-3.0/.config/gtk-3.0/settings.ini index f5a865cec..da26ccbaa 100644 --- a/gtk-3.0/.config/gtk-3.0/settings.ini +++ b/gtk-3.0/.config/gtk-3.0/settings.ini @@ -1,6 +1,6 @@ [Settings] -gtk-theme-name=themix-Dracula -gtk-icon-theme-name=themix-Dracula +gtk-theme-name=Minimal-Mistakes +gtk-icon-theme-name=Papirus-Minimal-Mistakes gtk-font-name=SauceCodePro Nerd Font 10 gtk-cursor-theme-name=capitaine-cursors-light gtk-cursor-theme-size=0 diff --git a/gtk-4.0/.config/gtk-4.0/settings.ini b/gtk-4.0/.config/gtk-4.0/settings.ini index 8509d1856..56d9c57a5 100644 --- a/gtk-4.0/.config/gtk-4.0/settings.ini +++ b/gtk-4.0/.config/gtk-4.0/settings.ini @@ -1,12 +1,18 @@ [Settings] +gtk-theme-name=Minimal-Mistakes +gtk-icon-theme-name=Papirus-Minimal-Mistakes +gtk-font-name=SauceCodePro Nerd Font 10 +gtk-cursor-theme-name=capitaine-cursors-light +gtk-cursor-theme-size=0 +gtk-toolbar-style=GTK_TOOLBAR_BOTH +gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR gtk-application-prefer-dark-theme=true gtk-button-images=true -gtk-cursor-theme-name=breeze_cursors -gtk-cursor-theme-size=0 -gtk-cursor-theme-name=capitaine-cursors-light -gtk-enable-animations=true -gtk-font-name=SauceCodePro Nerd Font 10 -gtk-icon-theme-name=themix-Dracula gtk-menu-images=true -gtk-primary-button-warps-slider=false -gtk-toolbar-style=3 +gtk-enable-event-sounds=true +gtk-enable-input-feedback-sounds=true +gtk-xft-antialias=true +gtk-xft-hinting=true +gtk-xft-hintstyle=hintmedium +gtk-xft-rgba=rgb +gtk-modules=gail:atk-bridge diff --git a/i3/.config/i3/config b/i3/.config/i3/config index 351515b0b..584977d4b 100644 --- a/i3/.config/i3/config +++ b/i3/.config/i3/config @@ -591,6 +591,7 @@ assign [class="(?i)Alacritty|Kitty"] # Workspace $ws2 Text Editor assign [class="(?i)Nvim|Jetbrains"] → $ws2 +assign [class="(?i)Code|Atom"] → $ws2 # Workspace $ws3 Files assign [class="(?i)Nemo"] → $ws3 diff --git a/inkscape/.config/inkscape/preferences.xml b/inkscape/.config/inkscape/preferences.xml index 35110b504..7d6014e57 100644 --- a/inkscape/.config/inkscape/preferences.xml +++ b/inkscape/.config/inkscape/preferences.xml @@ -203,8 +203,8 @@ usepressure="1" usetilt="0" keep_selected="1" - abs_width="1" - unit="mm"> + abs_width="0" + unit="px"> + darkTheme="0" /> diff --git a/kitty/.config/kitty/colors.conf b/kitty/.config/kitty/colors.conf index b5b9bc81c..37fede610 100644 --- a/kitty/.config/kitty/colors.conf +++ b/kitty/.config/kitty/colors.conf @@ -1,35 +1,35 @@ -# ColorScheme themix-Dracula - kitty color config -# Scheme by themix-Dracula -background #282a36 -foreground #f8f8f2 -selection_background #acb6ff -selection_foreground #282a36 -url_color #8be9fd -cursor #f8f8f2 -active_border_color #f8f8f2 -inactive_border_color #4d4d4d -active_tab_background #f8f8f2 -active_tab_foreground #4d4d4d -inactive_tab_background #f8f8f2 +# ColorScheme themix-MinimalMistakes - kitty color config +# Scheme by themix-MinimalMistakes +background #283036 +foreground #e5e9f0 +selection_background #81a0c1 +selection_foreground #283036 +url_color #59fff9 +cursor #e5e9f0 +active_border_color #e5e9f0 +inactive_border_color #4d4d4d +active_tab_background #e5e9f0 +active_tab_foreground #4d4d4d +inactive_tab_background #e5e9f0 inactive_tab_foreground #4d4d4d -tab_bar_background #f8f8f2 +tab_bar_background #e5e9f0 # normal -color0 #21222c -color1 #ff5555 -color2 #50fa7b -color3 #f1fa8c -color4 #93adf9 -color5 #ff79c6 -color6 #8be9fd -color7 #f8f8f2 +color0 #283036 +color1 #ff5959 +color2 #59ff59 +color3 #ffff59 +color4 #9059ff +color5 #ff59f9 +color6 #59fff9 +color7 #e5e9f0 # bright -color8 #4d4d4d -color9 #ff6e6e -color10 #69ff94 -color11 #ffffa5 -color12 #acb6ff -color13 #ff92df -color14 #a4ffff -color15 #ffffff +color8 #43515e +color9 #ffa6a6 +color10 #a6ffa6 +color11 #ffffa6 +color12 #c5a6ff +color13 #ffa6fc +color14 #a6fffc +color15 #e5e9f0 diff --git a/kritarc/.config/kritarc b/kritarc/.config/kritarc index b15901907..5bd510038 100644 --- a/kritarc/.config/kritarc +++ b/kritarc/.config/kritarc @@ -35,8 +35,8 @@ Krita/Ocio/OcioConfigPath= Krita/Ocio/OcioLockColorVisualRepresentation=false Krita/Ocio/OcioLutPath= Krita/Ocio/UseOcio=false -LastBackGroundColor=\n\n \n\n -LastForeGroundColor=\n\n \n\n +LastBackGroundColor=\n\n \n\n +LastForeGroundColor=\n\n \n\n LastPreset=b) Basic-5 Size LastPreset_-1=b) Basic-5 Size LineSmoothingDelayDistance=50 @@ -507,12 +507,14 @@ File3[$e]=$HOME/Documents/Declaration-Against-Discrimination.pdf File4[$e]=$HOME/Pictures/endeavour-logo-sans-logotype.svg File5[$e]=$HOME/Pictures/screenie/1640362006.png File6[$e]=/mnt/500GB/.gitlabs/Arch.TheRepo.Club/favicon.ico +File7[$e]=/mnt/500GB/.gitlabs/minimal-mistakes/website/static/img/favicon.ico Name1[$e]=Letter.png Name2[$e]=colors.png Name3[$e]=Declaration-Against-Discrimination.pdf Name4[$e]=endeavour-logo-sans-logotype.svg Name5[$e]=1640362006.png Name6[$e]=favicon.ico +Name7[$e]=favicon.ico [SelectedTags] brushes=All diff --git a/licenses/.config/license.conf b/licenses/.config/license.conf index d68d028fb..8a4133239 100644 --- a/licenses/.config/license.conf +++ b/licenses/.config/license.conf @@ -1,3 +1,5 @@ #!/usr/bin/env sh -export AUTHOR_FULL_NAME='The-Repo-Club' +export AUTHOR_NAME='The-Repo-Club' export AUTHOR_EMAIL='wayne6324@gmail.com' +export AUTHOR_WEBSITE='https://therepo.club/' +export LICENSE_DIR='/home/repo/.config/licenses' diff --git a/localbin/.local/bin/lmgr b/localbin/.local/bin/lmgr index f7f7e18cd..6fa7e7dc2 100755 --- a/localbin/.local/bin/lmgr +++ b/localbin/.local/bin/lmgr @@ -1,22 +1,77 @@ -#!/usr/bin/env bash -# -*-coding:utf-8 -*- -# ------------------------------------------------------------------------- -# Path - /home/repo/.local/bin/lmgr -# GitHub - https://github.com/The-Repo-Club/ -# Author - The-Repo-Club [wayne6324@gmail.com] -# Start On - Sun 23 January 2022, 11:51:17 am (GMT) -# Modified On - Sun 06 February 2022, 11:53:51 am (GMT) -# ------------------------------------------------------------------------- -Version=2022.02.06 -# ------------------------------------------------------------------------- +#!/usr/bin/env sh + +# Licensed under ArArv2 license: https://files.ari-web.xyz/files/ArAr.ari-archer.LICENSE +# Description: manage, switch and template licenses + +# DEPENDS ON: +# general utilities: coreutils [head, awk, ...] +# license picker: fzf (optional) +# automatic config generation: git (optional) +# colours: ncurses (optional) [tput] set -e +VERSION='0.8' + +# Init + +[ -z "$HOME" ] && HOME="$(eval echo '~')" + +depend() { command -v -- "$1" >/dev/null || (echo "FATAL: depend(): Dependency '$1' broken" 1>&2 && exit 11); } + +# Colours (requires ncurses) + +if [ "$LMGR_COLOURS" != 0 ]; then + depend 'tput' + + RED=$(tput setaf 1) + GREEN=$(tput setaf 2) + YELLOW=$(tput setaf 3) + BRIGHT=$(tput bold) + RESET=$(tput sgr0) +fi + +# Aliases + +alias lless='less -NrIMJ --use-color --incsearch --line-num-width=2' +alias ffind='find -L' + +# Constants + +LICENSE_DIR="$HOME/.config/licenses" +LICENSE_SED='s/^@//' + +# Utility functions + +error() { printf " ${RED}*${RESET} %s\n" "$1" 1>&2; } +warn() { printf " ${YELLOW}*${RESET} %s\n" "$1" 1>&2; } +info() { printf " ${GREEN}*${RESET} %s\n" "$1"; } +einfo() { printf " ${BRIGHT}*${RESET} %s\n" "$1"; } + +check_valid_license() { + lic="$(echo "$1" | sed "$LICENSE_SED")" + echo "$1" | grep -qi '^@' || (error "License '$lic' is not valid" && exit 9) + [ ! -f "$LICENSE_DIR"/"$lic" ] && (error "License '$lic' does not exist" && exit 10) + + return 0 +} + +sed_escape() { echo "$1" | sed -e 's/[\/&]/\\&/g'; } + +# Functions + +list_licenses() { ffind "$LICENSE_DIR" -maxdepth 1 -type f -printf " ${BRIGHT}*${RESET} @%f\n"; } + usage() { - echo " License manager v$Version" + echo " License manager v$VERSION" echo ' manage, switch and template licenses' echo '' - echo " $(basename "$0") " + echo " \$AUTHOR_NAME -- '$AUTHOR_NAME'" + echo " \$AUTHOR_EMAIL -- '$AUTHOR_EMAIL'" + echo " \$AUTHOR_WEBSITE -- '$AUTHOR_WEBSITE'" + echo " \$LICENSE_DIR -- '$LICENSE_DIR'" + echo '' + echo " [ENV=VAL ...] $(basename "$0") " echo '' echo ' -help --help -h show usage' echo ' -list-licenses -l list awailable licenses' @@ -25,137 +80,257 @@ usage() { echo ' -preview-license -P @license_name preview a license template' echo ' -remove-license -r remove all licenses from the current project' echo " -search-license -s '' search for license" -} - -error() { - if ! [ "$2" -eq "$2" ] 2>/dev/null; then - echo 'error(): argument 2 was expected to be an intager.' - exit 3 - fi - - echo " * ERROR: $1" 1>&2 - exit "$2" -} - -warn() { - echo " * WARNING: $1" 1>&2 -} - -list_licenses() { - if ! [ -d "${HOME}"/.config/licenses ]; then - warn "${HOME}/.config/licenses does not exist. Creating it." - mkdir -p "${HOME}"/.config/licenses - fi - - find -L "${HOME}"/.config/licenses -maxdepth 1 -type f -printf " * @%f\n" + echo ' -template-help -T print help for templating' + echo ' -new-template -t create a new license template' + echo ' -delete-license -R @license_name ... delete a license from templates' + echo ' -new-config -C create a default config overwriting current one' + echo ' -check-conflict -k check if current licene(s) are conflicting' + echo '' + echo " LMGR_COLOURS=0|[1] turn colour on (1) or off (0) [${LMGR_COLOURS:-1}]" } make_new_config() { - mkdir -p "${HOME}"/.config + mkdir -p "$HOME"/.config { echo '#!/usr/bin/env sh' - echo "export AUTHOR_FULL_NAME='$(git config user.name || echo "${USER}")'" + echo "export AUTHOR_NAME='$(git config user.name || echo "${USER}")'" echo "export AUTHOR_EMAIL='$(git config user.email || echo "${USER}@gmail.com")'" - } >"${HOME}"/.config/license.conf + echo "export AUTHOR_WEBSITE='https://example.com/'" + echo "export LICENSE_DIR='$LICENSE_DIR'" + } >"$HOME"/.config/license.conf } show_license() { + depend 'head' + l_name='LICENSE' - if [ -f UNLICENSE ]; then - l_name='UNLICENSE' - fi + [ -f UNLICENSE ] && l_name='UNLICENSE' if [ -f "$l_name" ]; then head -n1 "$l_name" | sed 's/^\s*//; s/\s*$//' else - echo 'Strong copyright (no license)' + echo 'strong copyright (no license)' fi } +check_license_conflict() { + if [ -f ./LICENSE ] && [ -f ./UNLICENSE ]; then + error 'Licensing conflict: UNLICENSE and LICENSE both found' + + printf ' Do you either (1) Remove LICENSE or (2) Remove UNLICENSE? [1/2] ' + read -r lr + + case "$lr" in + 1) rm LICENSE ;; + 2) rm UNLICENSE ;; + *) error "'$lr' is not an option" && exit 1 ;; + esac || (error 'Could not resolve licensing conflict' && exit 6) + fi + +} + get_license() { - if ! [ -f "${HOME}"/.config/licenses/"$1" ]; then - echo " * No licence by the name of $1" 1>&2 + depend 'cp' + check_valid_license "$1" + + check_license_conflict + + user_license="$(echo "$1" | sed "$LICENSE_SED")" + + if [ ! -f "$LICENSE_DIR"/"$user_license" ]; then + error "No licence by the name of '$1'" list_licenses - echo ' * Use of of the above' + error 'Use of of the above' exit 5 elif [ -f ./LICENSE ] || [ -f ./UNLICENSE ]; then - echo " * Found license: $(show_license)" + info "Found license: $(show_license)" printf ' Switch licenses? [y/n] ' read -r yn - if ! [ "$yn" = "y" ]; then - exit - fi + [ ! "$yn" = "y" ] && exit fi l_name='LICENSE' - if [ "$(head -n1 "${HOME}"/.config/licenses/"$1")" = 'UNLICENSE' ]; then - l_name='UNLICENSE' - fi + [ "$(head -n1 "$LICENSE_DIR"/"$user_license")" = 'UNLICENSE' ] && l_name='UNLICENSE' - cp -fiL "${HOME}"/.config/licenses/"$1" "$l_name" + cp -fiL "$LICENSE_DIR"/"$user_license" "$l_name" sed -i "$l_name" \ - -e "s/{{PROJECT_NAME}}/$(basename "$PWD")/g" \ - -e "s/{{CURRENT_YEAR}}/$(date '+%Y')/g" \ - -e "s/{{AUTHOR_NAME}}/${AUTHOR_FULL_NAME}/g" \ - -e "s/{{AUTHOR_EMAIL}}/$AUTHOR_EMAIL/g" + -e "s/{{PROJECT_NAME}}/$(sed_escape "$(basename "$PWD")")/g" \ + -e "s/{{CURRENT_YEAR}}/$(sed_escape "$(date '+%Y')")/g" \ + -e "s/{{AUTHOR_NAME}}/$(sed_escape "$AUTHOR_NAME")/g" \ + -e "s/{{AUTHOR_EMAIL}}/$(sed_escape "$AUTHOR_EMAIL")/g" \ + -e "s/{{AUTHOR_WEBSITE}}/$(sed_escape "$AUTHOR_WEBSITE")/g" - echo " * Current license now is set to $(show_license)" + check_license_conflict + + info "Current license now is set to $(show_license)" } license_picker() { - license="$(list_licenses | awk '{ print $2 }' | sed 's/^@//' | FZF_DEFAULT_OPTS='' fzf --layout=reverse --height=20 --no-mouse -i --preview "cat ${HOME}/.config/licenses/{}" || echo '')" + depend 'awk' + depend 'fzf' - if ! [ "$license" ]; then + license="$(list_licenses | + awk '{ print $2 }' | + sed "$LICENSE_SED" | + FZF_DEFAULT_OPTS='' fzf --layout=reverse --height=20 --no-mouse -i --preview "cat $LICENSE_DIR/{}" || echo '')" + + if [ -z "$license" ]; then license_picker + return fi - get_license "$license" + get_license "@$license" } search_license() { - for lic in $(list_licenses | awk '{ print $2 }' | sed 's/^@//'); do - if echo "$lic $(head -n5 "${HOME}"/.config/licenses/"$lic")" | grep -iq "$1"; then - echo " * @$lic" + for lic in $(list_licenses | awk '{ print $2 }' | sed "$LICENSE_SED"); do + if echo "$lic $(head -n8 "$LICENSE_DIR"/"$lic")" | grep -iq "$1"; then + einfo "@$lic" fi done } remove_license() { rm -f UNLICENSE LICENSE 2>/dev/null || true - echo " * Current license now is set to $(show_license)" + info "Current license now is set to $(show_license)" +} + +templating_help() { + { + echo 'Templating' + echo '' + echo 'To template a license you need to create a file named' + echo "the same like you want to refer to your license, let's say \`hello\` in this example" + echo "so now create a file called hello in '$LICENSE_DIR/hello'" + echo '' + echo 'Now you can make your license there, now onto templating' + echo '' + echo 'The templating "language" is pretty simple, all syntax goes in {{...}}' + echo 'So the variables are:' + echo ' * {{PROJECT_NAME}} -- The current project name (basename of current directory)' + echo ' * {{CURRENT_YEAR}} -- The current year' + echo " * {{AUTHOR_NAME}} -- The author's full name" + echo " * {{AUTHOR_EMAIL}} -- The author's email" + echo " * {{AUTHOR_WEBSITE}} -- The author's website" + echo '' + echo 'Example of a template: https://raw.githubusercontent.com/TruncatedDinosour/dotfiles-cleaned/gentoo/dotfiles/config/licenses/ArAr2' + } | lless +} + +new_template() { + printf 'License name/alias (spaces will be removed) -- ' + read -r ln + + [ -z "$ln" ] && ( + error 'Cannot leave license name empty' + exit 7 + ) + + ln="$LICENSE_DIR/$(echo "$ln" | tr -d ' ' | head -c250)" + + if [ -f "$ln" ]; then + printf 'This license already exists, do you want to overwrite it? [y/n] ' + read -r yn + + [ "$yn" != 'y' ] && exit + fi + + editor="${EDITOR:-}" + + if [ -z "$editor" ]; then + printf 'Editor to open file in -- ' + read -r editor + fi + + [ -z "$editor" ] && ( + error 'Cannot leave editor empty' + exit 8 + ) + + depend "$(basename "$editor" | awk '{print $1}')" + + set -x + $editor "$ln" + set +x + + [ -f "$ln" ] && einfo "License '$(basename "$ln")' saved" +} + +delete_license() { + check_valid_license "$1" + rm -vi "$LICENSE_DIR"/"$(echo "$1" | sed "$LICENSE_SED")" +} + +new_config() { + einfo "This will overwite your config, are you sure you want do do that?" + printf ' [y/n] ' + read -r yn + + [ "$yn" != 'y' ] && exit + + make_new_config + info 'New config made and saved' } main() { - if [ -f "${HOME}/.config/license.conf" ]; then + if [ -f "$HOME/.config/license.conf" ]; then # shellcheck disable=1091 - . "${HOME}/.config/license.conf" + . "$HOME/.config/license.conf" else warn 'No configuration file found. Creating it.' make_new_config exit 4 fi - if [ ! "$1" ]; then - usage - exit 1 + if [ ! -d "$LICENSE_DIR" ]; then + # shellcheck disable=2088 + warn "'$LICENSE_DIR' does not exist. Creating it." + mkdir -p "$LICENSE_DIR" fi + [ -z "$1" ] && ( + usage + exit 1 + ) + + ffind "$LICENSE_DIR" -not -name . -not -path "$LICENSE_DIR" -prune -not -type f -exec rm -R {} + + + check_license_conflict case "$1" in -help | --help | -h) usage ;; -list-licenses | -l) list_licenses ;; - -current-license | -c) echo " * $(show_license)" ;; + -current-license | -c) einfo "$(show_license)" ;; -pick-license | -p) license_picker ;; - -preview-license | -P) less -NrIMJ --use-color --incsearch --line-num-width=2 "${HOME}"/.config/licenses/"$(echo "$2" | sed 's/^@//')" 2>/dev/null || echo "* License $2 not found" ;; + -preview-license | -P) + check_valid_license "$2" + lless "$LICENSE_DIR"/"$(echo "$2" | sed "$LICENSE_SED")" 2>/dev/null || einfo "License $2 not found" + ;; -remove-license | -r) remove_license ;; -search-license | -s) search_license "$2" ;; + -template-help | -T) templating_help ;; + -new-template | -t) new_template ;; + -delete-license | -R) + tmp_l=0 - @*) get_license "$(echo "$1" | sed 's/^@//')" ;; - *) error "Flag $1 is not known." 2 ;; + for lic in "$@"; do + if [ "$tmp_l" = 0 ]; then + tmp_l=1 + continue + fi + + delete_license "$lic" + done + ;; + -new-config | -C) new_config ;; + -check-conflict | -k) check_license_conflict ;; + + @*) check_valid_license "$1" && get_license "$1" ;; + *) error "Flag $1 is not known." && usage && exit 2 ;; esac } diff --git a/nvim/.config/nvim/init.lua b/nvim/.config/nvim/init.lua index 1eee7d637..9a494694f 100644 --- a/nvim/.config/nvim/init.lua +++ b/nvim/.config/nvim/init.lua @@ -2,7 +2,7 @@ local ok, err = pcall(require, "core") vim.g.dracula_show_end_of_buffer = true -- default false, Turn on or off EndOfBuffer symbol vim.g.dracula_transparent_bg = true -- default false, enables transparent background -vim.cmd[[colorscheme dracula]] +vim.cmd[[colorscheme minimalmistakes]] vim.cmd("hi! link DashboardHeader Error") if not ok then diff --git a/nvim/.config/nvim/lua/custom/configs/lualine.lua b/nvim/.config/nvim/lua/custom/configs/lualine.lua index 28ee8a1af..0d43994be 100644 --- a/nvim/.config/nvim/lua/custom/configs/lualine.lua +++ b/nvim/.config/nvim/lua/custom/configs/lualine.lua @@ -5,17 +5,17 @@ local lualine = require 'lualine' -- Color table for highlights local colors = { - bg = '#282a36', - fg = '#f8f8f2', - yellow = '#f1fa8c', - cyan = '#8be9fd', + bg = '#283036', + fg = '#e5e9f0', + yellow = '#ffff59', + cyan = '#59fff9', darkblue = '#081633', - green = '#50fa7b', - orange = '#ffb86c', - violet = '#bd93f9', - magenta = '#ff79c6', + green = '#59ff59', + orange = '#ff9c59', + violet = '#9059ff', + magenta = '#ff59f9', blue = '#51afef', - red = '#ff5555' + red = '#ff5959' } local conditions = { diff --git a/nvim/.config/nvim/lua/custom/init.lua b/nvim/.config/nvim/lua/custom/init.lua index df70e6995..ed13552e7 100644 --- a/nvim/.config/nvim/lua/custom/init.lua +++ b/nvim/.config/nvim/lua/custom/init.lua @@ -46,7 +46,7 @@ hooks.add("install_plugins", function(use) } use { - "dracula/vim", + "Minimal-Mistakes/vim", } use { "ap/vim-css-color", diff --git a/nvim/.config/nvim/plugin/packer_compiled.lua b/nvim/.config/nvim/plugin/packer_compiled.lua index a8f7baac1..b418fd5e8 100644 --- a/nvim/.config/nvim/plugin/packer_compiled.lua +++ b/nvim/.config/nvim/plugin/packer_compiled.lua @@ -242,7 +242,7 @@ _G.packer_plugins = { url = "https://github.com/windwp/nvim-autopairs" }, ["nvim-cmp"] = { - after = { "nvim-autopairs", "LuaSnip" }, + after = { "LuaSnip", "nvim-autopairs" }, config = { "require('plugins.configs.cmp')" }, load_after = {}, loaded = true, @@ -341,7 +341,7 @@ _G.packer_plugins = { vim = { loaded = true, path = "/home/repo/.local/share/nvim/site/pack/packer/start/vim", - url = "https://github.com/dracula/vim" + url = "https://github.com/Minimal-Mistakes/vim" }, ["vim-clap"] = { loaded = true, @@ -432,21 +432,14 @@ if not vim.g.packer_custom_loader_enabled then vim.g.packer_custom_loader_enabled = true end --- Setup for: telescope.nvim -time([[Setup for telescope.nvim]], true) -try_loadstring("\27LJ\2\n?\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\14telescope\18core.mappings\frequire\0", "setup", "telescope.nvim") -time([[Setup for telescope.nvim]], false) -- Setup for: bufferline.nvim time([[Setup for bufferline.nvim]], true) try_loadstring("\27LJ\2\n@\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\15bufferline\18core.mappings\frequire\0", "setup", "bufferline.nvim") time([[Setup for bufferline.nvim]], false) --- Setup for: dashboard-nvim -time([[Setup for dashboard-nvim]], true) -try_loadstring("\27LJ\2\n?\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\14dashboard\18core.mappings\frequire\0", "setup", "dashboard-nvim") -time([[Setup for dashboard-nvim]], false) -time([[packadd for dashboard-nvim]], true) -vim.cmd [[packadd dashboard-nvim]] -time([[packadd for dashboard-nvim]], false) +-- Setup for: vim-matchup +time([[Setup for vim-matchup]], true) +try_loadstring("\27LJ\2\nS\0\0\3\0\4\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0'\2\3\0B\0\2\1K\0\1\0\16vim-matchup\21packer_lazy_load\15core.utils\frequire\0", "setup", "vim-matchup") +time([[Setup for vim-matchup]], false) -- Setup for: nvim-tree.lua time([[Setup for nvim-tree.lua]], true) try_loadstring("\27LJ\2\n>\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\rnvimtree\18core.mappings\frequire\0", "setup", "nvim-tree.lua") @@ -459,22 +452,25 @@ time([[Setup for nvim-lspconfig]], false) time([[Setup for nvim-comment]], true) try_loadstring("\27LJ\2\n=\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\fcomment\18core.mappings\frequire\0", "setup", "nvim-comment") time([[Setup for nvim-comment]], false) --- Setup for: vim-matchup -time([[Setup for vim-matchup]], true) -try_loadstring("\27LJ\2\nS\0\0\3\0\4\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0'\2\3\0B\0\2\1K\0\1\0\16vim-matchup\21packer_lazy_load\15core.utils\frequire\0", "setup", "vim-matchup") -time([[Setup for vim-matchup]], false) +-- Setup for: dashboard-nvim +time([[Setup for dashboard-nvim]], true) +try_loadstring("\27LJ\2\n?\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\14dashboard\18core.mappings\frequire\0", "setup", "dashboard-nvim") +time([[Setup for dashboard-nvim]], false) +time([[packadd for dashboard-nvim]], true) +vim.cmd [[packadd dashboard-nvim]] +time([[packadd for dashboard-nvim]], false) -- Setup for: gitsigns.nvim time([[Setup for gitsigns.nvim]], true) try_loadstring("\27LJ\2\nU\0\0\3\0\4\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0'\2\3\0B\0\2\1K\0\1\0\18gitsigns.nvim\21packer_lazy_load\15core.utils\frequire\0", "setup", "gitsigns.nvim") time([[Setup for gitsigns.nvim]], false) +-- Setup for: telescope.nvim +time([[Setup for telescope.nvim]], true) +try_loadstring("\27LJ\2\n?\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\14telescope\18core.mappings\frequire\0", "setup", "telescope.nvim") +time([[Setup for telescope.nvim]], false) -- Config for: which-key.nvim time([[Config for which-key.nvim]], true) try_loadstring("\27LJ\2\n8\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\29custom.configs.which-key\frequire\0", "config", "which-key.nvim") time([[Config for which-key.nvim]], false) --- Config for: trim.nvim -time([[Config for trim.nvim]], true) -try_loadstring("\27LJ\2\n3\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\24custom.configs.trim\frequire\0", "config", "trim.nvim") -time([[Config for trim.nvim]], false) -- Config for: dashboard-nvim time([[Config for dashboard-nvim]], true) require('plugins.configs.dashboard') @@ -483,10 +479,17 @@ time([[Config for dashboard-nvim]], false) time([[Config for lualine.nvim]], true) try_loadstring("\27LJ\2\n6\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\27custom.configs.lualine\frequire\0", "config", "lualine.nvim") time([[Config for lualine.nvim]], false) +-- Config for: trim.nvim +time([[Config for trim.nvim]], true) +try_loadstring("\27LJ\2\n3\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\24custom.configs.trim\frequire\0", "config", "trim.nvim") +time([[Config for trim.nvim]], false) -- Load plugins in order defined by `after` time([[Sequenced loading]], true) vim.cmd [[ packadd fzf.vim ]] -vim.cmd [[ packadd cmp-path ]] +vim.cmd [[ packadd cmp-buffer ]] +vim.cmd [[ packadd LuaSnip ]] +-- Config for: LuaSnip +require('plugins.configs.others').luasnip() vim.cmd [[ packadd cmp-cmdline ]] vim.cmd [[ packadd cmp_luasnip ]] vim.cmd [[ packadd cmp-nvim-lsp ]] @@ -494,10 +497,7 @@ vim.cmd [[ packadd cmp-nvim-lua ]] vim.cmd [[ packadd nvim-cmp ]] -- Config for: nvim-cmp require('plugins.configs.cmp') -vim.cmd [[ packadd LuaSnip ]] --- Config for: LuaSnip -require('plugins.configs.others').luasnip() -vim.cmd [[ packadd cmp-buffer ]] +vim.cmd [[ packadd cmp-path ]] vim.cmd [[ packadd nvim-autopairs ]] -- Config for: nvim-autopairs require('plugins.configs.others').autopairs() @@ -505,19 +505,19 @@ time([[Sequenced loading]], false) -- Command lazy-loads time([[Defining lazy-load commands]], true) -pcall(vim.cmd, [[command -nargs=* -range -bang -complete=file CommentToggle lua require("packer.load")({'nvim-comment'}, { cmd = "CommentToggle", l1 = , l2 = , bang = , args = , mods = "" }, _G.packer_plugins)]]) -pcall(vim.cmd, [[command -nargs=* -range -bang -complete=file Telescope lua require("packer.load")({'telescope.nvim'}, { cmd = "Telescope", l1 = , l2 = , bang = , args = , mods = "" }, _G.packer_plugins)]]) pcall(vim.cmd, [[command -nargs=* -range -bang -complete=file NvimTreeFocus lua require("packer.load")({'nvim-tree.lua'}, { cmd = "NvimTreeFocus", l1 = , l2 = , bang = , args = , mods = "" }, _G.packer_plugins)]]) pcall(vim.cmd, [[command -nargs=* -range -bang -complete=file NvimTreeToggle lua require("packer.load")({'nvim-tree.lua'}, { cmd = "NvimTreeToggle", l1 = , l2 = , bang = , args = , mods = "" }, _G.packer_plugins)]]) +pcall(vim.cmd, [[command -nargs=* -range -bang -complete=file Telescope lua require("packer.load")({'telescope.nvim'}, { cmd = "Telescope", l1 = , l2 = , bang = , args = , mods = "" }, _G.packer_plugins)]]) +pcall(vim.cmd, [[command -nargs=* -range -bang -complete=file CommentToggle lua require("packer.load")({'nvim-comment'}, { cmd = "CommentToggle", l1 = , l2 = , bang = , args = , mods = "" }, _G.packer_plugins)]]) time([[Defining lazy-load commands]], false) vim.cmd [[augroup packer_load_aucmds]] vim.cmd [[au!]] -- Event lazy-loads time([[Defining lazy-load event autocommands]], true) -vim.cmd [[au BufRead * ++once lua require("packer.load")({'indent-blankline.nvim', 'nvim-treesitter'}, { event = "BufRead *" }, _G.packer_plugins)]] vim.cmd [[au VimEnter * ++once lua require("packer.load")({'packer.nvim'}, { event = "VimEnter *" }, _G.packer_plugins)]] vim.cmd [[au InsertEnter * ++once lua require("packer.load")({'better-escape.nvim', 'friendly-snippets'}, { event = "InsertEnter *" }, _G.packer_plugins)]] +vim.cmd [[au BufRead * ++once lua require("packer.load")({'indent-blankline.nvim', 'nvim-treesitter'}, { event = "BufRead *" }, _G.packer_plugins)]] time([[Defining lazy-load event autocommands]], false) vim.cmd("augroup END") if should_profile then save_profiles() end diff --git a/oomox/.config/oomox/colors/Minimal-Mistakes/Minimal-Mistakes b/oomox/.config/oomox/colors/Minimal-Mistakes/Minimal-Mistakes new file mode 100644 index 000000000..9c820d099 --- /dev/null +++ b/oomox/.config/oomox/colors/Minimal-Mistakes/Minimal-Mistakes @@ -0,0 +1,73 @@ +ACCENT_BG=ff79c6 +BASE16_GENERATE_DARK=False +BASE16_INVERT_TERMINAL=False +BASE16_MILD_TERMINAL=False +BG=283036 +BTN_BG=283036 +BTN_FG=f8f8f2 +BTN_OUTLINE_OFFSET=-3 +BTN_OUTLINE_WIDTH=1 +CARET1_FG=f8f8f2 +CARET2_FG=f8f8f2 +CARET_SIZE=0.04 +CINNAMON_OPACITY=1.0 +FG=e5e9f0 +GRADIENT=0.0 +GTK3_GENERATE_DARK=False +HDR_BG=283036 +HDR_BTN_BG=44475a +HDR_BTN_FG=f8f8f2 +HDR_FG=e5e9f0 +ICONS_DARK=2e3440 +ICONS_LIGHT=2e3440 +ICONS_LIGHT_FOLDER=2e3440 +ICONS_MEDIUM=2e3440 +ICONS_NUMIX_STYLE=0 +ICONS_STYLE=gnome_colors +ICONS_SYMBOLIC_ACTION=e5e9f0 +ICONS_SYMBOLIC_PANEL=e5e9f0 +MATERIA_PANEL_OPACITY=0.6 +MATERIA_SELECTION_OPACITY=0.32 +MATERIA_STYLE_COMPACT=True +MENU_BG=212121 +MENU_FG=e0e0e0 +NAME="Minimal-Mistakes/Minimal-Mistakes" +OUTLINE_WIDTH=1 +ROUNDNESS=4 +SEL_BG=e5e9f0 +SEL_FG=f8f8f2 +SPACING=3 +SURUPLUS_GRADIENT1=e8e8e8 +SURUPLUS_GRADIENT2=f8f8f2 +SURUPLUS_GRADIENT_ENABLED=False +TERMINAL_ACCENT_COLOR=44475a +TERMINAL_BACKGROUND=283036 +TERMINAL_BASE_TEMPLATE=tempus_winter +TERMINAL_COLOR0=283036 +TERMINAL_COLOR1=ff5959 +TERMINAL_COLOR10=color1 +TERMINAL_COLOR11=ffffa6 +TERMINAL_COLOR12=c5a6ff +TERMINAL_COLOR13=ffa6fc +TERMINAL_COLOR14=a6fffc +TERMINAL_COLOR15=e5e9f0 +TERMINAL_COLOR2=59ff59 +TERMINAL_COLOR3=ffff59 +TERMINAL_COLOR4=9059ff +TERMINAL_COLOR5=ff59f9 +TERMINAL_COLOR6=59fff9 +TERMINAL_COLOR7=e5e9f0 +TERMINAL_COLOR8=43515e +TERMINAL_COLOR9=ffa6a6 +TERMINAL_CURSOR=e5e9f0 +TERMINAL_FOREGROUND=e5e9f0 +TERMINAL_THEME_ACCURACY=122 +TERMINAL_THEME_AUTO_BGFG=True +TERMINAL_THEME_EXTEND_PALETTE=True +TERMINAL_THEME_MODE=manual +THEME_STYLE=materia +TXT_BG=283036 +TXT_FG=f8f8f2 +UNITY_DEFAULT_LAUNCHER_STYLE=False +WM_BORDER_FOCUS=282a36 +WM_BORDER_UNFOCUS=44475a diff --git a/oomox/.config/oomox/colors/TheRepoClub/coffee b/oomox/.config/oomox/colors/TheRepoClub/coffee index 8894d5848..b551baa6e 100644 --- a/oomox/.config/oomox/colors/TheRepoClub/coffee +++ b/oomox/.config/oomox/colors/TheRepoClub/coffee @@ -1,73 +1,73 @@ -ACCENT_BG=83a598 +ACCENT_BG=ff79c6 BASE16_GENERATE_DARK=False BASE16_INVERT_TERMINAL=False BASE16_MILD_TERMINAL=False -BG=d5c4a1 -BTN_BG=665c54 -BTN_FG=fbf1c7 +BG=282A36 +BTN_BG=282A36 +BTN_FG=f8f8f2 BTN_OUTLINE_OFFSET=-3 BTN_OUTLINE_WIDTH=1 -CARET1_FG=3c3836 -CARET2_FG=3c3836 -CARET_SIZE=0.0 +CARET1_FG=f8f8f2 +CARET2_FG=f8f8f2 +CARET_SIZE=0.04 CINNAMON_OPACITY=1.0 -FG=1d2021 +FG=f8f8f2 GRADIENT=0.0 -GTK3_GENERATE_DARK=True -HDR_BG=bdae93 -HDR_BTN_BG=d5c4a1 -HDR_BTN_FG=3c3836 -HDR_FG=3c3836 -ICONS_DARK=303030 -ICONS_LIGHT=d5c4a1 -ICONS_LIGHT_FOLDER=d5c4a1 -ICONS_MEDIUM=87875f +GTK3_GENERATE_DARK=False +HDR_BG=282A36 +HDR_BTN_BG=44475a +HDR_BTN_FG=f8f8f2 +HDR_FG=f8f8f2 +ICONS_DARK=282A36 +ICONS_LIGHT=282A36 +ICONS_LIGHT_FOLDER=282A36 +ICONS_MEDIUM=282A36 ICONS_NUMIX_STYLE=0 ICONS_STYLE=gnome_colors -ICONS_SYMBOLIC_ACTION=686759 -ICONS_SYMBOLIC_PANEL=1d2021 +ICONS_SYMBOLIC_ACTION=e8e8e8 +ICONS_SYMBOLIC_PANEL=eeeeee MATERIA_PANEL_OPACITY=0.6 MATERIA_SELECTION_OPACITY=0.32 MATERIA_STYLE_COMPACT=True -MENU_BG=d5c4a1 -MENU_FG=1d2021 +MENU_BG=212121 +MENU_FG=e0e0e0 NAME="TheRepoClub/coffee" OUTLINE_WIDTH=1 -ROUNDNESS=2 -SEL_BG=83a598 -SEL_FG=1d2021 +ROUNDNESS=4 +SEL_BG=f8f8f2 +SEL_FG=f8f8f2 SPACING=3 -SURUPLUS_GRADIENT1=686759 -SURUPLUS_GRADIENT2=83a598 +SURUPLUS_GRADIENT1=e8e8e8 +SURUPLUS_GRADIENT2=f8f8f2 SURUPLUS_GRADIENT_ENABLED=False -TERMINAL_ACCENT_COLOR=83a598 -TERMINAL_BACKGROUND=303030 -TERMINAL_BASE_TEMPLATE=monovedek -TERMINAL_COLOR0=262220 -TERMINAL_COLOR1=af5f5f -TERMINAL_COLOR10=849155 -TERMINAL_COLOR11=c5c563 -TERMINAL_COLOR12=87afaf -TERMINAL_COLOR13=c987a0 -TERMINAL_COLOR14=7ca296 -TERMINAL_COLOR15=ddd0c0 -TERMINAL_COLOR2=87875f -TERMINAL_COLOR3=bcbc6c -TERMINAL_COLOR4=666c7f -TERMINAL_COLOR5=cd7998 -TERMINAL_COLOR6=6d978a -TERMINAL_COLOR7=bbbbbb -TERMINAL_COLOR8=8f9494 -TERMINAL_COLOR9=bb6868 -TERMINAL_CURSOR=d5c4a1 -TERMINAL_FOREGROUND=a89984 -TERMINAL_THEME_ACCURACY=128 +TERMINAL_ACCENT_COLOR=44475a +TERMINAL_BACKGROUND=282a36 +TERMINAL_BASE_TEMPLATE=tempus_winter +TERMINAL_COLOR0=21222c +TERMINAL_COLOR1=ff5555 +TERMINAL_COLOR10=69ff94 +TERMINAL_COLOR11=ffffa5 +TERMINAL_COLOR12=acb6ff +TERMINAL_COLOR13=ff92df +TERMINAL_COLOR14=a4ffff +TERMINAL_COLOR15=ffffff +TERMINAL_COLOR2=50fa7b +TERMINAL_COLOR3=f1fa8c +TERMINAL_COLOR4=93adf9 +TERMINAL_COLOR5=ff79c6 +TERMINAL_COLOR6=8be9fd +TERMINAL_COLOR7=f8f8f2 +TERMINAL_COLOR8=4d4d4d +TERMINAL_COLOR9=ff6e6e +TERMINAL_CURSOR=f8f8f2 +TERMINAL_FOREGROUND=f8f8f2 +TERMINAL_THEME_ACCURACY=122 TERMINAL_THEME_AUTO_BGFG=True -TERMINAL_THEME_EXTEND_PALETTE=False +TERMINAL_THEME_EXTEND_PALETTE=True TERMINAL_THEME_MODE=manual -THEME_STYLE=oomox -TXT_BG=ebdbb2 -TXT_FG=3c3836 +THEME_STYLE=materia +TXT_BG=282A36 +TXT_FG=f8f8f2 UNITY_DEFAULT_LAUNCHER_STYLE=False -WM_BORDER_FOCUS=83a598 -WM_BORDER_UNFOCUS=bdae93 +WM_BORDER_FOCUS=282a36 +WM_BORDER_UNFOCUS=44475a diff --git a/oomox/.config/oomox/export_config/gtk_theme_oomox.json b/oomox/.config/oomox/export_config/gtk_theme_oomox.json index 815cc2b60..dd57062e1 100644 --- a/oomox/.config/oomox/export_config/gtk_theme_oomox.json +++ b/oomox/.config/oomox/export_config/gtk_theme_oomox.json @@ -1 +1 @@ -{"gtk2_hidpi": true, "OPTION_GTK3_CURRENT_VERSION_ONLY": true, "OPTION_EXPORT_CINNAMON_THEME": true, "default_path": "/home/repo/.themes"} \ No newline at end of file +{"gtk2_hidpi": false, "OPTION_GTK3_CURRENT_VERSION_ONLY": false, "OPTION_EXPORT_CINNAMON_THEME": false, "default_path": "/home/repo/.themes"} \ No newline at end of file diff --git a/oomox/.config/oomox/export_config/icons_suru.json b/oomox/.config/oomox/export_config/icons_suru.json index 50fb96843..e9efbc62b 100644 --- a/oomox/.config/oomox/export_config/icons_suru.json +++ b/oomox/.config/oomox/export_config/icons_suru.json @@ -1 +1 @@ -{"default_path": "/home/repo/.icons"} \ No newline at end of file +{"default_path": "/home/repo/.icons/Suru-Minimal-Mistakes "} \ No newline at end of file diff --git a/oomox/.config/oomox/export_config/materia_theme.json b/oomox/.config/oomox/export_config/materia_theme.json index c1b7f1204..21a1f314f 100644 --- a/oomox/.config/oomox/export_config/materia_theme.json +++ b/oomox/.config/oomox/export_config/materia_theme.json @@ -1 +1 @@ -{"gtk2_hidpi": false, "default_path": "/home/dt/.themes"} \ No newline at end of file +{"gtk2_hidpi": true, "default_path": "/home/dt/.themes"} \ No newline at end of file diff --git a/oomox/.config/oomox/recent_palette.json b/oomox/.config/oomox/recent_palette.json index 77b3cbb3b..37973ab17 100644 --- a/oomox/.config/oomox/recent_palette.json +++ b/oomox/.config/oomox/recent_palette.json @@ -1 +1 @@ -["#2d2d2a2a2e2e", "#43434c4c5e5e", "#2e2e34344040", "#bdde091eb9ca", "#acacb788ffff", "#9393ae26f9f9", "#ffff7979c6c6", "#bdbd9393f9f9", "#e6e6e6e6fafa", "#000080800000", "#62627272a4a4", "#444447475a5a", "#00000000ffff", "#f8f8f8f8f2f2", "#ffffffffffff", "#28282a2a3636"] \ No newline at end of file +["#e5e5e9e9f0f0", "#303030303030", "#2d2d2a2a2e2e", "#43434c4c5e5e", "#2e2e34344040", "#bdde091eb9ca", "#acacb788ffff", "#9393ae26f9f9", "#ffff7979c6c6", "#bdbd9393f9f9", "#e6e6e6e6fafa", "#000080800000", "#62627272a4a4", "#444447475a5a", "#00000000ffff", "#f8f8f8f8f2f2", "#ffffffffffff", "#28282a2a3636"] \ No newline at end of file diff --git a/oomox/.config/oomox/ui_config.json b/oomox/.config/oomox/ui_config.json index 2aeadae63..27430d23f 100644 --- a/oomox/.config/oomox/ui_config.json +++ b/oomox/.config/oomox/ui_config.json @@ -1 +1 @@ -{"window_width": 1902, "window_height": 970, "preset_list_minimal_width": 150, "preset_list_width": 329, "preset_list_sections_expanded": {"presets": false, "plugins": true, "Xresources": false, "Random": false, "Base16": true, "Image colors": true, "user": true, "Base16 User-Imported": true}} \ No newline at end of file +{"window_width": 1902, "window_height": 970, "preset_list_minimal_width": 150, "preset_list_width": 513, "preset_list_sections_expanded": {"presets": false, "plugins": true, "Xresources": false, "Random": false, "Base16": true, "Image colors": true, "user": true, "Base16 User-Imported": true}} \ No newline at end of file diff --git a/package-list/.config/package-list b/package-list/.config/package-list index e32dc5f71..c202b84dd 100644 --- a/package-list/.config/package-list +++ b/package-list/.config/package-list @@ -62,6 +62,7 @@ repomenu-schemas repomenu-schemas repowm repowm-schemas +resvg runescape-launcher sdbus-cpp sddm-endeavour diff --git a/pkgbrowser/.config/pkgbrowser/pkgbrowser.conf b/pkgbrowser/.config/pkgbrowser/pkgbrowser.conf index f5e219a7b..517544780 100644 --- a/pkgbrowser/.config/pkgbrowser/pkgbrowser.conf +++ b/pkgbrowser/.config/pkgbrowser/pkgbrowser.conf @@ -8,10 +8,10 @@ columns=11111100 work-offline=false [search] -strings=ly, zap, i3-gaps, microsoft edge, python3, python, pamac, onivim, nushell, oni, eos-wall, eos-, eos +strings=pkgbrowser, ly, zap, i3-gaps, microsoft edge, python3, python, pamac, onivim, nushell, oni, eos-wall, eos-, eos [window] central-splitter=@ByteArray(\0\0\0\xff\0\0\0\x1\0\0\0\x2\0\0\x1\0\0\0\x1>\0\xff\xff\xff\xff\x1\0\0\0\x1\0) -geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\a\x86\0\0\0 \0\0\xe\xf9\0\0\x4\x17\0\0\a\x87\0\0\0!\0\0\xe\xf8\0\0\x4\x16\0\0\0\x1\0\0\0\0\a\x80\0\0\a\x87\0\0\0!\0\0\xe\xf8\0\0\x4\x16) +geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\vB\0\0\0 \0\0\xe\xf9\0\0\x4\x17\0\0\vC\0\0\0!\0\0\xe\xf8\0\0\x4\x16\0\0\0\x1\0\0\0\0\a\x80\0\0\vC\0\0\0!\0\0\xe\xf8\0\0\x4\x16) left-splitter=@ByteArray(\0\0\0\xff\0\0\0\x1\0\0\0\x2\0\0\0\xc0\0\0\x1\f\0\xff\xff\xff\xff\x1\0\0\0\x2\0) right-splitter=@ByteArray(\0\0\0\xff\0\0\0\x1\0\0\0\x2\0\0\0\xc0\0\0\0\xee\0\xff\xff\xff\xff\x1\0\0\0\x2\0) diff --git a/qt5ct/.config/qt5ct/qt5ct.conf b/qt5ct/.config/qt5ct/qt5ct.conf index 8543ebc79..8644f5d9b 100644 --- a/qt5ct/.config/qt5ct/qt5ct.conf +++ b/qt5ct/.config/qt5ct/qt5ct.conf @@ -1,7 +1,7 @@ [Appearance] -color_scheme_path=/usr/share/qt5ct/colors/themix-Dracula.conf +color_scheme_path=/usr/share/qt5ct/colors/Minimal-Mistakes.conf custom_palette=true -icon_theme=themix-Dracula +icon_theme=Papirus-Minimal-Mistakes standard_dialogs=gtk3 style=Fusion @@ -25,10 +25,10 @@ underline_shortcut=1 wheel_scroll_lines=3 [PaletteEditor] -geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\v\x84\0\0\0\xf4\0\0\xe\xa9\0\0\x3\xa8\0\0\v\x85\0\0\0\xf5\0\0\xe\xa8\0\0\x3\xa7\0\0\0\x1\0\0\0\0\a\x80\0\0\v\x85\0\0\0\xf5\0\0\xe\xa8\0\0\x3\xa7) +geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\vT\0\0\0\xb6\0\0\xey\0\0\x3j\0\0\vU\0\0\0\xb7\0\0\xex\0\0\x3i\0\0\0\x1\0\0\0\0\a\x80\0\0\vU\0\0\0\xb7\0\0\xex\0\0\x3i) [SettingsWindow] -geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\n\"\0\0\0 \0\0\f\xbd\0\0\x4\x17\0\0\n#\0\0\0!\0\0\f\xbc\0\0\x4\x16\0\0\0\x1\0\0\0\0\a\x80\0\0\n#\0\0\0!\0\0\f\xbc\0\0\x4\x16) +geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\v\x2\0\0\0 \0\0\r}\0\0\x4\x17\0\0\v\x3\0\0\0!\0\0\r|\0\0\x4\x16\0\0\0\x1\0\0\0\0\a\x80\0\0\v\x3\0\0\0!\0\0\r|\0\0\x4\x16) [Troubleshooting] force_raster_widgets=1 diff --git a/qt6ct/.config/qt6ct/qt6ct.conf b/qt6ct/.config/qt6ct/qt6ct.conf index 136918f0f..6dfbbb2cd 100644 --- a/qt6ct/.config/qt6ct/qt6ct.conf +++ b/qt6ct/.config/qt6ct/qt6ct.conf @@ -1,7 +1,7 @@ [Appearance] -color_scheme_path=/usr/share/qt6ct/colors/themix-Dracula.conf +color_scheme_path=/usr/share/qt6ct/colors/Minimal-Mistakes.conf custom_palette=true -icon_theme=themix-Dracula +icon_theme=Papirus-Minimal-Mistakes standard_dialogs=default style=Fusion @@ -28,7 +28,7 @@ wheel_scroll_lines=3 geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\n\xcd\0\0\x1\x1e\0\0\rE\0\0\x3\x30\0\0\n\xce\0\0\x1\x1f\0\0\rD\0\0\x3/\0\0\0\x1\0\0\0\0\a\x80\0\0\n\xce\0\0\x1\x1f\0\0\rD\0\0\x3/) [SettingsWindow] -geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\n\"\0\0\0 \0\0\f\xbd\0\0\x4\x17\0\0\n#\0\0\0!\0\0\f\xbc\0\0\x4\x16\0\0\0\x1\0\0\0\0\a\x80\0\0\n#\0\0\0!\0\0\f\xbc\0\0\x4\x16) +geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\a\x86\0\0\x2\x1e\0\0\f\xbd\0\0\x4\x17\0\0\a\x87\0\0\x2\x1f\0\0\f\xbc\0\0\x4\x16\0\0\0\x1\0\0\0\0\a\x80\0\0\a\x87\0\0\x2\x1f\0\0\f\xbc\0\0\x4\x16) [Troubleshooting] force_raster_widgets=1 diff --git a/repomenu/.config/repomenu/repomenu-desktop.db b/repomenu/.config/repomenu/repomenu-desktop.db index 71c599c2d..c4979665e 100644 Binary files a/repomenu/.config/repomenu/repomenu-desktop.db and b/repomenu/.config/repomenu/repomenu-desktop.db differ diff --git a/xed/.config/xed/accels b/xed/.config/xed/accels index 4ed3b2908..1a166b9c6 100644 --- a/xed/.config/xed/accels +++ b/xed/.config/xed/accels @@ -9,7 +9,6 @@ ; (gtk_accel_path "/XedWindowAlwaysSensitiveActions/ViewFullscreen" "F11") ; (gtk_accel_path "/XedWindowActions/FileSaveAll" "l") ; (gtk_accel_path "/XedTextSizePluginActions/NormalSizeAction" "0") -; (gtk_accel_path "/DocumentsListActions/Tab_1" "2") ; (gtk_accel_path "/XedWindowPanesActions/ViewBottomPane" "F9") ; (gtk_accel_path "/XedWindowActions/DocumentsMoveToNewWindow" "") ; (gtk_accel_path "/XedWindowAlwaysSensitiveActions/HelpAbout" "") @@ -29,8 +28,8 @@ ; (gtk_accel_path "/XedWindowActions/EditPaste" "v") ; (gtk_accel_path "/FileBrowserWidgetActionGroup/FilterHidden" "") ; (gtk_accel_path "/XedWindowActions/EditCut" "x") -; (gtk_accel_path "/XedWindowAlwaysSensitiveActions/View" "") ; (gtk_accel_path "/XedWindowPanesActions/ViewSidePane" "F9") +; (gtk_accel_path "/XedWindowAlwaysSensitiveActions/View" "") ; (gtk_accel_path "/XedWindowAlwaysSensitiveActions/File" "") ; (gtk_accel_path "/XedWindowActions/EditSelectAll" "a") ; (gtk_accel_path "/XedWindowAlwaysSensitiveActions/Help" "") @@ -45,11 +44,10 @@ ; (gtk_accel_path "/XedTextSizePluginActions/LargerTextAction" "equal") ; (gtk_accel_path "/XedWindowActions/EditRedo" "y") ; (gtk_accel_path "/FileBrowserWidgetFileSelectionActionGroup/FileOpen" "") -; (gtk_accel_path "/FileBrowserWidgetSingleMostSelectionActionGroup/FileNew" "") ; (gtk_accel_path "/FileBrowserPluginExtra/SetActiveRoot" "") ; (gtk_accel_path "/XedSpellPluginActions/ConfigSpell" "") ; (gtk_accel_path "/XedDocinfoPluginActions/DocumentStatistics" "") -; (gtk_accel_path "/DocumentsListActions/Tab_6" "7") +; (gtk_accel_path "/FileBrowserWidgetSingleMostSelectionActionGroup/FileNew" "") ; (gtk_accel_path "/XedQuitWindowActions/FileQuit" "q") ; (gtk_accel_path "/XedTimePluginActions/InsertDateAndTime" "") ; (gtk_accel_path "/XedWindowActions/EditUndo" "z") @@ -58,27 +56,23 @@ ; (gtk_accel_path "/XedWindowActions/ViewHighlightMode" "h") ; (gtk_accel_path "/XedSortPluginActions/Sort" "F10") ; (gtk_accel_path "/XedWindowActions/SearchFind" "f") -; (gtk_accel_path "/DocumentsListActions/Tab_5" "6") ; (gtk_accel_path "/XedWindowActions/SearchFindPrevious" "g") ; (gtk_accel_path "/FileBrowserWidgetActionGroup/FilterBinary" "") ; (gtk_accel_path "/XedWindowActions/FileCloseAll" "w") -; (gtk_accel_path "/FileBrowserWidgetActionGroupToplevel/FilterMenuAction" "") -; (gtk_accel_path "/DocumentsListActions/Tab_4" "5") ; (gtk_accel_path "/XedWindowAlwaysSensitiveActions/Search" "") -; (gtk_accel_path "/XedWindowActions/FileSaveAs" "s") +; (gtk_accel_path "/FileBrowserWidgetActionGroupToplevel/FilterMenuAction" "") ; (gtk_accel_path "/XedSpellPluginActions/InlineSpellChecker" "") ; (gtk_accel_path "/XedWindowActions/DocumentsPreviousDocument" "Page_Up") ; (gtk_accel_path "/XedWindowActions/EditToggleCommentBlock" "question") -; (gtk_accel_path "/FileBrowserWidgetBookmarkActionGroup/BookmarkOpen" "") ; (gtk_accel_path "/XedWindowAlwaysSensitiveActions/XAppFavoritesMenu" "") ; (gtk_accel_path "/XedWindowAlwaysSensitiveActions/Edit" "") ; (gtk_accel_path "/XedTextSizePluginActions/SmallerTextAction" "minus") -; (gtk_accel_path "/DocumentsListActions/Tab_3" "4") -; (gtk_accel_path "/FileBrowserPluginSingleSelectionExtra/OpenTerminal" "") +; (gtk_accel_path "/XedWindowActions/FileSaveAs" "s") +; (gtk_accel_path "/FileBrowserWidgetBookmarkActionGroup/BookmarkOpen" "") ; (gtk_accel_path "/XedWindowActions/EditCopy" "c") ; (gtk_accel_path "/XedWindowAlwaysSensitiveActions/EditPreferences" "") ; (gtk_accel_path "/XedWindowAlwaysSensitiveActions/FileOpen" "o") -; (gtk_accel_path "/DocumentsListActions/Tab_2" "3") +; (gtk_accel_path "/FileBrowserPluginSingleSelectionExtra/OpenTerminal" "") ; (gtk_accel_path "/XedWindowAlwaysSensitiveActions/FileNew" "n") ; (gtk_accel_path "/XedWindowActions/SearchFindNext" "g") ; (gtk_accel_path "/XedWindowActions/FilePrintPreview" "p") diff --git a/zsh/.config/zsh/aliases/commands.aliases b/zsh/.config/zsh/aliases/commands.aliases index 02f1f3674..6f3b1e183 100755 --- a/zsh/.config/zsh/aliases/commands.aliases +++ b/zsh/.config/zsh/aliases/commands.aliases @@ -52,6 +52,26 @@ alias ports='sudo netstat -tulanp' alias setperm='sudo chown dt:dt' alias ulock='faillock --reset' +function pakman () { + num=1 + while [ -f "/var/lib/pacman/db.lck" ]; do + if [ "$num" -eq "1" ]; then + printf "$Red❯❯ Error$Reset: %s\n" "pacman is in use, will continue after operation." + num=2 + fi + sleep 2 + done + + if [ "$1" != "-c" ]; then + sudo pacman --color auto $@ + else + if pacman -Qtdq; then + pacman -Qtdq | sudo pacman -Rns - + fi + fi + +} + ### Update alias pacman='sudo pacman --color auto' alias yay='yay --color auto' @@ -60,10 +80,10 @@ alias aurupdate='mkdir -p ~/.cache/pkgs && auracle update -C ~/.cache/pkgs' alias checkarch='pacman -Qqen >~/package_list.txt' alias checkaur='pacman -Qqem >~/package_list_aur.txt' #Cleanup orphaned packages -alias cleanup='yay -c' +alias cleanup='pakman -c' # yay as aur helper - updates everything -alias upall="yay -Fy && yay -Syu --noconfirm" +alias upall="pacman -Fy && pacman -Syu --noconfirm && aurupdate" #add new fonts alias update-fc='sudo fc-cache -fv' diff --git a/zsh/.zshrc b/zsh/.zshrc index e120b9322..00da642a4 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -14,24 +14,24 @@ ZSH_PLUGINS="$ZSH_CUSTOM/plugins" ZSH_THEMES="$ZSH_CUSTOM/themes" if [ "$TERM" = "linux" ]; then - printf %b '\e[40m' '\e[8]' # set default background to color 0 'dracula-bg' - printf %b '\e[37m' '\e[8]' # set default foreground to color 7 'dracula-fg' - printf %b '\e]P021222c' # redefine 'black' as 'dracula-bg' - printf %b '\e]P86272a4' # redefine 'bright-black' as 'dracula-comment' - printf %b '\e]P1ff5555' # redefine 'red' as 'dracula-red' - printf %b '\e]P9ff6e6e' # redefine 'bright-red' as '#ff6e6e' - printf %b '\e]P250fa7b' # redefine 'green' as 'dracula-green' - printf %b '\e]PA69ff94' # redefine 'bright-green' as '#69ff94' - printf %b '\e]P3f1fa8c' # redefine 'yellow' as 'dracula-yellow' - printf %b '\e]PBffffa5' # redefine 'bright-yellow' as '#ffffa5' - printf %b '\e]P4bd93f9' # redefine 'blue' as 'dracula-blue' - printf %b '\e]PCd6acff' # redefine 'bright-blue' as '#cfa9ff' - printf %b '\e]P5ff79c6' # redefine 'magenta' as 'dracula-magenta' - printf %b '\e]PDff92df' # redefine 'bright-magenta' as '#ff88e8' - printf %b '\e]P68be9fd' # redefine 'cyan' as 'dracula-cyan' - printf %b '\e]PEa4ffff' # redefine 'bright-cyan' as '#a4ffff' - printf %b '\e]P7f8f8f2' # redefine 'white' as 'dracula-white' - printf %b '\e]PFffffff' # redefine 'bright-white' as '#ffffff' + printf %b '\e[40m' '\e[8]' # set default background to color 0 'Minimal-Mistakes-Background' + printf %b '\e[37m' '\e[8]' # set default foreground to color 7 'Minimal-Mistakes-Foreground' + printf %b '\e]P0283036' # redefine 'Background' as 'Minimal-Mistakes-Background' + printf %b '\e]P8434c5e' # redefine 'Selection' as 'Minimal-Mistakes-Selection' + printf %b '\e]P1ff5959' # redefine 'Red' as 'Minimal-Mistakes-Red' + printf %b '\e]P9ffa6a6' # redefine 'Bright-Red' as 'Minimal-Mistakes-Bright-Red' + printf %b '\e]P259ff59' # redefine 'Green' as 'Minimal-Mistakes-Green' + printf %b '\e]PAa6ffa6' # redefine 'Bright-Green' as 'Minimal-Mistakes-Bright-Green' + printf %b '\e]P3ffff59' # redefine 'Yellow' as 'Minimal-Mistakes-Yellow' + printf %b '\e]PBffffa6' # redefine 'Bright-Yellow' as 'Minimal-Mistakes-Bright-Yellow' + printf %b '\e]P49059ff' # redefine 'Purple' as 'Minimal-Mistakes-Purple' + printf %b '\e]PCc5a6ff' # redefine 'Bright-Purple' as 'Minimal-Mistakes-Bright-Purple' + printf %b '\e]P5ff59f9' # redefine 'Pink' as 'Minimal-Mistakes-Pink' + printf %b '\e]PDffa6fc' # redefine 'Bright-Pink' as 'Minimal-Mistakes-Bright-Pink' + printf %b '\e]P659fff9' # redefine 'Cyan' as 'Minimal-Mistakes-Cyan' + printf %b '\e]PEa6fffc' # redefine 'Bright-Cyan' as 'Minimal-Mistakes-Bright-Cyan' + printf %b '\e]P7e5e9f0' # redefine 'White' as 'Minimal-Mistakes-Foreground' + printf %b '\e]PFe5e9f0' # redefine 'Bright-White' as 'Minimal-Mistakes-Foreground' clear fi