diff --git a/alacritty/.config/alacritty/alacritty.yml b/alacritty/.config/alacritty/alacritty.yml index f706fd4..d16ac68 100644 --- a/alacritty/.config/alacritty/alacritty.yml +++ b/alacritty/.config/alacritty/alacritty.yml @@ -77,15 +77,6 @@ scrolling: # scrollback is enabled (history > 0). multiplier: 3 - # Faux Scrolling - # - # The `faux_multiplier` setting controls the number of lines the terminal - # should scroll when the alternate screen buffer is active. This is used - # to allow mouse scrolling for applications like `man`. - # - # Specifying `0` will disable faux scrolling. - faux_multiplier: 3 - # Scroll to the bottom when new text is written to the terminal. auto_scroll: false @@ -151,82 +142,143 @@ font: draw_bold_text_with_bright_colors: true # Colors (Tomorrow Night Bright) -colors: +schemes: + # Default colors - primary: - background: '0x2c2c2c' - foreground: '0xeaeaea' - - # Bright and dim foreground colors + default_colors: &default + primary: + background: '0x2c2c2c' + foreground: '0xeaeaea' + + # Bright and dim foreground colors + # + # The dimmed foreground color is calculated automatically if it is not present. + # If the bright foreground color is not set, or `draw_bold_text_with_bright_colors` + # is `false`, the normal foreground color will be used. + #dim_foreground: '0x9a9a9a' + #bright_foreground: '0xffffff' + + # Cursor colors # - # The dimmed foreground color is calculated automatically if it is not present. - # If the bright foreground color is not set, or `draw_bold_text_with_bright_colors` - # is `false`, the normal foreground color will be used. - #dim_foreground: '0x9a9a9a' - #bright_foreground: '0xffffff' + # Colors which should be used to draw the terminal cursor. If these are unset, + # the cursor color will be the inverse of the cell color. + #cursor: + # text: '0x000000' + # cursor: '0xffffff' + + # Selection colors + # + # Colors which should be used to draw the selection area. If selection + # background is unset, selection color will be the inverse of the cell colors. + # If only text is unset the cell text color will remain the same. + #selection: + # text: '0xeaeaea' + # background: '0x404040' + + # Normal colors + normal: + black: '0x000000' + red: '0xd54e53' + green: '0xb9ca4a' + yellow: '0xe6c547' + blue: '0x7aa6da' + magenta: '0xc397d8' + cyan: '0x70c0ba' + white: '0xeaeaea' + + # Bright colors + bright: + black: '0x666666' + red: '0xff3334' + green: '0x9ec400' + yellow: '0xe7c547' + blue: '0x7aa6da' + magenta: '0xb77ee0' + cyan: '0x54ced6' + white: '0xffffff' + + # Dim colors + # + # If the dim colors are not set, they will be calculated automatically based + # on the `normal` colors. + #dim: + # black: '0x000000' + # red: '0x8c3336' + # green: '0x7a8530' + # yellow: '0x97822e' + # blue: '0x506d8f' + # magenta: '0x80638e' + # cyan: '0x497e7a' + # white: '0x9a9a9a' + + # 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: '0xff00ff' }` + # + indexed_colors: [] - # Cursor colors - # - # Colors which should be used to draw the terminal cursor. If these are unset, - # the cursor color will be the inverse of the cell color. - #cursor: - # text: '0x000000' - # cursor: '0xffffff' - # Selection colors - # - # Colors which should be used to draw the selection area. If selection - # background is unset, selection color will be the inverse of the cell colors. - # If only text is unset the cell text color will remain the same. - #selection: - # text: '0xeaeaea' - # background: '0x404040' + # Colors (Solarized Light) + solarized_light: &solar_light + primary: + background: '0xfdf6e3' + foreground: '0x586e75' + + # Normal colors + normal: + black: '0x073642' + red: '0xdc322f' + green: '0x859900' + yellow: '0xb58900' + blue: '0x268bd2' + magenta: '0xd33682' + cyan: '0x2aa198' + white: '0xeee8d5' + + # Bright colors + bright: + black: '0x002b36' + red: '0xcb4b16' + green: '0x586e75' + yellow: '0x657b83' + blue: '0x839496' + magenta: '0x6c71c4' + cyan: '0x93a1a1' + white: '0xfdf6e3' - # Normal colors - normal: - black: '0x000000' - red: '0xd54e53' - green: '0xb9ca4a' - yellow: '0xe6c547' - blue: '0x7aa6da' - magenta: '0xc397d8' - cyan: '0x70c0ba' - white: '0xeaeaea' + # Colors (PaperColor - Light) + papercolor_light: &paper + primary: + background: '0xEEEEEE' + foreground: '0x4D4D4C' + + # Normal colors + normal: + black: '0xEDEDED' + red: '0xD7005F' + green: '0x718C00' + yellow: '0xD75F00' + blue: '0x4271AE' + magenta: '0x8959A8' + cyan: '0x3E999F' + white: '0x4D4D4C' + + # Bright colors + bright: + black: '0x969694' + red: '0xD7005F' + green: '0x718C00' + yellow: '0xD75F00' + blue: '0x4271AE' + magenta: '0x8959A8' + cyan: '0x3E999F' + white: '0x90a3a3' - # Bright colors - bright: - black: '0x666666' - red: '0xff3334' - green: '0x9ec400' - yellow: '0xe7c547' - blue: '0x7aa6da' - magenta: '0xb77ee0' - cyan: '0x54ced6' - white: '0xffffff' - - # Dim colors - # - # If the dim colors are not set, they will be calculated automatically based - # on the `normal` colors. - #dim: - # black: '0x000000' - # red: '0x8c3336' - # green: '0x7a8530' - # yellow: '0x97822e' - # blue: '0x506d8f' - # magenta: '0x80638e' - # cyan: '0x497e7a' - # white: '0x9a9a9a' - - # 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: '0xff00ff' }` - # - indexed_colors: [] +colors: *paper # Visual Bell # diff --git a/fish/.config/fish/fish_variables b/fish/.config/fish/fish_variables index 6826c32..7cc4c26 100644 --- a/fish/.config/fish/fish_variables +++ b/fish/.config/fish/fish_variables @@ -1,30 +1,31 @@ # This file contains fish universal variable definitions. # VERSION: 3.0 SETUVAR __fish_init_2_3_0:\x1d -SETUVAR fish_color_autosuggestion:555\x1ebrblack +SETUVAR fish_color_autosuggestion:93a1a1 SETUVAR fish_color_cancel:\x2dr -SETUVAR fish_color_command:005fd7 -SETUVAR fish_color_comment:990000 +SETUVAR fish_color_command:586e75 +SETUVAR fish_color_comment:93a1a1 SETUVAR fish_color_cwd:green SETUVAR fish_color_cwd_root:red -SETUVAR fish_color_end:009900 -SETUVAR fish_color_error:ff0000 +SETUVAR fish_color_end:268bd2 +SETUVAR fish_color_error:dc322f SETUVAR fish_color_escape:00a6b2 SETUVAR fish_color_history_current:\x2d\x2dbold SETUVAR fish_color_host:normal SETUVAR fish_color_match:\x2d\x2dbackground\x3dbrblue SETUVAR fish_color_normal:normal SETUVAR fish_color_operator:00a6b2 -SETUVAR fish_color_param:00afff -SETUVAR fish_color_quote:999900 -SETUVAR fish_color_redirection:00afff -SETUVAR fish_color_search_match:bryellow\x1e\x2d\x2dbackground\x3dbrblack +SETUVAR fish_color_param:657b83 +SETUVAR fish_color_quote:839496 +SETUVAR fish_color_redirection:6c71c4 +SETUVAR fish_color_search_match:bryellow\x1e\x2d\x2dbackground\x3dwhite SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack SETUVAR fish_color_status:red SETUVAR fish_color_user:brgreen SETUVAR fish_color_valid_path:\x2d\x2dunderline SETUVAR fish_greeting:Welcome\x20to\x20fish\x2c\x20the\x20friendly\x20interactive\x20shell SETUVAR fish_key_bindings:fish_default_key_bindings -SETUVAR fish_pager_color_description:B3A06D\x1eyellow -SETUVAR fish_pager_color_prefix:white\x1e\x2d\x2dbold\x1e\x2d\x2dunderline +SETUVAR fish_pager_color_completion:green +SETUVAR fish_pager_color_description:B3A06D +SETUVAR fish_pager_color_prefix:cyan\x1e\x2d\x2dunderline SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim index 1d0f7ac..f43bdd3 100644 --- a/nvim/.config/nvim/init.vim +++ b/nvim/.config/nvim/init.vim @@ -1,2 +1,22 @@ +" ericonr's nvim config + + +" SHORTCUTS + +" Shortcuts for quickly going back to normal mode :imap jk :imap kj + +" Shortcuts for pasting and yanking from the system clipboard +:nmap wp "+p +:vmap wy "+y + + +" APPEARANCE + +" Show relative line numbers +set number rnu + +" Pretty color scheme that works well with the one chosen for alacritty +colorscheme slate + diff --git a/tmux/dot-tmux.conf b/tmux/dot-tmux.conf index 306a39c..a8b0569 100644 --- a/tmux/dot-tmux.conf +++ b/tmux/dot-tmux.conf @@ -2,8 +2,8 @@ # Bindings unbind-key C-b -set -g prefix "C-a" -bind-key C-a send-prefix +set -g prefix "C-q" +bind-key C-q send-prefix unbind-key l bind-key h select-pane -L bind-key j select-pane -D