From 4859e227c54257af1ca2f7c90c980f3f66d348f3 Mon Sep 17 00:00:00 2001 From: Daniel Lundin Date: Mon, 4 Feb 2019 14:18:03 +0100 Subject: [PATCH] A lighter setup --- .config/alacritty/alacritty-light.yml | 495 ++++++++++++++++++++++++++ .config/nvim/colors/dln-light.vim | 415 +++++++++++++++++---- .config/nvim/init.vim | 6 +- bin/alacritty-light | 2 + 4 files changed, 848 insertions(+), 70 deletions(-) create mode 100644 .config/alacritty/alacritty-light.yml create mode 100755 bin/alacritty-light diff --git a/.config/alacritty/alacritty-light.yml b/.config/alacritty/alacritty-light.yml new file mode 100644 index 0000000..acb56e7 --- /dev/null +++ b/.config/alacritty/alacritty-light.yml @@ -0,0 +1,495 @@ +# Configuration for Alacritty, the GPU enhanced terminal emulator. + +# Any items in the `env` entry below will be added as +# environment variables. Some entries may override variables +# set by alacritty itself. +#env: + # TERM variable + # + # This value is used to set the `$TERM` environment variable for + # each instance of Alacritty. If it is not present, alacritty will + # check the local terminfo database and use 'alacritty' if it is + # available, otherwise 'xterm-256color' is used. + #TERM: xterm-256color + +window: + # Window dimensions (changes require restart) + # + # Specified in number of columns/lines, not pixels. + # If both are `0`, this setting is ignored. + dimensions: + columns: 119 + lines: 41 + + # 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 + decorations: none + + # When true, alacritty starts maximized. + start_maximized: false + +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 + + # 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 + +# Spaces per Tab (changes require restart) +# +# This setting defines the width of a tab in cells. +# +# Some applications, like Emacs, rely on knowing about the width of a tab. +# To prevent unexpected behavior in these applications, it's also required to +# change the `it` value in terminfo when altering this setting. +tabspaces: 8 + +# Font configuration (changes require restart) +# +# Important font attributes like antialiasing, subpixel aa, and hinting can be +# controlled through fontconfig. Specifically, the following attributes should +# have an effect: +# - hintstyle +# - antialias +# - lcdfilter +# - rgba +# +# For instance, if you wish to disable subpixel antialiasing, you might set the +# rgba property to `none`. If you wish to completely disable antialiasing, you +# can set antialias to `false`. +# +# Please see these resources for more information on how to use fontconfig: +# - https://wiki.archlinux.org/index.php/font_configuration#Fontconfig_configuration +# - file:///usr/share/doc/fontconfig/fontconfig-user.html +font: + # Normal (roman) font face + normal: + family: IBM Plex Mono + style: Regular + + # Bold font face + bold: + family: IBM Plex Mono + style: SemiBold + + # Italic font face + italic: + family: IBM Plex Mono + style: Italic + + # Point size + size: 8 + + # 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: 2 + + # 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 + +# Display the time it takes to redraw each frame. +render_timer: false + +# Keep the log file after quitting Alacritty. +persistent_logging: false + +# If `true`, bold text is drawn using the bright color variants. +draw_bold_text_with_bright_colors: true + +# Colors (Tomorrow Night Bright) +colors: + # Default colors + primary: + background: '0xffffff' + foreground: '0x000000' + + # 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 + # + # 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' + + # Normal colors + normal: + black: '0x000000' + red: '0xd54e53' + green: '0xb9ca4a' + yellow: '0xe6c547' + blue: '0x7aa6da' + magenta: '0xc397d8' + cyan: '0x70c0ba' + white: '0xffffff' + + # 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: '0x333333' + red: '0xf2777a' + green: '0x99cc99' + yellow: '0xffcc66' + blue: '0x6699cc' + magenta: '0xcc99cc' + cyan: '0x66cccc' + white: '0xdddddd' + + # Indexed Colors + # + # The indexed colors include all colors from 16 to 256. + # When these are not set, they're filled with sensible defaults. + #indexed_colors: + # - { index: 16, color: '0x000000' } + +# Visual Bell +# +# Any time the BEL code is received, Alacritty "rings" the visual bell. Once +# rung, the terminal background will be set to white and transition back to the +# default background color. You can control the rate of this transition by +# setting the `duration` property (represented in milliseconds). You can also +# configure the transition function by setting the `animation` property. +# +# Values for `animation`: +# - Ease +# - EaseOut +# - EaseOutSine +# - EaseOutQuad +# - EaseOutCubic +# - EaseOutQuart +# - EaseOutQuint +# - EaseOutExpo +# - EaseOutCirc +# - Linear +# +# Specifying a `duration` of `0` will disable the visual bell. +visual_bell: + animation: EaseOutExpo + duration: 0 + +# Background opacity +# +# Window opacity as a floating point number from `0.0` to `1.0`. +# The value `0.0` is completely transparent and `1.0` is opaque. +background_opacity: 1.0 + +# Mouse bindings +# +# Available fields: +# - mouse +# - action +# - mods (optional) +# +# Values for `mouse`: +# - Middle +# - Left +# - Right +# - Numeric identifier such as `5` +# +# All available `mods` and `action` values are documented in the key binding +# section. +mouse_bindings: + - { mouse: Middle, action: PasteSelection } + +mouse: + # Click settings + # + # The `double_click` and `triple_click` settings control the time + # alacritty should wait for accepting multiple clicks as one double + # or triple click. + double_click: { threshold: 300 } + triple_click: { threshold: 300 } + + # If this is `true`, the cursor is temporarily hidden when typing. + hide_when_typing: true + + url: + # URL launcher + # + # This program is executed when clicking on a text which is recognized as a URL. + # The URL is always added to the command as the last parameter. + launcher: xdg-open + + # 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: Control|Shift + +selection: + semantic_escape_chars: ",│`|:\"' ()[]{}<>" + + # When set to `true`, selected text will be copied to both the primary and + # the selection clipboard. Otherwise, it will only be copied to the selection + # clipboard. + save_to_clipboard: false + +dynamic_title: true + +cursor: + # Cursor style + # + # Values for 'style': + # - ▇ Block + # - _ Underline + # - | Beam + style: Block + + # If this is `true`, the cursor will be rendered as a hollow box when the + # window is not focused. + unfocused_hollow: true + +# Live config reload (changes require restart) +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. +#shell: +# program: /bin/bash +# args: +# - --login + +# Key bindings +# +# Key bindings are specified as a list of objects. Each binding will specify +# a key and modifiers required to trigger it, terminal modes where the binding +# is applicable, and what should be done when the key binding fires. It can +# either send a byte sequnce to the running application (`chars`), execute +# a predefined action (`action`) or fork and execute a specified command plus +# arguments (`command`). +# +# Example: +# `- { key: V, mods: Command, action: Paste }` +# +# Available fields: +# - key +# - mods (optional) +# - chars | action | command (exactly one required) +# - mode (optional) +# +# Values for `key`: +# - `A` -> `Z` +# - `F1` -> `F12` +# - `Key1` -> `Key0` +# +# A full list with available key codes can be found here: +# https://docs.rs/glutin/*/glutin/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` +# +# Values for `mods`: +# - Command +# - Control +# - Shift +# - Alt +# +# Multiple `mods` can be combined using `|` like this: `mods: Control|Shift`. +# Whitespace and capitalization is relevant and must match the example. +# +# Values for `chars`: +# 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. +# +# Values for `action`: +# - Paste +# - PasteSelection +# - Copy +# - IncreaseFontSize +# - DecreaseFontSize +# - ResetFontSize +# - ScrollPageUp +# - ScrollPageDown +# - ScrollToTop +# - ScrollToBottom +# - ClearHistory +# - Hide +# - Quit +# - ClearLogNotice +# +# Values for `command`: +# The `command` field must be a map containing a `program` string and +# an `args` array of command line parameter strings. +# +# Example: +# `command: { program: "alacritty", args: ["-e", "vttest"] }` +# +# Values for `mode`: +# - ~AppCursor +# - AppCursor +# - ~AppKeypad +# - AppKeypad +key_bindings: + - { key: V, mods: Alt|Shift, action: Paste } + - { key: C, mods: Alt|Shift, action: Copy } + - { key: V, mods: Control|Shift, action: Paste } + - { key: C, mods: Control|Shift, action: Copy } + - { key: Paste, action: Paste } + - { key: Copy, action: Copy } + - { key: Q, mods: Command, action: Quit } + - { key: W, mods: Command, action: Quit } + - { key: Insert, mods: Shift, action: PasteSelection } + - { key: Key0, mods: Control, action: ResetFontSize } + - { key: Equals, mods: Control, action: IncreaseFontSize } + - { key: Subtract, mods: Control, action: DecreaseFontSize } + - { key: L, mods: Control, action: ClearLogNotice } + - { key: L, mods: Control, chars: "\x0c" } + - { key: Home, chars: "\x1bOH", mode: AppCursor } + - { key: Home, chars: "\x1b[H", mode: ~AppCursor } + - { key: End, chars: "\x1bOF", mode: AppCursor } + - { key: End, chars: "\x1b[F", mode: ~AppCursor } + - { key: PageUp, mods: Shift, chars: "\x1b[5;2~" } + - { key: PageUp, mods: Control, chars: "\x1b[5;5~" } + - { key: PageUp, chars: "\x1b[5~" } + - { key: PageDown, mods: Shift, chars: "\x1b[6;2~" } + - { key: PageDown, mods: Control, chars: "\x1b[6;5~" } + - { key: PageDown, chars: "\x1b[6~" } + - { key: Tab, mods: Shift, chars: "\x1b[Z" } + - { key: Back, chars: "\x7f" } + - { key: Back, mods: Alt, chars: "\x1b\x7f" } + - { key: Insert, chars: "\x1b[2~" } + - { key: Delete, chars: "\x1b[3~" } + - { key: Left, mods: Shift, chars: "\x1b[1;2D" } + - { key: Left, mods: Control, chars: "\x1b[1;5D" } + - { key: Left, mods: Alt, chars: "\x1b[1;3D" } + - { key: Left, chars: "\x1b[D", mode: ~AppCursor } + - { key: Left, chars: "\x1bOD", mode: AppCursor } + - { key: Right, mods: Shift, chars: "\x1b[1;2C" } + - { key: Right, mods: Control, chars: "\x1b[1;5C" } + - { key: Right, mods: Alt, chars: "\x1b[1;3C" } + - { key: Right, chars: "\x1b[C", mode: ~AppCursor } + - { key: Right, chars: "\x1bOC", mode: AppCursor } + - { key: Up, mods: Shift, chars: "\x1b[1;2A" } + - { key: Up, mods: Control, chars: "\x1b[1;5A" } + - { key: Up, mods: Alt, chars: "\x1b[1;3A" } + - { key: Up, chars: "\x1b[A", mode: ~AppCursor } + - { key: Up, chars: "\x1bOA", mode: AppCursor } + - { key: Down, mods: Shift, chars: "\x1b[1;2B" } + - { key: Down, mods: Control, chars: "\x1b[1;5B" } + - { key: Down, mods: Alt, chars: "\x1b[1;3B" } + - { key: Down, chars: "\x1b[B", mode: ~AppCursor } + - { key: Down, chars: "\x1bOB", mode: AppCursor } + - { key: F1, chars: "\x1bOP" } + - { key: F2, chars: "\x1bOQ" } + - { key: F3, chars: "\x1bOR" } + - { key: F4, chars: "\x1bOS" } + - { key: F5, chars: "\x1b[15~" } + - { key: F6, chars: "\x1b[17~" } + - { key: F7, chars: "\x1b[18~" } + - { key: F8, chars: "\x1b[19~" } + - { key: F9, chars: "\x1b[20~" } + - { key: F10, chars: "\x1b[21~" } + - { key: F11, chars: "\x1b[23~" } + - { key: F12, chars: "\x1b[24~" } + - { key: F1, mods: Shift, chars: "\x1b[1;2P" } + - { key: F2, mods: Shift, chars: "\x1b[1;2Q" } + - { key: F3, mods: Shift, chars: "\x1b[1;2R" } + - { key: F4, mods: Shift, chars: "\x1b[1;2S" } + - { key: F5, mods: Shift, chars: "\x1b[15;2~" } + - { key: F6, mods: Shift, chars: "\x1b[17;2~" } + - { key: F7, mods: Shift, chars: "\x1b[18;2~" } + - { key: F8, mods: Shift, chars: "\x1b[19;2~" } + - { key: F9, mods: Shift, chars: "\x1b[20;2~" } + - { key: F10, mods: Shift, chars: "\x1b[21;2~" } + - { key: F11, mods: Shift, chars: "\x1b[23;2~" } + - { key: F12, mods: Shift, chars: "\x1b[24;2~" } + - { key: F1, mods: Control, chars: "\x1b[1;5P" } + - { key: F2, mods: Control, chars: "\x1b[1;5Q" } + - { key: F3, mods: Control, chars: "\x1b[1;5R" } + - { key: F4, mods: Control, chars: "\x1b[1;5S" } + - { key: F5, mods: Control, chars: "\x1b[15;5~" } + - { key: F6, mods: Control, chars: "\x1b[17;5~" } + - { key: F7, mods: Control, chars: "\x1b[18;5~" } + - { key: F8, mods: Control, chars: "\x1b[19;5~" } + - { key: F9, mods: Control, chars: "\x1b[20;5~" } + - { key: F10, mods: Control, chars: "\x1b[21;5~" } + - { key: F11, mods: Control, chars: "\x1b[23;5~" } + - { key: F12, mods: Control, chars: "\x1b[24;5~" } + - { key: F1, mods: Alt, chars: "\x1b[1;6P" } + - { key: F2, mods: Alt, chars: "\x1b[1;6Q" } + - { key: F3, mods: Alt, chars: "\x1b[1;6R" } + - { key: F4, mods: Alt, chars: "\x1b[1;6S" } + - { key: F5, mods: Alt, chars: "\x1b[15;6~" } + - { key: F6, mods: Alt, chars: "\x1b[17;6~" } + - { key: F7, mods: Alt, chars: "\x1b[18;6~" } + - { key: F8, mods: Alt, chars: "\x1b[19;6~" } + - { key: F9, mods: Alt, chars: "\x1b[20;6~" } + - { key: F10, mods: Alt, chars: "\x1b[21;6~" } + - { key: F11, mods: Alt, chars: "\x1b[23;6~" } + - { key: F12, mods: Alt, chars: "\x1b[24;6~" } + - { key: F1, mods: Super, chars: "\x1b[1;3P" } + - { key: F2, mods: Super, chars: "\x1b[1;3Q" } + - { key: F3, mods: Super, chars: "\x1b[1;3R" } + - { key: F4, mods: Super, chars: "\x1b[1;3S" } + - { key: F5, mods: Super, chars: "\x1b[15;3~" } + - { key: F6, mods: Super, chars: "\x1b[17;3~" } + - { key: F7, mods: Super, chars: "\x1b[18;3~" } + - { key: F8, mods: Super, chars: "\x1b[19;3~" } + - { key: F9, mods: Super, chars: "\x1b[20;3~" } + - { key: F10, mods: Super, chars: "\x1b[21;3~" } + - { key: F11, mods: Super, chars: "\x1b[23;3~" } + - { key: F12, mods: Super, chars: "\x1b[24;3~" } diff --git a/.config/nvim/colors/dln-light.vim b/.config/nvim/colors/dln-light.vim index 4ba13cf..e0c070e 100644 --- a/.config/nvim/colors/dln-light.vim +++ b/.config/nvim/colors/dln-light.vim @@ -1,73 +1,352 @@ +" Theme setup hi clear -if version > 580 - if exists("syntax_on") - syntax reset - endif -endif +syntax reset -let colors_name="dln-light" +let g:colors_name = "dln-dark" -if has("gui_running") - set background=light -endif +let s:red_50 = "#ffebee" +let s:red_100 = "#ffcdd2" +let s:red_200 = "#ef9a9a" +let s:red_300 = "#e57373" +let s:red_400 = "#ef5350" +let s:red_500 = "#f44336" +let s:red_600 = "#e53935" +let s:red_700 = "#d32f2f" +let s:red_800 = "#c62828" +let s:red_900 = "#b71c1c" +let s:red_a100 = "#ff8a80" +let s:red_a200 = "#ff5252" +let s:red_a400 = "#ff1744" +let s:red_a700 = "#d50000" -hi Normal guifg=#000000 guibg=#ffffff gui=NONE -hi DiffAdd guifg=#003300 guibg=#DDFFDD gui=NONE -hi DiffChange guibg=#ECECEC gui=NONE -hi DiffText guifg=#000033 guibg=#DDDDFF gui=NONE -hi DiffDelete guifg=#DDCCCC guibg=#FFDDDD gui=NONE -hi Folded guifg=#808080 guibg=#ECECEC gui=NONE -hi LineNr guifg=#d0d0d0 guibg=#fcfcfc gui=none -hi NonText guifg=#808080 guibg=#fcfcfc gui=none -hi VertSplit guifg=#BBBBBB guibg=#BBBBBB gui=NONE -hi SignColumn guifg=#404040 guibg=#fcfcfc gui=none -hi StatusLine guifg=#404040 guibg=#BBBBBB gui=BOLD -hi StatusLineNC guifg=#BBBBBB guibg=#ECECEC gui=ITALIC -hi ModeMsg guifg=#990000 gui=NONE -hi MoreMsg guifg=#990000 gui=NONE -hi Title guifg=#EF5939 gui=NONE -hi WarningMsg guifg=#EF5939 gui=NONE -hi SpecialKey guifg=#FFFFFF guibg=#FF1100 gui=ITALIC -hi MatchParen guifg=#000000 guibg=#CDCDFD gui=NONE -hi Underlined guifg=#000000 gui=UNDERLINE -hi Directory guifg=#990000 gui=NONE -hi Visual guifg=#FFFFFF guibg=#3465A4 gui=NONE -hi VisualNOS guifg=#FFFFFF guibg=#204A87 gui=NONE -hi IncSearch guifg=#000000 guibg=#FFF9C4 gui=none -hi Search guifg=#000000 guibg=#FFF9C4 gui=none -hi Ignore guifg=#808080 gui=NONE -hi Identifier guifg=#0086B3 gui=NONE -hi PreProc guifg=#A0A0A0 gui=BOLD -hi Comment guifg=#607D8B gui=ITALIC -hi Operator guifg=#8E24AA gui=bold -hi Constant guifg=#177F80 gui=NONE -hi String guifg=#388E3C gui=italic -hi Function guifg=#990000 gui=BOLD -hi Statement guifg=#000000 gui=BOLD -hi Type guifg=#445588 gui=BOLD -hi Number guifg=#1C9898 gui=NONE -hi Todo guifg=#f44336 guibg=#FFF3E0 gui=none -hi Special guifg=#9E9D24 guibg=#ffffff gui=bold -hi rubySymbol guifg=#960B73 gui=NONE -hi Error guifg=#F8F8FF guibg=#FF1100 gui=NONE -hi Label guifg=#000000 gui=BOLD -hi StorageClass guifg=#000000 gui=BOLD -hi Structure guifg=#000000 gui=BOLD -hi TypeDef guifg=#000000 gui=BOLD -hi WildMenu guifg=#7FBDFF guibg=#425C78 gui=NONE -hi Pmenu guifg=#FFFFFF guibg=#808080 gui=BOLD -hi PmenuSel guifg=#000000 guibg=#CDCDFD gui=ITALIC -hi PmenuSbar guifg=#444444 guibg=#000000 gui=NONE -hi PmenuThumb guifg=#AAAAAA guibg=#AAAAAA gui=NONE -hi TabLine guifg=#404040 guibg=#DDDDDD gui=NONE -hi TabLineFill guifg=#404040 guibg=#DDDDDD gui=NONE -hi TabLineSel guifg=#404040 gui=BOLD -hi cucumberTags guifg=#333333 guibg=#FFFF66 gui=BOLD -hi htmlTagN gui=BOLD -hi Cursor guifg=#F8F8FF guibg=#444454 gui=NONE -hi CursorLine guibg=#D8D8DD gui=NONE -hi CursorColumn guibg=#D8D8DD gui=NONE -hi goFunctionCall guifg=#512DA8 gui=NONE -hi Bookmark guifg=#EDE7F6 guibg=#9575CD gui=italic +let s:pink_50 = "#fce4ec" +let s:pink_100 = "#f8bbd0" +let s:pink_200 = "#f48fb1" +let s:pink_300 = "#f06292" +let s:pink_400 = "#ec407a" +let s:pink_500 = "#e91e63" +let s:pink_600 = "#d81b60" +let s:pink_700 = "#c2185b" +let s:pink_800 = "#ad1457" +let s:pink_900 = "#880e4f" +let s:pink_a100 = "#ff80ab" +let s:pink_a200 = "#ff4081" +let s:pink_a400 = "#f50057" +let s:pink_a700 = "#c51162" -hi link rubyStringDelimiter String +let s:purple_50 = "#f3e5f5" +let s:purple_100 = "#e1bee7" +let s:purple_200 = "#ce93d8" +let s:purple_300 = "#ba68c8" +let s:purple_400 = "#ab47bc" +let s:purple_500 = "#9c27b0" +let s:purple_600 = "#8e24aa" +let s:purple_700 = "#7b1fa2" +let s:purple_800 = "#6a1b9a" +let s:purple_900 = "#4a148c" +let s:purple_a100 = "#ea80fc" +let s:purple_a200 = "#e040fb" +let s:purple_a400 = "#d500f9" +let s:purple_a700 = "#aa00ff" + +let s:deep_purple_50 = "#ede7f6" +let s:deep_purple_100 = "#d1c4e9" +let s:deep_purple_200 = "#b39ddb" +let s:deep_purple_300 = "#9575cd" +let s:deep_purple_400 = "#7e57c2" +let s:deep_purple_500 = "#673ab7" +let s:deep_purple_600 = "#5e35b1" +let s:deep_purple_700 = "#512da8" +let s:deep_purple_800 = "#4527a0" +let s:deep_purple_900 = "#311b92" +let s:deep_purple_a100 = "#b388ff" +let s:deep_purple_a200 = "#7c4dff" +let s:deep_purple_a400 = "#651fff" +let s:deep_purple_a700 = "#6200ea" + +let s:indigo_50 = "#e8eaf6" +let s:indigo_100 = "#c5cae9" +let s:indigo_200 = "#9fa8da" +let s:indigo_300 = "#7986cb" +let s:indigo_400 = "#5c6bc0" +let s:indigo_500 = "#3f51b5" +let s:indigo_600 = "#3949ab" +let s:indigo_700 = "#303f9f" +let s:indigo_800 = "#283593" +let s:indigo_900 = "#1a237e" +let s:indigo_a100 = "#8c9eff" +let s:indigo_a200 = "#536dfe" +let s:indigo_a400 = "#3d5afe" +let s:indigo_a700 = "#304ffe" + +let s:blue_50 = "#e3f2fd" +let s:blue_100 = "#bbdefb" +let s:blue_200 = "#90caf9" +let s:blue_300 = "#64b5f6" +let s:blue_400 = "#42a5f5" +let s:blue_500 = "#2196f3" +let s:blue_600 = "#1e88e5" +let s:blue_700 = "#1976d2" +let s:blue_800 = "#1565c0" +let s:blue_900 = "#0d47a1" +let s:blue_a100 = "#82b1ff" +let s:blue_a200 = "#448aff" +let s:blue_a400 = "#2979ff" +let s:blue_a700 = "#2962ff" + +let s:light_blue_50 = "#e1f5fe" +let s:light_blue_100 = "#b3e5fc" +let s:light_blue_200 = "#81d4fa" +let s:light_blue_300 = "#4fc3f7" +let s:light_blue_400 = "#29b6fc" +let s:light_blue_500 = "#03a9f4" +let s:light_blue_600 = "#039be5" +let s:light_blue_700 = "#0288d1" +let s:light_blue_800 = "#0277bd" +let s:light_blue_900 = "#01579b" +let s:light_blue_a100 = "#80d8ff" +let s:light_blue_a200 = "#40c4ff" +let s:light_blue_a400 = "#00b0ff" +let s:light_blue_a700 = "#0091ea" + +let s:cyan_50 = "#e0f7fa" +let s:cyan_100 = "#b2ebf2" +let s:cyan_200 = "#80deea" +let s:cyan_300 = "#4dd0e1" +let s:cyan_400 = "#26c6da" +let s:cyan_500 = "#00bcd4" +let s:cyan_600 = "#00acc1" +let s:cyan_700 = "#0097a7" +let s:cyan_800 = "#00838f" +let s:cyan_900 = "#006064" +let s:cyan_a100 = "#84ffff" +let s:cyan_a200 = "#18ffff" +let s:cyan_a400 = "#00e5ff" +let s:cyan_a700 = "#00b8d4" + +let s:teal_50 = "#e0f2f1" +let s:teal_100 = "#b2dfdb" +let s:teal_200 = "#80cbc4" +let s:teal_300 = "#4db6ac" +let s:teal_400 = "#26a69a" +let s:teal_500 = "#009688" +let s:teal_600 = "#00897b" +let s:teal_700 = "#00796b" +let s:teal_800 = "#00695c" +let s:teal_900 = "#004d40" +let s:teal_a100 = "#a7ffeb" +let s:teal_a200 = "#64ffda" +let s:teal_a400 = "#1de9b6" +let s:teal_a700 = "#00bfa5" + +let s:green_50 = "#e8f5e9" +let s:green_100 = "#c8e6c9" +let s:green_200 = "#a5d6a7" +let s:green_300 = "#81c784" +let s:green_400 = "#66bb6a" +let s:green_500 = "#4caf50" +let s:green_600 = "#43a047" +let s:green_700 = "#388e3c" +let s:green_800 = "#2e7d32" +let s:green_900 = "#1b5e20" +let s:green_a100 = "#b9f6ca" +let s:green_a200 = "#69f0ae" +let s:green_a400 = "#00e676" +let s:green_a700 = "#00c853" + +let s:light_green_50 = "#f1f8e9" +let s:light_green_100 = "#dcedc8" +let s:light_green_200 = "#c5e1a5" +let s:light_green_300 = "#aed581" +let s:light_green_400 = "#9ccc65" +let s:light_green_500 = "#8bc34a" +let s:light_green_600 = "#7cb342" +let s:light_green_700 = "#689f38" +let s:light_green_800 = "#558b2f" +let s:light_green_900 = "#33691e" +let s:light_green_a100 = "#ccff90" +let s:light_green_a200 = "#b2ff59" +let s:light_green_a400 = "#76ff03" +let s:light_green_a700 = "#64dd17" + +let s:lime_50 = "#f9fbe7" +let s:lime_100 = "#f0f4c3" +let s:lime_200 = "#e6ee9c" +let s:lime_300 = "#dce775" +let s:lime_400 = "#d4e157" +let s:lime_500 = "#cddc39" +let s:lime_600 = "#c0ca33" +let s:lime_700 = "#a4b42b" +let s:lime_800 = "#9e9d24" +let s:lime_900 = "#827717" +let s:lime_a100 = "#f4ff81" +let s:lime_a200 = "#eeff41" +let s:lime_a400 = "#c6ff00" +let s:lime_a700 = "#aeea00" + +let s:yellow_50 = "#fffde7" +let s:yellow_100 = "#fff9c4" +let s:yellow_200 = "#fff590" +let s:yellow_300 = "#fff176" +let s:yellow_400 = "#ffee58" +let s:yellow_500 = "#ffeb3b" +let s:yellow_600 = "#fdd835" +let s:yellow_700 = "#fbc02d" +let s:yellow_800 = "#f9a825" +let s:yellow_900 = "#f57f17" +let s:yellow_a100 = "#ffff82" +let s:yellow_a200 = "#ffff00" +let s:yellow_a400 = "#ffea00" +let s:yellow_a700 = "#ffd600" + +let s:amber_50 = "#fff8e1" +let s:amber_100 = "#ffecb3" +let s:amber_200 = "#ffe082" +let s:amber_300 = "#ffd54f" +let s:amber_400 = "#ffca28" +let s:amber_500 = "#ffc107" +let s:amber_600 = "#ffb300" +let s:amber_700 = "#ffa000" +let s:amber_800 = "#ff8f00" +let s:amber_900 = "#ff6f00" +let s:amber_a100 = "#ffe57f" +let s:amber_a200 = "#ffd740" +let s:amber_a400 = "#ffc400" +let s:amber_a700 = "#ffab00" + +let s:orange_50 = "#fff3e0" +let s:orange_100 = "#ffe0b2" +let s:orange_200 = "#ffcc80" +let s:orange_300 = "#ffb74d" +let s:orange_400 = "#ffa726" +let s:orange_500 = "#ff9800" +let s:orange_600 = "#fb8c00" +let s:orange_700 = "#f57c00" +let s:orange_800 = "#ef6c00" +let s:orange_900 = "#e65100" +let s:orange_a100 = "#ffd180" +let s:orange_a200 = "#ffab40" +let s:orange_a400 = "#ff9100" +let s:orange_a700 = "#ff6d00" + +let s:deep_orange_50 = "#fbe9a7" +let s:deep_orange_100 = "#ffccbc" +let s:deep_orange_200 = "#ffab91" +let s:deep_orange_300 = "#ff8a65" +let s:deep_orange_400 = "#ff7043" +let s:deep_orange_500 = "#ff5722" +let s:deep_orange_600 = "#f4511e" +let s:deep_orange_700 = "#e64a19" +let s:deep_orange_800 = "#d84315" +let s:deep_orange_900 = "#bf360c" +let s:deep_orange_a100 = "#ff9e80" +let s:deep_orange_a200 = "#ff6e40" +let s:deep_orange_a400 = "#ff3d00" +let s:deep_orange_a700 = "#dd2600" + +let s:brown_50 = "#efebe9" +let s:brown_100 = "#d7ccc8" +let s:brown_200 = "#bcaaa4" +let s:brown_300 = "#a1887f" +let s:brown_400 = "#8d6e63" +let s:brown_500 = "#795548" +let s:brown_600 = "#6d4c41" +let s:brown_700 = "#5d4037" +let s:brown_800 = "#4e342e" +let s:brown_900 = "#3e2723" + +let s:grey_50 = "#fafafa" +let s:grey_100 = "#f5f5f5" +let s:grey_200 = "#eeeeee" +let s:grey_300 = "#e0e0e0" +let s:grey_400 = "#bdbdbd" +let s:grey_500 = "#9e9e9e" +let s:grey_600 = "#757575" +let s:grey_700 = "#616161" +let s:grey_800 = "#424242" +let s:grey_900 = "#212121" +let s:black_1000 = "#000000" +let s:white_1000 = "#ffffff" + +let s:blue_grey_50 = "#eceff1" +let s:blue_grey_100 = "#cfd8dc" +let s:blue_grey_200 = "#b0bbc5" +let s:blue_grey_300 = "#90a4ae" +let s:blue_grey_400 = "#78909c" +let s:blue_grey_500 = "#607d8b" +let s:blue_grey_600 = "#546e7a" +let s:blue_grey_700 = "#455a64" +let s:blue_grey_800 = "#37474f" +let s:blue_grey_900 = "#263238" + + +" Highlighting function +fun! hi(group, guifg, guibg, attr) + if a:guifg != "" + exec "hi " . a:group . " guifg=" . a:guifg + endif + if a:guibg != "" + exec "hi " . a:group . " guibg=" . a:guibg + endif + if a:attr != "" + exec "hi " . a:group . " gui=" . a:attr + endif +endfun + +" FIXME: This needs doing + +call hi("Visual", s:cyan_a100, s:blue_900, "") +call hi("Folded", s:purple_500, s:purple_900, "") +call hi("NonText", s:grey_800, "", "") +call hi("Bookmark", s:black_1000, s:yellow_300, "none") +call hi("Todo", s:yellow_a100, s:yellow_900, "none") +call hi("SignColumn", s:blue_grey_100, s:white_1000, "") +call hi("VertSplit", s:blue_grey_800, s:blue_grey_300, "") +call hi("LineNr", s:blue_grey_100, s:white_1000, "italic") +call hi("CursorLine", "", "#fafaf3", "") +call hi("CursorLineNR", s:blue_grey_200, "#eaeaea", "") +call hi("Normal", s:black_1000, "", "") +call hi("Bold", "", "", "bold") +call hi("Italic", "", "", "italic") +call hi("Boolean", s:deep_orange_900, "", "") +call hi("Character", "", "", "") +call hi("Pmenu", s:light_green_50, s:blue_grey_800, "none") +call hi("PmenuSbar", s:light_green_50, s:blue_grey_800, "none") +call hi("PmenuSel", s:yellow_50, s:deep_purple_900, "") +call hi("Comment", s:blue_grey_400, "", "italic") +call hi("Conditional", "", "", "") +call hi("Constant", "", "", "") +call hi("Define", "", "", "") +call hi("Delimiter", "", "", "") +call hi("Float", "", "", "") +call hi("Function", s:blue_700, "", "bold") +call hi("Identifier", s:indigo_800, "", "") +call hi("Include", "", "", "") +call hi("Keyword", s:indigo_800, "", "") +call hi("Label", "", "", "") +call hi("Number", s:indigo_300, "", "") +call hi("Operator", s:cyan_800, "", "none") +call hi("PreProc", "", "", "") +call hi("Repeat", "", "", "") +call hi("Search", "", s:amber_700, "none") +call hi("Special", s:green_400, "", "") +call hi("SpecialChar", "", "", "") +call hi("Statement", s:indigo_700, "", "none") +call hi("StorageClass", "", "", "") +call hi("String", s:green_800, "", "italic") +call hi("Structure", "", "", "") +call hi("Tag", "", "", "") +call hi("Todo", "", "", "") +call hi("Type", s:cyan_700, "", "none") +call hi("Typedef", "", "", "") +call hi("goDeclaration", s:deep_purple_900, "", "none") +call hi("goReceiverType", s:cyan_700, "", "none") +call hi("goMethodCall", s:brown_700, "", "none") +call hi("goField", s:cyan_900, "", "none") +call hi("goFunctionCall", s:blue_grey_800, "", "none") +call hi("goSameId", s:green_900, "#f7f9e0", "italic") +call hi("GitGutterAdd", s:light_green_500, "", "") +call hi("GitGutterChange",s:light_blue_300, "", "") +call hi("GitGutterDelete",s:yellow_300, "", "") +call hi("ALEErrorSign",s:black_1000, s:red_400, "none") +call hi("ALEWarningSign",s:orange_200, "", "none") diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index 259e4bb..ff71803 100644 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -293,6 +293,7 @@ map ` :b# "" "Turn off search highlight +map :noh map :noh nmap ,/ :let @/="" @@ -496,11 +497,12 @@ let g:go_highlight_operators = 1 let g:go_highlight_structs = 1 let g:go_highlight_types = 1 let g:go_auto_sameids = 1 -let g:go_auto_type_info = 0 " let g:go_def_mapping_enabled = 0 let g:go_info_mode = 'guru' let g:go_updatetime = 20 let g:go_snippet_engine = "neosnippet" +" Let coc.nvim handle GoDef. +let g:go_def_mapping_enabled = 0 autocmd FileType go nmap i (go-info) autocmd FileType go nmap (go-doc) @@ -564,7 +566,7 @@ let &t_8b = "[48;2;%lu;%lu;%lum" " color dln-light color dln-dark -map ,l :color dln-dark +map ,l :color dln-light let s:hidden_all = 1 set noshowmode diff --git a/bin/alacritty-light b/bin/alacritty-light new file mode 100755 index 0000000..1f4b2fa --- /dev/null +++ b/bin/alacritty-light @@ -0,0 +1,2 @@ +#!/bin/sh +exec alacritty --config-file /home/dln/.config/alacritty/alacritty-light.yml "$@"