This commit is contained in:
Daniel Lundin 2020-01-28 09:55:52 +01:00
parent 056950fb26
commit f27eeb7a4c
3 changed files with 48 additions and 28 deletions

View file

@ -48,9 +48,6 @@ scrolling:
# scrollback is enabled (history > 0). # scrollback is enabled (history > 0).
multiplier: 3 multiplier: 3
# Scroll to the bottom when new text is written to the terminal.
auto_scroll: false
# Spaces per Tab (changes require restart) # Spaces per Tab (changes require restart)
# #
# This setting defines the width of a tab in cells. # This setting defines the width of a tab in cells.
@ -78,23 +75,25 @@ tabspaces: 8
# - https://wiki.archlinux.org/index.php/font_configuration#Fontconfig_configuration # - https://wiki.archlinux.org/index.php/font_configuration#Fontconfig_configuration
# - file:///usr/share/doc/fontconfig/fontconfig-user.html # - file:///usr/share/doc/fontconfig/fontconfig-user.html
font: font:
# Normal (roman) font face size: 14
normal: normal:
family: IBM Plex Mono family: IBM Plex Mono
style: Regular style: Regular
# Bold font face
bold: bold:
family: IBM Plex Mono family: IBM Plex Mono
style: SemiBold style: SemiBold
# Italic font face
italic: italic:
family: IBM Plex Mono family: IBM Plex Mono
style: Italic style: Italic
# normal:
# Point size # family: Fira Code
size: 27 # style: Regular
# bold:
# family: Fira Code
# style: SemiBold
# italic:
# family: Fira Code
# style: Italic
# 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 line spacing, and `offset.x` as modifying the letter spacing. # as modifying the line spacing, and `offset.x` as modifying the letter spacing.
@ -115,7 +114,7 @@ draw_bold_text_with_bright_colors: true
colors: colors:
# Default colors # Default colors
primary: primary:
background: '0x151515' background: '0x121212'
foreground: '0xa1b0b8' foreground: '0xa1b0b8'
# Normal colors # Normal colors

View file

@ -293,17 +293,36 @@ fun! <sid>hi(group, guifg, guibg, attr)
endif endif
endfun endfun
call <sid>hi("Normal", s:white_1000, "", "") " FIXME: this is a todo
call <sid>hi("Bold", "", "", "bold")
call <sid>hi("Italic", "", "", "italic") call <sid>hi("Normal", s:white_1000, "", "")
call <sid>hi("LineNr", s:grey_800, "", "italic") call <sid>hi("Bold", "", "", "bold")
call <sid>hi("CursorLine", "", "#112131", "") call <sid>hi("Italic", "", "", "italic")
call <sid>hi("CursorLineNR", s:grey_500, "#334455", "") call <sid>hi("VertSplit", "#112131", s:blue_grey_800, "")
call <sid>hi("Statement", s:blue_grey_200, "", "bold") call <sid>hi("LineNr", s:grey_800, "", "italic")
call <sid>hi("String", s:light_green_400, "", "italic") call <sid>hi("SignColumn", s:blue_grey_500, "#121212", "")
call <sid>hi("Comment", s:blue_grey_600, "", "italic") call <sid>hi("Visual", s:cyan_100, s:indigo_900, "")
call <sid>hi("Type", s:deep_purple_200, "", "none")
call <sid>hi("Identifier", s:orange_200, "", "") call <sid>hi("Bookmark", s:black_1000, s:yellow_700, "none")
call <sid>hi("goFunction", s:blue_300, "", "bold") call <sid>hi("Todo", s:yellow_100, s:orange_900, "none")
call <sid>hi("goOperator", s:teal_200, "", "")
call <sid>hi("Search", "", s:amber_700, "none") call <sid>hi("CursorLine", "", "#112131", "")
call <sid>hi("CursorLineNR", s:grey_500, "#334455", "")
call <sid>hi("Folded", s:purple_200, s:deep_purple_900, "")
call <sid>hi("Pmenu", s:blue_grey_200, s:blue_grey_800, "none")
call <sid>hi("PmenuSbar", s:blue_grey_500, s:blue_grey_900, "none")
call <sid>hi("PmenuThumb", s:blue_grey_400, s:blue_grey_700, "none")
call <sid>hi("PmenuSel", s:black_1000, s:amber_300, "")
call <sid>hi("CocFloating", s:blue_grey_200, s:blue_grey_900, "none")
call <sid>hi("Statement", s:blue_grey_200, "", "bold")
call <sid>hi("String", s:light_green_400, "", "italic")
call <sid>hi("Comment", s:blue_grey_600, "", "italic")
call <sid>hi("Type", s:deep_purple_100, "", "none")
call <sid>hi("Identifier", s:orange_200, "", "")
call <sid>hi("goFunction", s:blue_300, "", "bold")
call <sid>hi("goOperator", s:teal_200, "", "")
call <sid>hi("Search", "", s:amber_700, "none")
call <sid>hi("goSameId", s:yellow_100, "", "underline")

View file

@ -71,6 +71,8 @@ Plug 'Matt-Deacalion/vim-systemd-syntax'
Plug 'NLKNguyen/papercolor-theme' Plug 'NLKNguyen/papercolor-theme'
Plug 'Shougo/neosnippet.vim' Plug 'Shougo/neosnippet.vim'
Plug 'Shougo/neosnippet-snippets' Plug 'Shougo/neosnippet-snippets'
Plug 'terminalnode/sway-vim-syntax'
" Plug 'vim-syntastic/syntastic' " Plug 'vim-syntastic/syntastic'
Plug 'w0rp/ale' Plug 'w0rp/ale'
@ -563,7 +565,7 @@ let g:vim_markdown_toml_frontmatter = 1
"" Airline "" Airline
let g:airline_powerline_fonts = 1 let g:airline_powerline_fonts = 0
let g:airline_skip_empty_sections = 1 let g:airline_skip_empty_sections = 1
let g:airline#parts#ffenc#skip_expected_string='utf-8[unix]' let g:airline#parts#ffenc#skip_expected_string='utf-8[unix]'
let g:airline_section_x = '' " Hide file type let g:airline_section_x = '' " Hide file type
@ -610,7 +612,7 @@ if darkmode == 'true'
let g:material_terminal_italics = 1 let g:material_terminal_italics = 1
let g:material_theme_style = 'darker' let g:material_theme_style = 'darker'
let g:airline_theme='distinguished' let g:airline_theme='distinguished'
color material color dln-dim
else else
let g:airline_theme='sol' let g:airline_theme='sol'
color dln-light color dln-light