major updates

alacritty/.config/alacritty/alacritty.yml

@@ -0,0 +1,104 @@
+window:
+  dynamic_title: true
+  padding: 
+    x: 10
+    y: 10
+
+
+scrolling:
+  history: 100000
+  multiplier: 3
+
+
+font:
+  normal:
+    family: "MesloLGS NF"
+  size: 20.0
+
+
+selection:
+  # This string contains all characters that are used as separators for
+  # "semantic words" in Alacritty.
+  semantic_escape_chars: ",│`|:\"' ()[]{}<>\t"
+  # When set to `true`, selected text will be copied to the primary clipboard.
+  save_to_clipboard: true
+
+
+mouse:
+  hints:
+    launcher:
+      # This depends on your OS, on Mac it's `open`
+      program: open
+    modifiers: Command
+
+
+schemes:
+  gruvbox_material_hard_dark: &gruvbox_material_hard_dark
+    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'
+  gruvbox_material_medium_dark: &gruvbox_material_medium_dark
+    primary:
+      background: '0x282828'
+      foreground: '0xd4be98'
+    normal:
+      black:   '0x3c3836'
+      red:     '0xea6962'
+      green:   '0xa9b665'
+      yellow:  '0xd8a657'
+      blue:    '0x7daea3'
+      magenta: '0xd3869b'
+      cyan:    '0x89b482'
+      white:   '0xd4be98'
+    bright:
+      black:   '0x3c3836'
+      red:     '0xea6962'
+      green:   '0xa9b665'
+      yellow:  '0xd8a657'
+      blue:    '0x7daea3'
+      magenta: '0xd3869b'
+      cyan:    '0x89b482'
+      white:   '0xd4be98'
+  gruvbox_material_soft_dark: &gruvbox_material_soft_dark
+    primary:
+      background: '0x32302f'
+      foreground: '0xd4be98'
+    normal:
+      black:   '0x45403d'
+      red:     '0xea6962'
+      green:   '0xa9b665'
+      yellow:  '0xd8a657'
+      blue:    '0x7daea3'
+      magenta: '0xd3869b'
+      cyan:    '0x89b482'
+      white:   '0xd4be98'
+    bright:
+      black:   '0x45403d'
+      red:     '0xea6962'
+      green:   '0xa9b665'
+      yellow:  '0xd8a657'
+      blue:    '0x7daea3'
+      magenta: '0xd3869b'
+      cyan:    '0x89b482'
+      white:   '0xd4be98'
+
+colors: *gruvbox_material_medium_dark
+

git/.gitconfig

@@ -3,6 +3,7 @@
 	email = [email protected]
 [core]
 	excludesfile = ~/.gitignore_global
+    editor = nvim
 [pull]
 	ff = only
 [init]

nvim/.config/nvim/after/plugin/fzf.vim

@@ -0,0 +1,28 @@
+let $FZF_DEFAULT_OPTS='--layout=reverse --border --padding=1'
+
+
+if executable('rg')
+  let g:rg_derive_root='true'
+endif
+
+
+" Custom :RG command (improvement on :Rg)
+" https://github.com/junegunn/fzf.vim#example-rg-command-with-preview-window
+function! RipgrepFzf(query, fullscreen)
+  let command_fmt = 'rg --column --line-number --no-heading --color=always --smart-case -- %s || true'
+  let initial_command = printf(command_fmt, shellescape(a:query))
+  let reload_command = printf(command_fmt, '{q}')
+  let spec = {'options': ['--phony', '--query', a:query, '--bind', 'change:reload:'.reload_command], 'window': { 'height': 1, 'width': 1 }}
+  call fzf#vim#grep(initial_command, 1, fzf#vim#with_preview(spec), a:fullscreen)
+endfunction
+
+command! -bang -nargs=* RG call RipgrepFzf(<q-args>, <bang>0)
+
+
+" Customize :Files command
+command! -bang -nargs=? -complete=dir Files call fzf#vim#files(<q-args>, {'window': { 'height': 0.4, 'width': 0.3, 'yoffset': 0.05 } }, <bang>0)
+
+
+" Remaps
+nnoremap <C-p> :Files<cr> 
+nnoremap <C-f> :RG<Cr>

nvim/.config/nvim/after/plugin/lightline.vim

@@ -0,0 +1,2 @@
+let g:lightline = {}
+let g:lightline.colorscheme = 'gruvbox_material'

nvim/.config/nvim/after/plugin/lspconfig.vim

@@ -0,0 +1,7 @@
+lua <<EOF
+
+local nvim_lsp = require('lspconfig')
+
+nvim_lsp.tsserver.setup {}
+
+EOF

nvim/.config/nvim/after/plugin/tmuxline.vim

@@ -0,0 +1 @@
+let g:tmuxline_powerline_separators = 0

nvim/.config/nvim/ftplugin/gitcommit.vim

@@ -0,0 +1,5 @@
+set textwidth=72
+set colorcolumn=73
+
+" start on first line
+call setpos('.', [0, 1, 1, 0])

nvim/.config/nvim/init.vim

