diff options
| -rw-r--r-- | alacritty/.config/alacritty/alacritty.toml | 44 | ||||
| -rw-r--r-- | alacritty/.config/alacritty/alacritty.yml | 894 | ||||
| -rw-r--r-- | neovim/.config/nvim/init.lua | 418 | ||||
| -rw-r--r-- | packages/debian.txt | 3 | ||||
| -rw-r--r-- | packages/macos-macports.txt | 7 | ||||
| -rw-r--r-- | tmux/.tmux/common.conf | 3 | ||||
| m--------- | vim/.vim/bundle/endwise | 0 | ||||
| m--------- | vim/.vim/bundle/lightline | 0 | ||||
| m--------- | vim/.vim/bundle/nerdcommenter | 0 | ||||
| m--------- | vim/.vim/bundle/pathogen | 0 | ||||
| m--------- | vim/.vim/bundle/supertab | 0 | ||||
| m--------- | vim/.vim/bundle/tagbar | 0 | ||||
| m--------- | vim/.vim/bundle/vimwiki | 0 | ||||
| -rw-r--r-- | vim/.vimrc | 1 | ||||
| -rw-r--r-- | zsh/.zshrc | 10 |
15 files changed, 482 insertions, 898 deletions
diff --git a/alacritty/.config/alacritty/alacritty.toml b/alacritty/.config/alacritty/alacritty.toml new file mode 100644 index 0000000..7e4d03e --- /dev/null +++ b/alacritty/.config/alacritty/alacritty.toml @@ -0,0 +1,44 @@ +[general] +import = [ + "~/.config/alacritty/carbonfox.toml" +] + +[cursor.style] +blinking = "Always" +shape = "Block" + +[font] +size = 33.0 +builtin_box_drawing = true + +[font.bold] +family = "Myna" +style = "Bold" + +[font.bold_italic] +family = "Myna" +style = "Bold Italic" + +[font.italic] +family = "Myna" +style = "Italic" + +[font.normal] +family = "Myna" +style = "Regular" + +[scrolling] +history = 100000 + +[selection] +save_to_clipboard = true +semantic_escape_chars = ",│`|:\"' ()[]{}<>\t" + +[window] +decorations = "none" +dynamic_title = true +opacity = 1.0 +startup_mode = "Maximized" + +[keyboard] +bindings = [ { key="W", mods="Command", action="None" } ] diff --git a/alacritty/.config/alacritty/alacritty.yml b/alacritty/.config/alacritty/alacritty.yml deleted file mode 100644 index 4866439..0000000 --- a/alacritty/.config/alacritty/alacritty.yml +++ /dev/null @@ -1,894 +0,0 @@ -# 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. -#env: - # TERM variable - # - # This value is used to set the `$TERM` environment variable for - # each instance of Alacritty. If it is not present, alacritty will - # check the local terminfo database and use `alacritty` if it is - # available, otherwise `xterm-256color` is used. - #TERM: alacritty - -window: - # Window dimensions (changes require restart) - # - # Number of lines/columns (not pixels) in the terminal. Both lines and columns - # must be non-zero for this to take effect. 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 - - # Window position (changes require restart) - # - # Specified in number of pixels. - # If the position is not set, the window manager will handle the placement. - #position: - # x: 0 - # y: 0 - - # Window padding (changes require restart) - # - # Blank space added around the window in pixels. This padding is scaled - # by DPI and the specified value is always added at both opposing sides. - #padding: - # x: 0 - # y: 0 - - # Spread additional padding evenly around the terminal content. - #dynamic_padding: false - - # Window decorations - # - # Values for `decorations`: - # - full: Borders and title bar - # - none: Neither borders nor title bar - # - # Values for `decorations` (macOS only): - # - transparent: Title bar, transparent background and title bar buttons - # - buttonless: Title bar, transparent background and no title bar buttons - decorations: none - - # Background opacity - # - # Window opacity as a floating point number from `0.0` to `1.0`. - # The value `0.0` is completely transparent and `1.0` is opaque. - opacity: 0.5 - - # Startup Mode (changes require restart) - # - # Values for `startup_mode`: - # - Windowed - # - Maximized - # - Fullscreen - # - # Values for `startup_mode` (macOS only): - # - SimpleFullscreen - startup_mode: Fullscreen - - # Window title - #title: Alacritty - - # Allow terminal applications to change Alacritty's window title. - dynamic_title: true - - # Window class (Linux/BSD only): - #class: - # Application instance name - #instance: Alacritty - # General application class - #general: Alacritty - - # GTK theme variant (Linux/BSD only) - # - # Override the variant of the GTK theme. Commonly supported values are `dark` - # and `light`. Set this to `None` to use the default theme variant. - #gtk_theme_variant: None - -scrolling: - # Maximum number of lines in the scrollback buffer. - # Specifying '0' will disable scrolling. - history: 100000 - - # Scrolling distance multiplier. - #multiplier: 3 - -# Font configuration -font: - # Normal (roman) font face - normal: - # Font family - # - # Default: - # - (macOS) Menlo - # - (Linux/BSD) monospace - # - (Windows) Consolas - family: Misc Tamsyn - - # The `style` can be specified to pick a specific face. - style: Regular - - # Bold font face - bold: - # Font family - # - # If the bold family is not specified, it will fall back to the - # value specified for the normal font. - family: Misc Tamsyn - - # The `style` can be specified to pick a specific face. - style: Bold - - # Italic font face - italic: - # Font family - # - # If the italic family is not specified, it will fall back to the - # value specified for the normal font. - family: Misc Tamsyn - - # The `style` can be specified to pick a specific face. - style: Italic - - # Bold italic font face - bold_italic: - # Font family - # - # If the bold italic family is not specified, it will fall back to the - # value specified for the normal font. - family: Misc Tamsyn - - # The `style` can be specified to pick a specific face. - style: Bold Italic - - # Point size - size: 12.0 - - # Offset is the extra space around each character. `offset.y` can be thought - # of as modifying the line spacing, and `offset.x` as modifying the letter - # spacing. - #offset: - # x: 0 - # y: 0 - - # Glyph offset determines the locations of the glyphs within their cells with - # the default being at the bottom. Increasing `x` moves the glyph to the - # right, increasing `y` moves the glyph upward. - #glyph_offset: - # x: 0 - # y: 0 - - # Use built-in font for box drawing characters. - # - # If `true`, Alacritty will use a custom built-in font for box drawing - # characters (Unicode points 2500 - 259f). - # - builtin_box_drawing: true - -# If `true`, bold text is drawn using the bright color variants. -#draw_bold_text_with_bright_colors: false - -# Colors (Tomorrow Night) -colors: - # Default colors - primary: - background: '#000000' - foreground: '#ffffff' - - # Bright and dim foreground colors - # - # The dimmed foreground color is calculated automatically if it is not - # present. If the bright foreground color is not set, or - # `draw_bold_text_with_bright_colors` is `false`, the normal foreground - # color will be used. - #dim_foreground: '#828482' - #bright_foreground: '#eaeaea' - - # Cursor colors - # - # Colors which should be used to draw the terminal cursor. - # - # Allowed values are CellForeground/CellBackground, which reference the - # affected cell, or hexadecimal colors like #ff00ff. - cursor: - text: CellForeground - cursor: '#ff00ff' - - # Vi mode cursor colors - # - # Colors for the cursor when the vi mode is active. - # - # Allowed values are CellForeground/CellBackground, which reference the - # affected cell, or hexadecimal colors like #ff00ff. - #vi_mode_cursor: - # text: CellBackground - # cursor: CellForeground - - # Search colors - # - # Colors used for the search bar and match highlighting. - #search: - # Allowed values are CellForeground/CellBackground, which reference the - # affected cell, or hexadecimal colors like #ff00ff. - #matches: - # foreground: '#000000' - # background: '#ffffff' - #focused_match: - # foreground: '#ffffff' - # background: '#000000' - - # Keyboard hints - #hints: - # First character in the hint label - # - # Allowed values are CellForeground/CellBackground, which reference the - # affected cell, or hexadecimal colors like #ff00ff. - #start: - # foreground: '#1d1f21' - # background: '#e9ff5e' - - # All characters after the first one in the hint label - # - # Allowed values are CellForeground/CellBackground, which reference the - # affected cell, or hexadecimal colors like #ff00ff. - #end: - # foreground: '#e9ff5e' - # background: '#1d1f21' - - # Line indicator - # - # Color used for the indicator displaying the position in history during - # search and vi mode. - # - # By default, these will use the opposing primary color. - #line_indicator: - # foreground: None - # background: None - - # Footer bar - # - # Color used for the footer bar on the bottom, used by search regex input, - # hyperlink URI preview, etc. - # - #footer_bar: - # background: '#c5c8c6' - # foreground: '#1d1f21' - - # Selection colors - # - # Colors which should be used to draw the selection area. - # - # Allowed values are CellForeground/CellBackground, which reference the - # affected cell, or hexadecimal colors like #ff00ff. - #selection: - # text: CellBackground - # background: CellForeground - - # Normal colors - #normal: - # black: '#1d1f21' - # red: '#cc6666' - # green: '#b5bd68' - # yellow: '#f0c674' - # blue: '#81a2be' - # magenta: '#b294bb' - # cyan: '#8abeb7' - # white: '#c5c8c6' - - # Bright colors - #bright: - # black: '#666666' - # red: '#d54e53' - # green: '#b9ca4a' - # yellow: '#e7c547' - # blue: '#7aa6da' - # magenta: '#c397d8' - # cyan: '#70c0b1' - # white: '#eaeaea' - - # Dim colors - # - # If the dim colors are not set, they will be calculated automatically based - # on the `normal` colors. - #dim: - # black: '#131415' - # red: '#864343' - # green: '#777c44' - # yellow: '#9e824c' - # blue: '#556a7d' - # magenta: '#75617b' - # cyan: '#5b7d78' - # white: '#828482' - - # Indexed Colors - # - # The indexed colors include all colors from 16 to 256. - # When these are not set, they're filled with sensible defaults. - # - # Example: - # `- { index: 16, color: '#ff00ff' }` - # - #indexed_colors: [] - - # Transparent cell backgrounds - # - # Whether or not `window.opacity` applies to all cell backgrounds or only to - # the default background. When set to `true` all cells will be transparent - # regardless of their background color. - #transparent_background_colors: false - -# Bell -# -# The bell is rung every time the BEL control character is received. -#bell: - # Visual Bell Animation - # - # Animation effect for flashing the screen when the visual bell is rung. - # - # Values for `animation`: - # - Ease - # - EaseOut - # - EaseOutSine - # - EaseOutQuad - # - EaseOutCubic - # - EaseOutQuart - # - EaseOutQuint - # - EaseOutExpo - # - EaseOutCirc - # - Linear - #animation: EaseOutExpo - - # Duration of the visual bell flash in milliseconds. A `duration` of `0` will - # disable the visual bell animation. - #duration: 0 - - # Visual bell animation color. - #color: '#ffffff' - - # Bell Command - # - # This program is executed whenever the bell is rung. - # - # When set to `command: None`, no command will be executed. - # - # Example: - # command: - # program: notify-send - # args: ["Hello, World!"] - # - #command: None - -selection: - # 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: true - -cursor: - # Cursor style - style: - # Cursor shape - # - # Values for `shape`: - # - ▇ Block - # - _ Underline - # - | Beam - shape: Block - - # 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: Always - - # 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 - - # Time after which cursor stops blinking, in seconds. - # - # Specifying '0' will disable timeout for blinking. - #blink_timeout: 5 - - # If this is `true`, the cursor will be rendered as a hollow box when the - # window is not focused. - #unfocused_hollow: true - - # Thickness of the cursor relative to the cell width as floating point number - # from `0.0` to `1.0`. - #thickness: 0.15 - -# Live config reload (changes require restart) -#live_config_reload: true - -# Shell -# -# You can set `shell.program` to the path of your favorite shell, e.g. -# `/bin/fish`. Entries in `shell.args` are passed unmodified as arguments to the -# shell. -# -# Default: -# - (Linux/BSD/macOS) `$SHELL` or the user's login shell, if `$SHELL` is unset -# - (Windows) powershell -#shell: -# program: /bin/bash -# args: -# - --login - -# Startup directory -# -# Directory the shell is started in. If this is unset, or `None`, the working -# directory of the parent process will be used. -#working_directory: None - -# Send ESC (\x1b) before characters when alt is pressed. -#alt_send_esc: true - -# 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 } - - # If this is `true`, the cursor is temporarily hidden when typing. - #hide_when_typing: false - -# Hints -# -# Terminal hints can be used to find text or hyperlink in the visible part of -# the terminal and pipe it to other applications. -#hints: - # Keys used for the hint labels. - #alphabet: "jfkdls;ahgurieowpq" - - # List with all available hints - # - # Each hint must have any of `regex` or `hyperlinks` field and either an - # `action` or a `command` field. The fields `mouse`, `binding` and - # `post_processing` are optional. - # - # The `hyperlinks` option will cause OSC 8 escape sequence hyperlinks to be - # highlighted. - # - # 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 and applies only to - # `regex` matches. - # - # 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{-}\\^⟨⟩`]+" - # hyperlinks: true - # 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`: -# -# - Middle -# - Left -# - Right -# - Numeric identifier such as `5` -# -# - `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: Right, action: ExpandSelection } -# - { mouse: Right, mods: Control, action: ExpandSelection } -# - { mouse: Middle, mode: ~Vi, action: PasteSelection } - -# Key bindings -# -# Key bindings are specified as a list of objects. For example, this is the -# default paste binding: -# -# `- { key: V, mods: Control|Shift, action: Paste }` -# -# Each key binding will specify a: -# -# - `key`: Identifier of the key pressed -# -# - A-Z -# - F1-F24 -# - Key0-Key9 -# -# A full list with available key codes can be found here: -# https://docs.rs/glutin/*/glutin/event/enum.VirtualKeyCode.html#variants -# -# Instead of using the name of the keys, the `key` field also supports using -# the scancode of the desired key. Scancodes have to be specified as a -# decimal number. This command will allow you to display the hex scancodes -# for certain keys: -# -# `showkey --scancodes`. -# -# Then exactly one of: -# -# - `chars`: Send a byte sequence to the running application -# -# The `chars` field writes the specified string to the terminal. This makes -# it possible to pass escape sequences. To find escape codes for bindings -# like `PageUp` (`"\x1b[5~"`), you can run the command `showkey -a` outside -# of tmux. Note that applications use terminfo to map escape sequences back -# to keys. It is therefore required to update the terminfo when changing an -# escape sequence. -# -# - `action`: Execute a predefined action -# -# - ToggleViMode -# - SearchForward -# Start searching toward the right of the search origin. -# - SearchBackward -# Start searching toward the left of the search origin. -# - Copy -# - Paste -# - 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 -# -# - 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`. -# - CenterAroundViCursor -# Center view around vi mode cursor -# -# - 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 -# -# The `command` field must be a map containing a `program` string and an -# `args` array of command line parameter strings. For example: -# `{ program: "alacritty", args: ["-e", "vttest"] }` -# -# And optionally: -# -# - `mods`: Key modifiers to filter binding actions -# -# - Command -# - Control -# - Option -# - Super -# - Shift -# - Alt -# -# Multiple `mods` can be combined using `|` like this: -# `mods: Control|Shift`. -# Whitespace and capitalization are relevant and must match the example. -# -# - `mode`: Indicate a binding for only specific terminal reported modes -# -# This is mainly used to send applications the correct escape sequences -# when in different modes. -# -# - AppCursor -# - AppKeypad -# - Search -# - Alt -# - Vi -# -# A `~` operator can be used before a mode to apply the binding whenever -# the mode is *not* active, e.g. `~Alt`. -# -# Bindings are always filled by default, but will be replaced when a new -# binding with the same triggers is defined. To unset a default binding, it can -# be mapped to the `ReceiveChar` action. Alternatively, you can use `None` for -# a no-op if you do not wish to receive input characters for that binding. -# -# If the same trigger is assigned to multiple actions, all of them are executed -# in the order they were defined in. -#key_bindings: - #- { key: Paste, action: Paste } - #- { key: Copy, action: Copy } - #- { key: L, mods: Control, action: ClearLogNotice } - #- { key: L, mods: Control, mode: ~Vi|~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 } - - # 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: Z, mode: Vi|~Search, action: CenterAroundViCursor } - #- { 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: IncreaseontSize } - #- { 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 - - # Highlight window damage information. - #highlight_damage: false diff --git a/neovim/.config/nvim/init.lua b/neovim/.config/nvim/init.lua new file mode 100644 index 0000000..6c9ebaf --- /dev/null +++ b/neovim/.config/nvim/init.lua @@ -0,0 +1,418 @@ +-------------------------------------------------------------------------------- +-- Neovim Configuration +-------------------------------------------------------------------------------- + +-------------------------------------------------------------------------------- +-- Options +-------------------------------------------------------------------------------- + +-- UI +vim.opt.cursorline = true +vim.opt.number = true +vim.opt.scrolloff = 8 +vim.opt.signcolumn = "yes" +vim.opt.termguicolors = true + +-- Tabs & Indentation +vim.opt.expandtab = true +vim.opt.shiftwidth = 4 +vim.opt.tabstop = 4 + +-- Search +vim.opt.ignorecase = true +vim.opt.smartcase = true + +-- Splits +vim.opt.splitbelow = true +vim.opt.splitright = true + +-- Folding (treesitter-based) +vim.opt.foldmethod = "expr" +vim.opt.foldexpr = "nvim_treesitter#foldexpr()" +vim.opt.foldenable = true +vim.opt.foldlevelstart = 0 + +-- Misc +vim.opt.clipboard = "unnamedplus" +vim.opt.undofile = true +vim.opt.updatetime = 250 + +-------------------------------------------------------------------------------- +-- Bootstrap lazy.nvim +-------------------------------------------------------------------------------- +local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" +if not (vim.uv or vim.loop).fs_stat(lazypath) then + vim.fn.system({ + "git", "clone", "--filter=blob:none", + "https://github.com/folke/lazy.nvim.git", + "--branch=stable", lazypath, + }) +end +vim.opt.rtp:prepend(lazypath) + +-------------------------------------------------------------------------------- +-- Plugins +-------------------------------------------------------------------------------- +require("lazy").setup({ + + -- Colorscheme --------------------------------------------------------------- + { + "Shadorain/shadotheme", + lazy = false, + priority = 1000, + config = function() + vim.cmd.colorscheme("shado") + vim.api.nvim_set_hl(0, "Normal", { bg = "#000000" }) + vim.api.nvim_set_hl(0, "NormalFloat", { bg = "#000000" }) + vim.api.nvim_set_hl(0, "SignColumn", { bg = "#000000" }) + vim.api.nvim_set_hl(0, "LineNr", { bg = "#000000" }) + vim.api.nvim_set_hl(0, "CursorLineNr", { bg = "#000000" }) + end, + }, + + -- Treesitter ---------------------------------------------------------------- + { + "nvim-treesitter/nvim-treesitter", + build = ":TSUpdate", + dependencies = { "nvim-treesitter/nvim-treesitter-textobjects" }, + config = function() + require("nvim-treesitter.configs").setup({ + ensure_installed = { "bash", "lua", "python", "ruby" }, + auto_install = true, + highlight = { enable = true }, + indent = { enable = true }, + incremental_selection = { + enable = true, + keymaps = { + init_selection = "<C-space>", + node_incremental = "<C-space>", + node_decremental = "<bs>", + }, + }, + textobjects = { + select = { + enable = true, + lookahead = true, + keymaps = { + ["af"] = "@function.outer", ["if"] = "@function.inner", + ["ac"] = "@class.outer", ["ic"] = "@class.inner", + ["aa"] = "@parameter.outer", ["ia"] = "@parameter.inner", + }, + }, + move = { + enable = true, + set_jumps = true, + goto_next_start = { ["]m"] = "@function.outer", ["]]"] = "@class.outer" }, + goto_prev_start = { ["[m"] = "@function.outer", ["[["] = "@class.outer" }, + }, + }, + }) + end, + }, + + -- Completion ---------------------------------------------------------------- + { + "saghen/blink.cmp", + version = "1.*", + opts = { + keymap = { + preset = "default", + ["<CR>"] = { "accept", "fallback" }, + ["<Tab>"] = { "select_next", "fallback" }, + ["<S-Tab>"] = { "select_prev", "fallback" }, + }, + sources = { + default = { "lsp", "path", "buffer" }, + providers = { lsp = { timeout_ms = 2000 } }, + }, + completion = { + trigger = { show_in_snippet = false }, + menu = { auto_show = true }, + documentation = { auto_show = true, auto_show_delay_ms = 200 }, + }, + }, + }, + + -- Auto-pairs & Tags --------------------------------------------------------- + { "windwp/nvim-autopairs", event = "InsertEnter", opts = {} }, + { "windwp/nvim-ts-autotag", opts = {} }, + { "tpope/vim-endwise" }, + + -- UI ------------------------------------------------------------------------ + { "nvim-lualine/lualine.nvim", dependencies = { "nvim-tree/nvim-web-devicons" }, opts = {} }, + { "lewis6991/gitsigns.nvim", opts = {} }, + { "folke/which-key.nvim", event = "VeryLazy", opts = {} }, + { "lukas-reineke/indent-blankline.nvim", main = "ibl", opts = {} }, + + -- Navigation ---------------------------------------------------------------- + { + "nvim-tree/nvim-tree.lua", + dependencies = { "nvim-tree/nvim-web-devicons" }, + opts = {}, + keys = { { "<leader>e", "<cmd>NvimTreeToggle<cr>", desc = "File tree" } }, + }, + { + "hedyhli/outline.nvim", + opts = {}, + keys = { { "<leader>o", "<cmd>Outline<cr>", desc = "Code outline" } }, + }, + { + "nvim-telescope/telescope.nvim", + branch = "0.1.x", + dependencies = { "nvim-lua/plenary.nvim" }, + keys = { + { "<leader>ff", "<cmd>Telescope find_files<cr>", desc = "Find files" }, + { "<leader>fg", "<cmd>Telescope live_grep<cr>", desc = "Live grep" }, + { "<leader>fb", "<cmd>Telescope buffers<cr>", desc = "Buffers" }, + { "<leader>fh", "<cmd>Telescope help_tags<cr>", desc = "Help tags" }, + { "<leader>fr", "<cmd>Telescope oldfiles<cr>", desc = "Recent files" }, + { "<leader>fc", "<cmd>Telescope git_commits<cr>", desc = "Git commits" }, + { "<leader>fs", "<cmd>Telescope lsp_document_symbols<cr>", desc = "Document symbols" }, + }, + }, + { + "folke/flash.nvim", + event = "VeryLazy", + opts = {}, + keys = { + { "s", mode = { "n", "x", "o" }, function() require("flash").jump() end, desc = "Flash" }, + { "S", mode = { "n", "x", "o" }, function() require("flash").treesitter() end, desc = "Flash Treesitter" }, + }, + }, + + -- Editing ------------------------------------------------------------------- + { + "numToStr/Comment.nvim", + opts = {}, + keys = { + { "gcc", mode = "n", desc = "Comment line" }, + { "gc", mode = "v", desc = "Comment selection" }, + }, + }, + { + "kylechui/nvim-surround", + version = "^3", + event = "VeryLazy", + opts = {}, + }, + { "echasnovski/mini.ai", version = "*", opts = {} }, + + -- Diagnostics & Formatting -------------------------------------------------- + { + "folke/trouble.nvim", + dependencies = { "nvim-tree/nvim-web-devicons" }, + opts = {}, + keys = { + { "<leader>xx", "<cmd>Trouble diagnostics toggle<cr>", desc = "Diagnostics" }, + { "<leader>xX", "<cmd>Trouble diagnostics toggle filter.buf=0<cr>", desc = "Buffer diagnostics" }, + { "<leader>xq", "<cmd>Trouble quickfix toggle<cr>", desc = "Quickfix list" }, + }, + }, + { + "folke/todo-comments.nvim", + dependencies = { "nvim-lua/plenary.nvim" }, + opts = {}, + keys = { + { "<leader>xt", "<cmd>Trouble todo toggle<cr>", desc = "Todo comments" }, + { "]t", function() require("todo-comments").jump_next() end, desc = "Next todo" }, + { "[t", function() require("todo-comments").jump_prev() end, desc = "Prev todo" }, + }, + }, + { + "stevearc/conform.nvim", + event = "BufWritePre", + keys = { + { "<leader>cf", function() require("conform").format({ async = true }) end, desc = "Format buffer" }, + }, + opts = { + formatters_by_ft = { + lua = { "stylua" }, + python = { "ruff_format", "ruff_fix" }, + javascript = { "prettier" }, + typescript = { "prettier" }, + javascriptreact = { "prettier" }, + typescriptreact = { "prettier" }, + json = { "prettier" }, + yaml = { "prettier" }, + html = { "prettier" }, + css = { "prettier" }, + markdown = { "prettier" }, + ruby = { "rubocop" }, + sh = { "shfmt" }, + bash = { "shfmt" }, + zsh = { "shfmt" }, + }, + }, + }, + + -- Notes --------------------------------------------------------------------- + { "vimwiki/vimwiki", + init = function() + vim.g.vimwiki_list = { + { + path = vim.fn.expand("~/.wiki"), + syntax = "default", + ext = ".wiki", + index = "index", + }, + } + end, + } + +}) + +-------------------------------------------------------------------------------- +-- LSP Configuration +-------------------------------------------------------------------------------- +vim.lsp.config.pyright = { + cmd = { "pyright-langserver", "--stdio" }, + filetypes = { "python" }, + root_markers = { "pyproject.toml", "setup.py", "setup.cfg", "requirements.txt", ".git" }, + single_file_support = true, + settings = { + python = { + analysis = { + typeCheckingMode = "basic", + autoSearchPaths = false, + diagnosticMode = "openFilesOnly", + useLibraryCodeForTypes = false, + }, + }, + }, +} + +vim.lsp.config.solargraph = { + cmd = { "solargraph", "stdio" }, + filetypes = { "ruby" }, + root_markers = { "Gemfile", ".git" }, + single_file_support = true, +} + +vim.lsp.config.yamlls = { + cmd = { "yaml-language-server", "--stdio" }, + filetypes = { "yaml", "yaml.docker-compose", "yaml.gitlab" }, + root_markers = { ".git" }, + single_file_support = true, + settings = { + yaml = { + validate = true, + schemaStore = { enable = true, url = "https://www.schemastore.org/api/json/catalog.json" }, + }, + }, +} + +vim.lsp.config.taplo = { + cmd = { "taplo", "lsp", "stdio" }, + filetypes = { "toml" }, + root_markers = { ".git" }, + single_file_support = true, +} + +vim.lsp.config.lua_ls = { + cmd = { "lua-language-server" }, + filetypes = { "lua" }, + root_markers = { ".luarc.json", ".luarc.jsonc", ".git" }, + single_file_support = true, + settings = { + Lua = { + runtime = { version = "LuaJIT" }, + workspace = { library = { vim.env.VIMRUNTIME } }, + telemetry = { enable = false }, + }, + }, +} + +vim.lsp.config.bashls = { + cmd = { "bash-language-server", "start" }, + filetypes = { "sh", "bash", "zsh" }, + root_markers = { ".git" }, + single_file_support = true, +} + +vim.lsp.config.jsonls = { + cmd = { "vscode-json-language-server", "--stdio" }, + filetypes = { "json", "jsonc" }, + root_markers = { ".git" }, + single_file_support = true, + settings = { + json = { + validate = { enable = true }, + schemaStore = { enable = true, url = "https://www.schemastore.org/api/json/catalog.json" }, + }, + }, +} + +vim.lsp.config.html = { + cmd = { "vscode-html-language-server", "--stdio" }, + filetypes = { "html", "templ" }, + root_markers = { ".git" }, + single_file_support = true, +} + +vim.lsp.config.cssls = { + cmd = { "vscode-css-language-server", "--stdio" }, + filetypes = { "css", "scss", "less" }, + root_markers = { ".git" }, + single_file_support = true, +} + +vim.lsp.config.ts_ls = { + cmd = { "typescript-language-server", "--stdio" }, + filetypes = { "javascript", "javascriptreact", "typescript", "typescriptreact" }, + root_markers = { "tsconfig.json", "jsconfig.json", "package.json", ".git" }, + single_file_support = true, +} + +vim.lsp.config.dockerls = { + cmd = { "docker-langserver", "--stdio" }, + filetypes = { "dockerfile" }, + root_markers = { "Dockerfile", ".git" }, + single_file_support = true, +} + +vim.lsp.config.clangd = { + cmd = { "clangd" }, + filetypes = { "c", "cpp", "objc", "objcpp", "cuda", "proto" }, + root_markers = { "compile_commands.json", "compile_flags.txt", ".clangd", ".git" }, + single_file_support = true, +} + +vim.lsp.enable("pyright") +vim.lsp.enable("solargraph") +vim.lsp.enable("yamlls") +vim.lsp.enable("taplo") +vim.lsp.enable("lua_ls") +vim.lsp.enable("bashls") +vim.lsp.enable("jsonls") +vim.lsp.enable("html") +vim.lsp.enable("cssls") +vim.lsp.enable("ts_ls") +vim.lsp.enable("dockerls") +vim.lsp.enable("clangd") + +-------------------------------------------------------------------------------- +-- Tabline styling +-------------------------------------------------------------------------------- +vim.api.nvim_set_hl(0, "TabLineSel", { fg = "#ffffff", bg = "#5a5a5a", bold = true }) +vim.api.nvim_set_hl(0, "TabLine", { fg = "#888888", bg = "#000000" }) +vim.api.nvim_set_hl(0, "TabLineFill", { bg = "#000000" }) + +-------------------------------------------------------------------------------- +-- Keymaps +-------------------------------------------------------------------------------- +vim.keymap.set("n", "<S-h>", "<cmd>tabprev<cr>", { desc = "Prev tab" }) +vim.keymap.set("n", "<S-l>", "<cmd>tabnext<cr>", { desc = "Next tab" }) + +vim.api.nvim_create_autocmd("LspAttach", { + callback = function(args) + local map = function(key, fn, desc) + vim.keymap.set("n", key, fn, { buffer = args.buf, desc = desc }) + end + map("gd", vim.lsp.buf.definition, "Go to definition") + map("gr", vim.lsp.buf.references, "References") + map("K", vim.lsp.buf.hover, "Hover docs") + map("<leader>rn", vim.lsp.buf.rename, "Rename symbol") + map("<leader>ca", vim.lsp.buf.code_action, "Code action") + map("<leader>ds", vim.lsp.buf.document_symbol, "Document symbols") + end, +}) diff --git a/packages/debian.txt b/packages/debian.txt index c8338b6..cc6c379 100644 --- a/packages/debian.txt +++ b/packages/debian.txt @@ -2,15 +2,18 @@ build-essential cmake colordiff dh-autoreconf +etckeeper git htop lsof mosh multitail +neovim pigz renameutils stow tmux +units vim xinput zsh diff --git a/packages/macos-macports.txt b/packages/macos-macports.txt index 33fb7db..f80bea9 100644 --- a/packages/macos-macports.txt +++ b/packages/macos-macports.txt @@ -5,16 +5,23 @@ btop cmake colordiff fzf +gnupg2 htop isync +jq +k9s md5sha1sum mosh mpv multitail mutt +neovim +notmuch pigz renameutils +stern stow +terraform texlive-latex tmux vim diff --git a/tmux/.tmux/common.conf b/tmux/.tmux/common.conf index ab77f0e..5050ac3 100644 --- a/tmux/.tmux/common.conf +++ b/tmux/.tmux/common.conf @@ -14,6 +14,9 @@ set -g default-terminal "screen-256color" unbind C-a set -g prefix C-a +# misc +set -g set-clipboard on + # status set -g status-left-length 32 set -g status-right-length 150 diff --git a/vim/.vim/bundle/endwise b/vim/.vim/bundle/endwise -Subproject bf90d8be447de667f4532b934d1a70881be56dd +Subproject eab530110d7a0d985902a3964894816b50dbf31 diff --git a/vim/.vim/bundle/lightline b/vim/.vim/bundle/lightline -Subproject f4fa096a67afbe593bd53cf618850c32512b5d4 +Subproject e358557e1a9f9fc860416c8eb2e34c040407815 diff --git a/vim/.vim/bundle/nerdcommenter b/vim/.vim/bundle/nerdcommenter -Subproject 24df32304e20677ab061115e7bc8a37f382c60e +Subproject 02a3b6455fa07b61b9440a78732f1e9b7876c99 diff --git a/vim/.vim/bundle/pathogen b/vim/.vim/bundle/pathogen -Subproject a553410f1bdb9000fbc764069f3a5ec3454a02b +Subproject ac4dd9494fa9008754e49dff85bff1b5746c89b diff --git a/vim/.vim/bundle/supertab b/vim/.vim/bundle/supertab -Subproject 40fe711e088e2ab346738233dd5adbb1be35517 +Subproject f0093ae12a9115498f887199809a6114659fc85 diff --git a/vim/.vim/bundle/tagbar b/vim/.vim/bundle/tagbar -Subproject 3753b235a1163cfbc3b7c417825d1910b2f6610 +Subproject 2ef4ecba94440fcf8a8c692a0f2b36b332f1f0f diff --git a/vim/.vim/bundle/vimwiki b/vim/.vim/bundle/vimwiki -Subproject b90e6f2e3343277faca65156d733f725f76f1e5 +Subproject 72792615e739d0eb54a9c8f7e0a46a6e2407c9e @@ -4,7 +4,6 @@ execute pathogen#infect() " settings set nocompatible set nu -set noet set showcmd set autoindent set smartindent @@ -196,7 +196,7 @@ if [[ $? == 0 ]]; then maybe_add_dir_to_path $HOME/.R fi -export EDITOR='vim -p' +export EDITOR='nvim -p' alias qmv='qmv -evim -fdo' export LC_ALL=en_US.UTF-8 @@ -207,14 +207,18 @@ export RUBYOPT=-Ku export GEM_HOME=$HOME/.local/lib/ruby/ export GEM_PATH=$HOME/.local/lib/ruby/:$GEM_PATH -export PYTHONPATH=$PYTHONPATH:~/.local/lib/python/site-packages:~/.local/lib/python3/site-packages +if [ ! -z $PYTHONPATH ]; then + export PYTHONPATH=~/.local/lib/python/site-packages:~/.local/lib/python3/site-packages:$PYTHONPATH +else + export PYTHONPATH=~/.local/lib/python/site-packages:~/.local/lib/python3/site-packages +fi export PATH=~/.local/lib/python/site-packages:$PATH export PATH=~/.local/lib/node/bin:$PATH export TEXMFHOME='~/.texmf' -export CFLAGS="-march=native -mtune=native" +export CFLAGS="-O2 -march=native -mtune=native -pipe" export CXXFLAGS="$CFLAGS" export CCACHE_PATH=/usr/bin |