Compare commits

..

No commits in common. "19f2bc6a5613f8cc6cf9ea0f622c2c9a2ed7aca4" and "48ab06113dcbd904873b8074389c6e5a3cd6e314" have entirely different histories.

2 changed files with 32 additions and 40 deletions

View File

@ -13,21 +13,18 @@ env:
# `infocmp xterm-256color`. # `infocmp xterm-256color`.
TERM: xterm-256color TERM: xterm-256color
window: # Window dimensions in character columns and lines
# Window dimensions in character columns and lines # (changes require restart)
# (changes require restart) dimensions:
dimensions: columns: 80
columns: 80 lines: 24
lines: 24
# Adds this many blank pixels of padding around the window
# Units are physical pixels; this is not DPI aware.
# (change requires restart)
padding:
x: 10
y: 20
decorations: transparent # Adds this many blank pixels of padding around the window
# Units are physical pixels; this is not DPI aware.
# (change requires restart)
padding:
x: 10
y: 10
# Display tabs using this many cells (changes require restart) # Display tabs using this many cells (changes require restart)
tabspaces: 8 tabspaces: 8
@ -61,15 +58,15 @@ font:
# Offset is the extra space around each character. offset.y can be thought of # Offset is the extra space around each character. offset.y can be thought of
# as modifying the linespacing, and offset.x as modifying the letter spacing. # as modifying the linespacing, and offset.x as modifying the letter spacing.
offset: offset:
x: 0 x: 0.0
y: 0 y: 0.0
# Glyph offset determines the locations of the glyphs within their cells with # Glyph offset determines the locations of the glyphs within their cells with
# the default being at the bottom. Increase the x offset to move the glyph to # the default being at the bottom. Increase the x offset to move the glyph to
# the right, increase the y offset to move the glyph upward. # the right, increase the y offset to move the glyph upward.
glyph_offset: glyph_offset:
x: 0 x: 0.0
y: 0 y: 0.0
# OS X only: use thin stroke font rendering. Thin strokes are suitable # OS X only: use thin stroke font rendering. Thin strokes are suitable
# for retina displays, but for non-retina you probably want this set to # for retina displays, but for non-retina you probably want this set to
@ -79,6 +76,10 @@ font:
# Should display the render timer # Should display the render timer
render_timer: false render_timer: false
# Use custom cursor colors. If true, display the cursor in the cursor.foreground
# and cursor.background colors, otherwise invert the colors of the cursor.
custom_cursor_colors: false
# Colors (Pencil Dark) # Colors (Pencil Dark)
# colors: # colors:
# # Default Colors # # Default Colors
@ -106,7 +107,6 @@ render_timer: false
# cyan: '0x4fb8cc' # cyan: '0x4fb8cc'
# white: '0xf1f1f1' # white: '0xf1f1f1'
# Colors: Nord
colors: colors:
primary: primary:
background: '0x2E3440' background: '0x2E3440'
@ -212,19 +212,19 @@ mouse_bindings:
mouse: mouse:
double_click: { threshold: 300 } double_click: { threshold: 300 }
triple_click: { threshold: 300 } triple_click: { threshold: 300 }
hide_when_typing: false
selection: selection:
semantic_escape_chars: ",│`|:\"' ()[]{}<>" semantic_escape_chars: ",│`|:\"' ()[]{}<>"
cursor: hide_cursor_when_typing: false
# Style of the cursor
# # Style of the cursor
# Values for 'cursor_style': #
# - Block # Values for 'cursor_style':
# - Underline # - Block
# - Beam # - Underline
style: Block # - Beam
cursor_style: Block
# Live config reload (changes require restart) # Live config reload (changes require restart)
live_config_reload: true live_config_reload: true

View File

@ -6,7 +6,6 @@ Plug 'autozimu/LanguageClient-neovim', {'branch': 'next', 'do': 'bash install.sh
Plug 'rhysd/vim-crystal' Plug 'rhysd/vim-crystal'
Plug 'elmcast/elm-vim' Plug 'elmcast/elm-vim'
Plug 'ap/vim-css-color' Plug 'ap/vim-css-color'
Plug 'vim-scripts/avrasm.vim'
Plug 'arcticicestudio/nord-vim' Plug 'arcticicestudio/nord-vim'
@ -21,11 +20,10 @@ set mouse=a " Allow mouse
set signcolumn=yes " Always show extra column set signcolumn=yes " Always show extra column
autocmd BufEnter * call ncm2#enable_for_buffer() " Enable ncm2 for all buffers autocmd BufEnter * call ncm2#enable_for_buffer() " Enable ncm2 for all buffers
autocmd BufRead,BufNewFile *.v set filetype=coq " Coq is not Verilog
autocmd FileType crystal setlocal shiftwidth=2 " Crystal likes 2-wide indent
set completeopt=noinsert,menuone set completeopt=noinsert,menuone
autocmd FileType crystal setlocal shiftwidth=2
let g:LanguageClient_serverCommands = { let g:LanguageClient_serverCommands = {
\ 'haskell': ['hie', '--lsp'], \ 'haskell': ['hie', '--lsp'],
\ 'rust': ['rustup', 'run', 'stable', 'rls'], \ 'rust': ['rustup', 'run', 'stable', 'rls'],
@ -35,12 +33,6 @@ let g:LanguageClient_serverCommands = {
\ 'javascript': ['javascript-typescript-stdio'] \ 'javascript': ['javascript-typescript-stdio']
\ } \ }
let g:deoplete#enable_at_startup = 1 let g:deoplete#enable_at_startup = 1
let g:LanguageClient_diagnosticsDisplay = { let g:LanguageClient_diagnosticsDisplay = {1: {"name": "Error","texthl": "ALEError","signText": ">>","signTexthl": "ALEErrorSign",},2: {"name": "Warning","texthl": "ALEWarning","signText": ">>","signTexthl": "ALEWarningSign",},3: {"name": "Information","texthl": "ALEInfo","signText": ">>","signTexthl": "ALEInfoSign",},4: {"name": "Hint","texthl": "ALEInfo","signText": ">>","signTexthl": "ALEInfoSign",},}
\ 1: {"name": "Error","texthl": "ALEError","signText": ">>","signTexthl": "ALEErrorSign",},
\ 2: {"name": "Warning","texthl": "ALEWarning","signText": ">>","signTexthl": "ALEWarningSign",},
\ 3: {"name": "Information","texthl": "ALEInfo","signText": ">>","signTexthl": "ALEInfoSign",},
\ 4: {"name": "Hint","texthl": "ALEInfo","signText": ">>","signTexthl": "ALEInfoSign",},}
let g:LanguageClient_rootMarkers = {
\ 'haskell': ['.git'],
\ }
colorscheme nord colorscheme nord