@@ -1,25 +1,17 @@
-syntax on
-
-call plug#begin('~/.config/nvim/plugged')
-
-Plug 'junegunn/fzf', { 'do': { -> fzf#install() } }
-Plug 'junegunn/fzf.vim'
-Plug 'vim-airline/vim-airline'
-Plug 'gruvbox-community/gruvbox'
+let mapleader = " "
+let g:netrw_banner=0
 
-call plug#end()
 
-colorscheme gruvbox
+" --- General 
 
-set background=dark
-set termguicolors
+syntax on
 set tabstop=4 
 set softtabstop=4
 set shiftwidth=4
 set expandtab
 set smartindent
 set number
-set numberwidth=2
+set numberwidth=4
 set relativenumber
 set signcolumn=number
 set noswapfile
@@ -35,47 +27,39 @@ set splitright
 set hidden
 set noerrorbells
 set scrolloff=8
+set noshowmode
 
-highlight LineNr ctermfg=darkGrey
 
-au FileType gitcommit setlocal tw=72
+" --- Plugins
 
-let mapleader = " "
-let g:netrw_banner=0
+call plug#begin('~/.config/nvim/plugged')
+
+Plug 'junegunn/fzf', { 'do': { -> fzf#install() } }
+Plug 'junegunn/fzf.vim'
+Plug 'sainnhe/gruvbox-material'
+Plug 'neovim/nvim-lspconfig'
+Plug 'itchyny/lightline.vim'
+Plug 'edkolev/tmuxline.vim'
+Plug 'machakann/vim-highlightedyank'
+
+call plug#end()
+
+
+" --- Colors
+
+colorscheme gruvbox-material
+
+let g:gruvbox_material_background = 'medium'
+
+set background=dark
+set termguicolors
+
+
+" --- Remaps
 
-" fzf 
-let $FZF_DEFAULT_COMMAND = "rg --files --hidden --glob '!.git'"
-let $FZF_DEFAULT_OPTS='--layout=reverse --border --padding=1'
-let g:fzf_layout = { 'window': 'call FloatingFZF()' }
-
-function! FloatingFZF()
-  let buf = nvim_create_buf(v:false, v:true)
-  call setbufvar(buf, '&signcolumn', 'no')
-
-  let height = float2nr(15)
-  let width = float2nr(80)
-  let horizontal = float2nr((&columns - width) / 2)
-  let vertical = 1
-  let opts = {
-        \ 'relative': 'editor',
-        \ 'row': vertical,
-        \ 'col': horizontal,
-        \ 'width': width,
-        \ 'height': height,
-        \ 'style': 'minimal'
-        \ }
-
-  call nvim_open_win(buf, v:true, opts)
-endfunction
-
-if executable('rg')
-    let g:rg_derive_root='true'
-endif
-
-nnoremap <C-p> :FZF<cr> 
-nnoremap <C-f> :Rg!<space>
-nnoremap <C-b> :Lexplore <bar> :vertical resize 30<Cr>
 nnoremap <leader>h :wincmd h<Cr>
 nnoremap <leader>j :wincmd j<Cr>
 nnoremap <leader>k :wincmd k<Cr>
 nnoremap <leader>l :wincmd l<Cr>
+nnoremap <C-b> :Lexplore <bar> :vertical resize 30<Cr>
+

tmux/.tmux.conf

@@ -3,3 +3,22 @@
 unbind-key C-b
 set-option -g prefix C-a
 bind-key C-a send-prefix
+
+
+# support true color
+set -g default-terminal "screen-256color"
+set -ga terminal-overrides ",xterm-256color*:Tc"
+
+
+# start window numbering at 1
+set -g base-index 1
+
+
+# scroll with mouse
+set -g mouse on
+
+
+# source tmux line snapshot
+# source-file $HOME/.tmuxline_snapshot.conf
+if-shell "test -f $HOME/.tmuxline_snapshot.conf" "source $HOME/.tmuxline_snapshot.conf"
+

tmux/.tmuxline_snapshot.conf

@@ -0,0 +1,21 @@
+# This tmux statusbar config was created by tmuxline.vim
+# on Thu, 23 Sep 2021
+
+set -g status-justify "left"
+set -g status "on"
+set -g status-left-style "none"
+set -g message-command-style "fg=#ddc7a1,bg=#504945"
+set -g status-right-style "none"
+set -g pane-active-border-style "fg=#a89984"
+set -g status-style "none,bg=#32302f"
+set -g message-style "fg=#ddc7a1,bg=#504945"
+set -g pane-border-style "fg=#504945"
+set -g status-right-length "100"
+set -g status-left-length "100"
+setw -g window-status-activity-style "none"
+setw -g window-status-separator ""
+setw -g window-status-style "none,fg=#ddc7a1,bg=#32302f"
+set -g status-left "#[fg=#282828,bg=#a89984,bold] #S #[fg=#a89984,bg=#32302f,nobold,nounderscore,noitalics]"
+set -g status-right "#[fg=#504945,bg=#32302f,nobold,nounderscore,noitalics]#[fg=#ddc7a1,bg=#504945] %Y-%m-%d | %H:%M #[fg=#a89984,bg=#504945,nobold,nounderscore,noitalics]#[fg=#282828,bg=#a89984,bold] #h "
+setw -g window-status-format "#[fg=#ddc7a1,bg=#32302f] #I |#[fg=#ddc7a1,bg=#32302f] #W "
+setw -g window-status-current-format "#[fg=#32302f,bg=#504945,nobold,nounderscore,noitalics]#[fg=#ddc7a1,bg=#504945] #I |#[fg=#ddc7a1,bg=#504945] #W #[fg=#504945,bg=#32302f,nobold,nounderscore,noitalics]"

zsh/.zsh_plugins.txt

@@ -1,18 +1,16 @@
-# start
 lukechilds/zsh-nvm
 
-rupa/z
-
 robbyrussell/oh-my-zsh path:plugins/colored-man-pages
 robbyrussell/oh-my-zsh path:plugins/command-not-found
 robbyrussell/oh-my-zsh path:plugins/git
 robbyrussell/oh-my-zsh path:plugins/git-extras
 robbyrussell/oh-my-zsh path:plugins/node
 
-# zsh-async must load before pure
-mafredri/zsh-async
-sindresorhus/pure
+romkatv/powerlevel10k
+
+rupa/z
 
 zsh-users/zsh-autosuggestions
 zsh-users/zsh-completions
 zsh-users/zsh-syntax-highlighting
+