diff --git a/.config/alacritty/alacritty-dark.yml b/.config/alacritty/alacritty-dark.yml index 91f77ac..13fe4cc 100644 --- a/.config/alacritty/alacritty-dark.yml +++ b/.config/alacritty/alacritty-dark.yml @@ -48,9 +48,6 @@ scrolling: # scrollback is enabled (history > 0). 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. @@ -78,23 +75,25 @@ tabspaces: 8 # - https://wiki.archlinux.org/index.php/font_configuration#Fontconfig_configuration # - file:///usr/share/doc/fontconfig/fontconfig-user.html font: - # Normal (roman) font face + size: 14 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: 27 + # normal: + # family: Fira Code + # 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 # 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: # Default colors primary: - background: '0x151515' + background: '0x121212' foreground: '0xa1b0b8' # Normal colors diff --git a/.config/nvim/colors/dln-dim.vim b/.config/nvim/colors/dln-dim.vim index 18e7d05..b20793e 100644 --- a/.config/nvim/colors/dln-dim.vim +++ b/.config/nvim/colors/dln-dim.vim @@ -293,17 +293,36 @@ fun! hi(group, guifg, guibg, attr) endif endfun -call hi("Normal", s:white_1000, "", "") -call hi("Bold", "", "", "bold") -call hi("Italic", "", "", "italic") -call hi("LineNr", s:grey_800, "", "italic") -call hi("CursorLine", "", "#112131", "") -call hi("CursorLineNR", s:grey_500, "#334455", "") -call hi("Statement", s:blue_grey_200, "", "bold") -call hi("String", s:light_green_400, "", "italic") -call hi("Comment", s:blue_grey_600, "", "italic") -call hi("Type", s:deep_purple_200, "", "none") -call hi("Identifier", s:orange_200, "", "") -call hi("goFunction", s:blue_300, "", "bold") -call hi("goOperator", s:teal_200, "", "") -call hi("Search", "", s:amber_700, "none") +" FIXME: this is a todo + +call hi("Normal", s:white_1000, "", "") +call hi("Bold", "", "", "bold") +call hi("Italic", "", "", "italic") +call hi("VertSplit", "#112131", s:blue_grey_800, "") +call hi("LineNr", s:grey_800, "", "italic") +call hi("SignColumn", s:blue_grey_500, "#121212", "") +call hi("Visual", s:cyan_100, s:indigo_900, "") + +call hi("Bookmark", s:black_1000, s:yellow_700, "none") +call hi("Todo", s:yellow_100, s:orange_900, "none") + +call hi("CursorLine", "", "#112131", "") +call hi("CursorLineNR", s:grey_500, "#334455", "") +call hi("Folded", s:purple_200, s:deep_purple_900, "") + +call hi("Pmenu", s:blue_grey_200, s:blue_grey_800, "none") +call hi("PmenuSbar", s:blue_grey_500, s:blue_grey_900, "none") +call hi("PmenuThumb", s:blue_grey_400, s:blue_grey_700, "none") +call hi("PmenuSel", s:black_1000, s:amber_300, "") +call hi("CocFloating", s:blue_grey_200, s:blue_grey_900, "none") + +call hi("Statement", s:blue_grey_200, "", "bold") +call hi("String", s:light_green_400, "", "italic") +call hi("Comment", s:blue_grey_600, "", "italic") +call hi("Type", s:deep_purple_100, "", "none") +call hi("Identifier", s:orange_200, "", "") +call hi("goFunction", s:blue_300, "", "bold") +call hi("goOperator", s:teal_200, "", "") +call hi("Search", "", s:amber_700, "none") + +call hi("goSameId", s:yellow_100, "", "underline") diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index 80900cf..494754c 100644 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -71,6 +71,8 @@ Plug 'Matt-Deacalion/vim-systemd-syntax' Plug 'NLKNguyen/papercolor-theme' Plug 'Shougo/neosnippet.vim' Plug 'Shougo/neosnippet-snippets' +Plug 'terminalnode/sway-vim-syntax' + " Plug 'vim-syntastic/syntastic' Plug 'w0rp/ale' @@ -563,7 +565,7 @@ let g:vim_markdown_toml_frontmatter = 1 "" Airline -let g:airline_powerline_fonts = 1 +let g:airline_powerline_fonts = 0 let g:airline_skip_empty_sections = 1 let g:airline#parts#ffenc#skip_expected_string='utf-8[unix]' let g:airline_section_x = '' " Hide file type @@ -610,7 +612,7 @@ if darkmode == 'true' let g:material_terminal_italics = 1 let g:material_theme_style = 'darker' let g:airline_theme='distinguished' - color material + color dln-dim else let g:airline_theme='sol' color dln-light