Merge branch 'master' of github.com:id101010/dotfiles

alacritty/alacritty.yml

@@ -7,33 +7,25 @@ env:
 # Scroll config
 scrolling:
   # Maximum number of lines in the scrollback buffer.
-  history: 10000
+  history: 100000
   # Scrolling distance multiplier.
   multiplier: 3
 
-# Corsor config
-cursor:
-  style: 
-    shape: Underline
-    blinking: Always
-  unfocused_hollow: false
-
 # Font configuration
 font:
   # Normal (roman) font face
   normal:
-    family: IBM Plex Mono
-    #    family: DejaVu Sans Mono for Powerline
+    family: "MesloLGS NF"
     style: regular
   # Bold font face
   bold:
-    family: IBM Plex Mono
+    family: "MesloLGS NF"
     style: bold
   # Italic font face
   italic:
-    family: IBM Plex Mono
+    family: "MesloLGS NF"
     style: italic
-  size: 10
+  size: 11
 
 # Colors (Gruvbox dark)
 colors:
@@ -66,9 +58,15 @@ colors:
     cyan:    '#8ec07c'
     white:   '#ebdbb2'
 
+cursor:
+  style:
+    shape: Underline
+    blinking: Always
+  unfocused_hollow: false
+  thickness: 0.15
+
 # Background opacity
-window:
-  opacity: 1.0
+background_opacity: 0.9
 
 # Live config reload (changes require restart)
 live_config_reload: true
@@ -82,11 +80,11 @@ working_directory: None
 
 # url launcher
 mouse:
-  hints:
+  hint:
     launcher:
       program: firefox
 
 key_bindings:
-  - { key: B, mods: Command, action: IncreaseFontSize }
-  - { key: N, mods: Command, action: DecreaseFontSize }
-  - { key: M, mods: Command, action: ResetFontSize }
+- { key: Left, mods: Shift, action: ResetFontSize }
+- { key: Up, mods: Shift, action: IncreaseFontSize }
+- { key: Down, mods: Shift, action: DecreaseFontSize }

vimrc

@@ -1,38 +1,49 @@
 set nocompatible
 
-" Tabstop, Shiftwith and replace tabs with spaces but not in makefiles "
-set tabstop=2
-set shiftwidth=2
-set expandtab
+filetype plugin indent on
+
+" Pluigin installation using vim-plug "
+call plug#begin('~/.vim/plugged')
+  Plug 'morhetz/gruvbox'
+  Plug 'vim-airline/vim-airline'
+  Plug 'vim-airline/vim-airline-themes'
+call plug#end()
 
 " Autocommands for special files "
 autocmd FileType make set noexpandtab
 autocmd BufNewFile,BufRead *.md set ft=markdown tw=79
 autocmd BufNewFile,BufRead *.tex set ft=tex tw=79
 autocmd BufNewFile,BufRead *.txt set ft=sh tw=79
-autocmd BufNewFile,BufRead *.py set ft=python ts=4 sw=4 tw=88 et
-
-" automatically load all installed plugins in ~/.vim/pack "
-packloadall
+autocmd BufNewFile,BufRead *.py set ft=python tabstop=4 shiftwidth=4 softtabstop=4 showtabline=4 expandtab
 
 " Syntaxhighlighting, colorscheme, linenumbers "
 syntax on
 colorscheme gruvbox
-set cursorline
-set more                " Use more
-set title               " Blank title
-set vb t_vb=            " No beeping and flashing
-set wildmenu
-set background=dark
-set number              " Linenumbers
-set nowrap
-set hlsearch
-set t_Co=256
-set laststatus=2        " Always display the statusline in all windows
-set showtabline=2       " Always display the tabline
-set noshowmode          " Hide the default mode text
-"set colorcolumn=79
-set textwidth=79
+
+" Tabstop, Shiftwith and replace tabs with spaces but not in makefiles "
+set tabstop=2 " number of spaces in a tab
+set shiftwidth=2  " number of spaces to use for each step of (auto)indent
+set softtabstop=2 " number of spaces that a Tab counts for while editing
+set showtabline=2 " always display tab labels
+set expandtab " expand tabs with spaces
+set backspace=indent,eol,start " set behavior of backspace
+set showmatch " when a bracket is inserted briefly jump to the matching one
+set showcmd " show command in the last line of the screen
+set showmode
+set cursorline " always show cursor line
+set more " use more
+set title " blank title
+set background=dark " set bg
+set relativenumber " linenumbers
+set nowrap " do not wrap long lines per default
+set laststatus=2 " always display the statusline in all windows
+set showtabline=2 " always display the tabline
+set hlsearch " highlight after search
+set incsearch " highlight while searching
+set ttyfast " fast rendering
+set encoding=utf8 " use utf8
+set laststatus=2 " always display a status line
+set display=lastline " show as much as possible of the last line
 
 " Airline configs
 let g:airline#extensions#tabline#enabled = 1