summaryrefslogtreecommitdiff
path: root/.config
diff options
context:
space:
mode:
authorAdam <56338480+adastx@users.noreply.github.com>2021-10-28 17:25:38 +0200
committerAdam <56338480+adastx@users.noreply.github.com>2021-10-28 17:25:38 +0200
commit9547730a150c9c1639035c4d66183863dc7f0fbc (patch)
tree4900e117b9014aa3d3e7b9c64d67baca647159ac /.config
parent58fab4d9baedf33dc36e78ecc7f9b7369734fa0d (diff)
Starship shell prompt + doom one theme for alacritty + vim + nvim
Diffstat (limited to '.config')
-rw-r--r--.config/alacritty/alacritty.yml256
-rw-r--r--.config/nvim/lua/opts.lua13
-rw-r--r--.config/nvim/lua/plugins.lua3
-rw-r--r--.config/nvim/lua/setup.lua8
-rw-r--r--.config/nvim/lua/stl.lua2
5 files changed, 55 insertions, 227 deletions
diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml
index 11dd3ef..7b0aa51 100644
--- a/.config/alacritty/alacritty.yml
+++ b/.config/alacritty/alacritty.yml
@@ -45,7 +45,7 @@ window:
x: 6
y: 6
# Spread additional padding evenly around the terminal content.
- #dynamic_padding: false
+ dynamic_padding: false
# Window decorations
#
# Values for `decorations`:
@@ -97,9 +97,9 @@ font:
# - (macOS) Menlo
# - (Linux/BSD) monospace
# - (Windows) Consolas
- family: JetBrains Mono
+ family: JetBrainsMono Nerd Font
# The `style` can be specified to pick a specific face.
- #style: Regular
+ style: Regular
# Bold font face
bold:
@@ -107,9 +107,9 @@ font:
#
# If the bold family is not specified, it will fall back to the
# value specified for the normal font.
- family: JetBrains Mono
+ family: JetBrainsMono Nerd Font
# The `style` can be specified to pick a specific face.
- #style: Bold
+ style: Bold
# Italic font face
italic:
@@ -117,27 +117,28 @@ font:
#
# If the italic family is not specified, it will fall back to the
# value specified for the normal font.
- family: JetBrains Mono
+ family: JetBrainsMono Nerd Font
# The `style` can be specified to pick a specific face.
- #style: Italic
- # Bold italic font face
- #bold_italic:
+ style: Italic
+
+ # Bold italic font face
+ bold_italic:
# Font family
- #
+
# If the bold italic family is not specified, it will fall back to the
# value specified for the normal font.
- #family: monospace
+ family: JetBrainsMono Nerd Font
# The `style` can be specified to pick a specific face.
- #style: Bold Italic
+ style: Bold Italic
# Point size
- size: 10
+ size: 10
# 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: 0
+ offset:
+ x: 0
+ y: 1
# 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 upward.
@@ -150,201 +151,36 @@ font:
# it is recommended to set `use_thin_strokes` to `false`.
#use_thin_strokes: true
# If `true`, bold text is drawn using the bright color variants.
- #draw_bold_text_with_bright_colors: false
- # Colors (Tomorrow Night)
- #colors:
- # Default colors
- #primary:
- # background: '#1d1f21'
- # foreground: '#c5c8c6'
- # 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: '#828482'
- #bright_foreground: '#eaeaea'
- # 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:
- # Fist 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
- # Normal colors
- #normal:
- # black: '#1d1f21'
- # red: '#cc6666'
- # green: '#b5bd68'
- # yellow: '#f0c674'
- # blue: '#81a2be'
- # magenta: '#b294bb'
- # cyan: '#8abeb7'
- # white: '#c5c8c6'
- # Bright colors
- #bright:
- # black: '#666666'
- # red: '#d54e53'
- # green: '#b9ca4a'
- # yellow: '#e7c547'
- # blue: '#7aa6da'
- # magenta: '#c397d8'
- # cyan: '#70c0b1'
- # white: '#eaeaea'
- # Dim colors
- #
- # If the dim colors are not set, they will be calculated automatically based
- # on the `normal` colors.
- #dim:
- # black: '#131415'
- # red: '#864343'
- # green: '#777c44'
- # yellow: '#9e824c'
- # blue: '#556a7d'
- # magenta: '#75617b'
- # cyan: '#5b7d78'
- # white: '#828482'
- # Indexed Colors
- #
- # The indexed colors include all colors from 16 to 256.
- # When these are not set, they're filled with sensible defaults.
- #
- # Example:
- # `- { index: 16, color: '#ff00ff' }`
- #
- #indexed_colors: []
- # Bell
- #
- # The bell is rung every time the BEL control character is received.
- #bell:
- # Visual Bell Animation
- #
- # Animation effect for flashing the screen when the visual bell is rung.
- #
- # Values for `animation`:
- # - Ease
- # - EaseOut
- # - EaseOutSine
- # - EaseOutQuad
- # - EaseOutCubic
- # - EaseOutQuart
- # - EaseOutQuint
- # - EaseOutExpo
- # - EaseOutCirc
- # - Linear
- #animation: EaseOutExpo
- # Duration of the visual bell flash in milliseconds. A `duration` of `0` will
- # disable the visual bell animation.
- #duration: 0
- # Visual bell animation color.
- #color: '#ffffff'
- # Bell Command
- #
- # This program is executed whenever the bell is rung.
- #
- # When set to `command: None`, no command will be executed.
- #
- # Example:
- # command:
- # program: notify-send
- # args: ["Hello, World!"]
- #
- #command: None
-
-# 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
+ draw_bold_text_with_bright_colors: true
-#colors:
- # Default colors
-# primary:
-# background: '#0A0E14'
-# foreground: '#B3B1AD'
-
- # Normal colors
-# normal:
-# black: '#01060E'
-# red: '#EA6C73'
-# green: '#91B362'
-# yellow: '#F9AF4F'
-# blue: '#53BDFA'
-# magenta: '#FAE994'
-# cyan: '#90E1C6'
-# white: '#C7C7C7'
-
- # Bright colors
-# bright:
-# black: '#686868'
-# red: '#F07178'
-# green: '#C2D94C'
-# yellow: '#FFB454'
-# blue: '#59C2FF'
-# magenta: '#FFEE99'
-# cyan: '#95E6CB'
-# white: '#FFFFFF'
+colors:
+ primary:
+ background: '#282c34'
+ foreground: '#bbc2cf'
+ cursor:
+ text: CellBackground
+ cursor: CellForeground
+ selection:
+ text: CellForeground
+ background: '#3e4451'
+ normal:
+ black: '#1c1f24'
+ red: '#ff6c6b'
+ green: '#98be65'
+ yellow: '#da8548'
+ blue: '#51afef'
+ magenta: '#c678dd'
+ cyan: '#5699af'
+ white: '#bbc2cf'
+ bright:
+ black: '#5b6268'
+ red: '#da8548'
+ green: '#4db5bd'
+ yellow: '#ecbe7b'
+ blue: '#3071db' # This is 2257a0 in Doom Emacs but I lightened it.
+ magenta: '#a9a1e1'
+ cyan: '#46d9ff'
+ white: '#dfdfdf'
#selection:
# This string contains all characters that are used as separators for
diff --git a/.config/nvim/lua/opts.lua b/.config/nvim/lua/opts.lua
index a1c0bbf..aa56f76 100644
--- a/.config/nvim/lua/opts.lua
+++ b/.config/nvim/lua/opts.lua
@@ -16,11 +16,12 @@ cmp.setup {
end,
},
mapping = {
+ ['<CR>'] = cmp.mapping.confirm({ select = true }),
['<C-n>'] = cmp.mapping.select_next_item(),
['<C-p>'] = cmp.mapping.select_prev_item(),
['<C-f>'] = cmp.mapping.scroll_docs(4),
['<C-d>'] = cmp.mapping.scroll_docs(-4),
- ['<C-c>'] = cmp.mapping.close(),
+ ['<C-e>'] = cmp.mapping.close(),
["<Tab>"] = cmp.mapping(function(fallback)
if cmp.visible() then
cmp.select_next_item()
@@ -51,16 +52,6 @@ cmp.setup {
vim.cmd('autocmd FileType markdown lua require("cmp").setup.buffer { enabled = false }')
require('nvim-autopairs').setup{}
-require("nvim-autopairs.completion.cmp").setup {
- map_cr = true, -- map <CR> on insert mode
- map_complete = true, -- it will auto insert `(` (map_char) after select function or method item
- auto_select = true, -- automatically select the first item
- insert = false, -- use insert confirm behavior instead of replace
- map_char = { -- modifies the function or method delimiter by filetypes
- all = '(',
- tex = '{',
- },
-}
-- LSPCONFIG
local nvim_lsp = require('lspconfig')
diff --git a/.config/nvim/lua/plugins.lua b/.config/nvim/lua/plugins.lua
index 77b1bde..7d6e5fe 100644
--- a/.config/nvim/lua/plugins.lua
+++ b/.config/nvim/lua/plugins.lua
@@ -1,7 +1,7 @@
local use = require('packer').use
require('packer').startup(function()
use 'wbthomason/packer.nvim'
- use 'gruvbox-community/gruvbox'
+ use 'romgrk/doom-one.vim'
use 'tpope/vim-fugitive'
use 'tpope/vim-surround'
use 'tpope/vim-repeat'
@@ -15,6 +15,7 @@ require('packer').startup(function()
use "windwp/nvim-autopairs"
use "lukas-reineke/indent-blankline.nvim"
use 'kyazdani42/nvim-web-devicons'
+ use 'norcalli/nvim-colorizer.lua'
use {
'nvim-telescope/telescope.nvim',
diff --git a/.config/nvim/lua/setup.lua b/.config/nvim/lua/setup.lua
index 8c59b41..895de6c 100644
--- a/.config/nvim/lua/setup.lua
+++ b/.config/nvim/lua/setup.lua
@@ -4,6 +4,7 @@ vim.cmd('filetype indent plugin on')
vim.cmd('syntax enable')
vim.cmd('set undodir=$HOME/.vim/undo')
vim.cmd('set undofile')
+vim.cmd('colorscheme doom-one')
set.mouse = "a"
set.termguicolors = true
@@ -32,7 +33,6 @@ set.ttimeoutlen = 200
set.wrap = false
set.fcs = 'eob: '
set.swapfile = false
-
-vim.cmd('colorscheme gruvbox')
-vim.cmd('highlight CursorLineNr cterm=bold ctermfg=Yellow ctermbg=none')
-vim.cmd('highlight Normal ctermbg=none')
+set.cursorline = true
+set.pumblend = 0
+set.autochdir = true
diff --git a/.config/nvim/lua/stl.lua b/.config/nvim/lua/stl.lua
index 74c2d6f..241e0ff 100644
--- a/.config/nvim/lua/stl.lua
+++ b/.config/nvim/lua/stl.lua
@@ -1,7 +1,7 @@
require'lualine'.setup {
options = {
icons_enabled = true,
- theme = 'gruvbox',
+ theme = 'onedark',
component_separators = {left = '', right = ''},
section_separators = {left = '', right = ''},
disabled_filetypes = {'startify', 'terminal', 'netrw'}