Config adjustments.

Alacritty: Increase font size to 11.
Neovim: New init.vim with vim-plug and other customizations.

alacritty/.config/alacritty/alacritty.yml

@@ -11,7 +11,7 @@ scrolling:
 font:
   normal:
     family: MesloLGS NF
-  size: 10.5
+  size: 11
 draw_bold_text_with_bright_colors: false
 colors:
   primary:
@@ -41,7 +41,7 @@ colors:
     magenta: '#dc4cdc'
     cyan:    '#93eded'
     white:   '#ffffff'
-background_opacity: 0.8
+background_opacity: 0.85
 cursor:
   style:
     shape: Block

install.sh

@@ -3,11 +3,11 @@
 echo -e "Creating the symlinks with stow..."
 
 stow -t $HOME alacritty \
-              mako \
+                mako \
-    	      nvim \
+                nvim \
-	      sway \
+                sway \
-	      swaylock \
+                swaylock \
-	      waybar
+                waybar
 
 sleep 1
 echo -e "Making scripts executable..."

nvim/.config/nvim/init.vim

@@ -1,3 +1,102 @@
-set runtimepath^=~/.vim runtimepath+=~/.vim/after
+"
-let &packpath = &runtimepath
+" ~/.config/nvim/init.vim
-source ~/.vimrc
+"
+
+""" PLUGINS
+
+call plug#begin(stdpath('data') . '/plugged')
+
+" OneDark color scheme
+Plug 'ii14/onedark.nvim'
+
+" lightline
+Plug 'itchyny/lightline.vim'
+
+" lightline-bufferline
+Plug 'mengelbrecht/lightline-bufferline'
+
+" nvim-web-devicons
+Plug 'kyazdani42/nvim-web-devicons'
+
+" vim-polyglot
+Plug 'sheerun/vim-polyglot'
+
+call plug#end()
+
+
+""" BASICS
+
+set number
+set noshowmode
+set showtabline=2
+set tabstop=4
+set shiftwidth=4
+set expandtab
+syntax on
+colorscheme onedark
+
+
+""" APPEARANCE
+
+"Use 24-bit (true-color) mode in Vim/Neovim when outside tmux.
+"If you're using tmux version 2.2 or later, you can remove the outermost $TMUX check and use tmux's 24-bit color support
+"(see < http://sunaku.github.io/tmux-24bit-color.html#usage > for more information.)
+if (has("nvim"))
+    "For Neovim 0.1.3 and 0.1.4 < https://github.com/neovim/neovim/pull/2198 >
+    let $NVIM_TUI_ENABLE_TRUE_COLOR=1
+endif
+"For Neovim > 0.1.5 and Vim > patch 7.4.1799 < https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162 >
+"Based on Vim patch 7.4.1770 (`guicolors` option) < https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd >
+" < https://github.com/neovim/neovim/wiki/Following-HEAD#20160511 >
+if (has("termguicolors"))
+    set termguicolors
+endif
+
+" Set dark, transparent background, should default to dark, but it's there just in case
+hi Normal guibg=NONE ctermbg=NONE
+let &background = 'dark'
+
+" lightline config
+let g:lightline = {}
+let g:lightline.colorscheme = 'one'
+let g:lightline.tabline = { 'left': [ [ 'buffers' ] ], 'right': [ [ 'close' ] ] }
+let g:lightline.component_expand = { 'buffers': 'lightline#bufferline#buffers' }
+let g:lightline.component_type = { 'buffers': 'tabsel' }
+
+" lightline-bufferline config
+let g:lightline#bufferline#show_number = 1
+let g:lightline#bufferline#shorten_path = 0
+let g:lightline#bufferline#enable_devicons = 1
+let g:lightline#bufferline#unnamed = '[No Name]'
+let g:lightline#bufferline#icon_position = 'right'
+
+
+""" KEYBOARD MAPPINGS
+
+" Leader key
+let mapleader=';'
+
+" Navigating buffers
+nmap <Leader>1 <Plug>lightline#bufferline#go(1)
+nmap <Leader>2 <Plug>lightline#bufferline#go(2)
+nmap <Leader>3 <Plug>lightline#bufferline#go(3)
+nmap <Leader>4 <Plug>lightline#bufferline#go(4)
+nmap <Leader>5 <Plug>lightline#bufferline#go(5)
+nmap <Leader>6 <Plug>lightline#bufferline#go(6)
+nmap <Leader>7 <Plug>lightline#bufferline#go(7)
+nmap <Leader>8 <Plug>lightline#bufferline#go(8)
+nmap <Leader>9 <Plug>lightline#bufferline#go(9)
+nmap <Leader>0 <Plug>lightline#bufferline#go(10)
+
+" Deleting buffers
+nmap <Leader>d1 <Plug>lightline#bufferline#delete(1)
+nmap <Leader>d2 <Plug>lightline#bufferline#delete(2)
+nmap <Leader>d3 <Plug>lightline#bufferline#delete(3)
+nmap <Leader>d4 <Plug>lightline#bufferline#delete(4)
+nmap <Leader>d5 <Plug>lightline#bufferline#delete(5)
+nmap <Leader>d6 <Plug>lightline#bufferline#delete(6)
+nmap <Leader>d7 <Plug>lightline#bufferline#delete(7)
+nmap <Leader>d8 <Plug>lightline#bufferline#delete(8)
+nmap <Leader>d9 <Plug>lightline#bufferline#delete(9)
+nmap <Leader>d0 <Plug>lightline#bufferline#delete(10)
+

nvim/.vimrc

@@ -1,47 +0,0 @@
-set nocompatible
-filetype off
-syntax on
-filetype plugin indent on
-set modelines=0
-set number
-set ruler
-set encoding=utf-8
-set wrap
-set textwidth=79
-set formatoptions=tcqrn1
-set tabstop=4
-set shiftwidth=4
-set softtabstop=4
-set expandtab
-set noshiftround
-set scrolloff=3
-set backspace=indent,eol,start
-set matchpairs+=<:> " use % to jump between pairs
-runtime! macros/matchit.vim
-nnoremap j gj
-nnoremap k gk
-set hidden
-set ttyfast
-set laststatus=2
-set showmode
-set showcmd
-nnoremap / /\v
-vnoremap / /\v
-set hlsearch
-set incsearch
-set ignorecase
-set smartcase
-set showmatch
-map <leader><space> :let @/=''<cr> " clear search
-inoremap <F1> <ESC>:set invfullscreen<CR>a
-nnoremap <F1> :set invfullscreen<CR>
-vnoremap <F1> :set invfullscreen<CR>
-map <leader>q gqip
-set listchars=tab:▸\ ,eol:¬
-map <leader>l :set list!<CR> " Toggle tabs and EOL
-set t_Co=256
-set background=dark
-let g:solarized_termcolors=256
-let g:solarized_termtrans=1
-colorscheme solarized
-