From dbc989a79e00305786ca23fae860bf96fbf478de Mon Sep 17 00:00:00 2001 From: pgfm Date: Thu, 28 Jul 2022 08:51:45 -0500 Subject: [PATCH] Several cleanup items and new color schemes. --- .config/alacritty/alacritty.yml | 135 +++++++++++---------------- .config/nvim/lua/colorscheme.lua | 13 ++- .config/nvim/lua/packer_init.lua | 1 + .config/nvim/lua/plugins/lsp.lua | 26 ++++++ .config/nvim/lua/plugins/lualine.lua | 6 +- .config/nvim/lua/plugins/scala.lua | 3 +- 6 files changed, 96 insertions(+), 88 deletions(-) diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml index 1a600ed..2af6045 100644 --- a/.config/alacritty/alacritty.yml +++ b/.config/alacritty/alacritty.yml @@ -188,103 +188,72 @@ font: # If `true`, bold text is drawn using the bright color variants. #draw_bold_text_with_bright_colors: false -colors: - # Gruvbox Material Hard Dark +# Nightfox Alacritty Colors +# Style: terafox +# Upstream: https://github.com/edeneast/nightfox.nvim/raw/main/extra/terafox/nightfox_alacritty.yml +colors: primary: - background: '0x1d2021' - foreground: '0xd4be98' + background: '0x152528' + foreground: '0xe6eaea' normal: - black: '0x32302f' - red: '0xea6962' - green: '0xa9b665' - yellow: '0xd8a657' - blue: '0x7daea3' - magenta: '0xd3869b' - cyan: '0x89b482' - white: '0xd4be98' + black: '0x2f3239' + red: '0xe85c51' + green: '0x7aa4a1' + yellow: '0xfda47f' + blue: '0x5a93aa' + magenta: '0xad5c7c' + cyan: '0xa1cdd8' + white: '0xebebeb' bright: - black: '0x32302f' - red: '0xea6962' - green: '0xa9b665' - yellow: '0xd8a657' - blue: '0x7daea3' - magenta: '0xd3869b' - cyan: '0x89b482' - white: '0xd4be98' + black: '0x4e5157' + red: '0xeb746b' + green: '0x8eb2af' + yellow: '0xfdb292' + blue: '0x73a3b7' + magenta: '0xb97490' + cyan: '0xafd4de' + white: '0xeeeeee' + + indexed_colors: + - { index: 16, color: '0xff8349' } + - { index: 17, color: '0xcb7985' } + +# Gruvbox Material Hard Dark +# colors: +# primary: +# background: '0x1d2021' +# foreground: '0xd4be98' +# +# normal: +# black: '0x32302f' +# red: '0xea6962' +# green: '0xa9b665' +# yellow: '0xd8a657' +# blue: '0x7daea3' +# magenta: '0xd3869b' +# cyan: '0x89b482' +# white: '0xd4be98' +# +# bright: +# black: '0x32302f' +# red: '0xea6962' +# green: '0xa9b665' +# yellow: '0xd8a657' +# blue: '0x7daea3' +# magenta: '0xd3869b' +# cyan: '0x89b482' +# white: '0xd4be98' - # Cursor colors - # - # Colors which should be used to draw the terminal cursor. - # - # Allowed values are CellForeground/CellBackground, which reference the - # affected cell, or hexadecimal colors like #ff00ff. cursor: text: CellBackground cursor: CellForeground - # Vi mode cursor colors - # - # Colors for the cursor when the vi mode is active. - # - # Allowed values are CellForeground/CellBackground, which reference the - # affected cell, or hexadecimal colors like #ff00ff. vi_mode_cursor: text: CellBackground cursor: CellForeground - # Search colors - # - # Colors used for the search bar and match highlighting. - #search: - # Allowed values are CellForeground/CellBackground, which reference the - # affected cell, or hexadecimal colors like #ff00ff. - #matches: - # foreground: '#000000' - # background: '#ffffff' - #focused_match: - # foreground: '#ffffff' - # background: '#000000' - - #bar: - # background: '#c5c8c6' - # foreground: '#1d1f21' - - # Keyboard regex hints - #hints: - # First character in the hint label - # - # Allowed values are CellForeground/CellBackground, which reference the - # affected cell, or hexadecimal colors like #ff00ff. - #start: - # foreground: '#1d1f21' - # background: '#e9ff5e' - - # All characters after the first one in the hint label - # - # Allowed values are CellForeground/CellBackground, which reference the - # affected cell, or hexadecimal colors like #ff00ff. - #end: - # foreground: '#e9ff5e' - # background: '#1d1f21' - - # Line indicator - # - # Color used for the indicator displaying the position in history during - # search and vi mode. - # - # By default, these will use the opposing primary color. - #line_indicator: - # foreground: None - # background: None - - # Selection colors - # - # Colors which should be used to draw the selection area. - # - # Allowed values are CellForeground/CellBackground, which reference the - # affected cell, or hexadecimal colors like #ff00ff. selection: text: CellBackground background: CellForeground diff --git a/.config/nvim/lua/colorscheme.lua b/.config/nvim/lua/colorscheme.lua index c968cc0..0f2ad4f 100644 --- a/.config/nvim/lua/colorscheme.lua +++ b/.config/nvim/lua/colorscheme.lua @@ -25,5 +25,16 @@ require('material').setup { } } +-- Settings for nightfox +-- Available colorscheme values: nightfox, duskfox, nordfox, terafox +require('nightfox').setup({ + options = { + styles = { + comments = "italic", + keywords = "bold", + } + } +}) + -- Set the color scheme -vim.cmd 'colorscheme material' +vim.cmd 'colorscheme terafox' diff --git a/.config/nvim/lua/packer_init.lua b/.config/nvim/lua/packer_init.lua index 3581d8b..1d48a96 100644 --- a/.config/nvim/lua/packer_init.lua +++ b/.config/nvim/lua/packer_init.lua @@ -31,6 +31,7 @@ return require('packer').startup(function(use) use 'sainnhe/gruvbox-material' use 'rebelot/kanagawa.nvim' use 'marko-cerovac/material.nvim' + use { 'EdenEast/nightfox.nvim', run = ':NightfoxCompile' } -- Telescope: fuzzy finder use { diff --git a/.config/nvim/lua/plugins/lsp.lua b/.config/nvim/lua/plugins/lsp.lua index d481771..87d830c 100644 --- a/.config/nvim/lua/plugins/lsp.lua +++ b/.config/nvim/lua/plugins/lsp.lua @@ -21,5 +21,31 @@ lsp.zls.setup { capabilities = capabilities } +-- lua-language-server +lsp.sumneko_lua.setup { + settings = { + Lua = { + runtime = { + -- Tell the language server which version of Lua you're using (most + -- likely LuaJIT in the case of Neovim) + version = 'LuaJIT', + }, + diagnostics = { + -- Get the language server to recognize the `vim` global + globals = {'vim'}, + }, + workspace = { + -- Make the server aware of Neovim runtime files + library = vim.api.nvim_get_runtime_file("", true), + }, + -- Do not send telemetry data containing a randomized but unique + -- identifier + telemetry = { + enable = false, + }, + }, + }, +} + -- texlab = latex language server lsp.texlab.setup{} diff --git a/.config/nvim/lua/plugins/lualine.lua b/.config/nvim/lua/plugins/lualine.lua index e09b28f..b241015 100644 --- a/.config/nvim/lua/plugins/lualine.lua +++ b/.config/nvim/lua/plugins/lualine.lua @@ -3,9 +3,9 @@ local function metals_status_for_lualine() end require('lualine').setup { - options = { - theme = 'material' - }, + --options = { + -- theme = 'material' + --}, sections = { lualine_c = { 'filename', diff --git a/.config/nvim/lua/plugins/scala.lua b/.config/nvim/lua/plugins/scala.lua index 113ab3d..eef687a 100644 --- a/.config/nvim/lua/plugins/scala.lua +++ b/.config/nvim/lua/plugins/scala.lua @@ -20,7 +20,8 @@ vim.api.nvim_create_autocmd('FileType', { metals_config.settings = { showImplicitArguments = true, - showInferredType = true + showInferredType = true, + superMethodLensesEnabled = false } -- This is a tricky option and _nothing_ will show up unless...