diff --git a/README.md b/README.md
index 5fdfbf5..2d34039 100644
--- a/README.md
+++ b/README.md
@@ -1,38 +1,39 @@
# Sudacode Rice
-A collection of my Linux (Arch btw) configuration and dotfiles
-
-## Screenshots
-
-
Ordering: Top Left -> Top Right -> Bottom Left -> Bottom Right
-
vim, bpytop, cava, ncmpcpp
-
-
(firefox, doom emacs, doom emacs, neofetch)
-
-
+
+## My Linux (Arch btw) configuration and dotfiles
+
+![my rice](screenshots/rice.png)
+![application launcher](screenshots/app_launcher.png)
## Current Setup
_Click the links to get quick access to the relevant code/files_
+
+
- Desktop Environment: [EndeavourOS](https://endeavouros.com/) (Arch btw)
-- Window Manager: [i3-gaps](https://github.com/Airblader/i3)
- - [i3 config](i3-wm/config-desktop)
+- Window Manager: [bspwm](https://github.com/baskerville/bspwm)
+ - [bspwm config](bspwm/bspwmrc)
+- Shell: [zsh (oh-my-zsh)](https://ohmyz.sh/)
+ - [zshrc](dotfiles/.zshrc)
- Compositor: [ibhagwan's picom fork](https://github.com/ibhagwan/picom)
- - [picom config](picom/picom.conf)
+ - [picom config](picom/picom-hightransparency.conf)
- Notification Server: [dunst](https://github.com/dunst-project/dunst)
- [dunst config](dunst/dunstrc)
+- Status Bar: [polybar](https://github.com/polybar/polybar)
+ - [polybar config](polybar-themes/sblocks/config.ini)
+- Application Launcher: [rofi](https://github.com/davatorium/rofi)
+ - [rofi config/colorscheme](rofi/config.rasi)
- Terminal Emulator: [alacritty-ligatures](https://aur.archlinux.org/packages/alacritty-ligatures/)
- [alacritty config](alacritty/alacritty.yml)
- - [colorscheme](alacritty/alacritty.onedark.yml)
-- Text Editors: [vim](https://www.vim.org/) and [doom emacs](https://github.com/hlissner/doom-emacs)
+ - [colorscheme](alacritty/doom_one.yml)
+- Text Editor: [vim](https://www.vim.org/)
- [vimrc](dotfiles/.vimrc)
- - [doom config](doom)
- Audio Player: [mpd](https://www.musicpd.org/) with [ncmpcpp](https://github.com/ncmpcpp/ncmpcpp)
- [mpd config](mpd/mpd.conf)
- [ncmpcpp config](ncmpcpp/ncmpcpp.config)
- Audio Visualizer: [cava](https://github.com/karlstav/cava)
- [cava config](cava/cavaconfig)
- System Monitor: [bpytop](https://github.com/aristocratos/bpytop)
-- Firefox Startpage: [my startpage](https://github.com/ksyasuda/Firefox-Startpage)
diff --git a/dotfiles/.vimrc b/dotfiles/.vimrc
index 63e35f5..a343699 100644
--- a/dotfiles/.vimrc
+++ b/dotfiles/.vimrc
@@ -1,4 +1,5 @@
syntax on
+set noshowmode "disable default vim insert text at bottom
set laststatus=2
set number
set colorcolumn=80
@@ -6,9 +7,11 @@ set tw=80
set shiftwidth=4
set tabstop=4
set autoindent
+set ignorecase
+set smartcase
+set incsearch
set smartindent
set hlsearch
-set smartcase
set ignorecase
set noerrorbells
set title
@@ -21,6 +24,7 @@ set scrolloff=8
set sidescrolloff=8
" show candidates for vim commands with tab
set wildmenu
+set background=dark
set encoding=UTF-8
set guifont=FiraCode\ Nerd\ Font\ 18
@@ -28,6 +32,17 @@ set guifont=FiraCode\ Nerd\ Font\ 18
" lsp handled by coc
let g:ale_disable_lsp = 1
+" Install vim-plug if not found
+if empty(glob('~/.vim/autoload/plug.vim'))
+ silent !curl -fLo ~/.vim/autoload/plug.vim --create-dirs
+ \ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
+endif
+
+" Run PlugInstall if there are missing plugins
+autocmd VimEnter * if len(filter(values(g:plugs), '!isdirectory(v:val.dir)'))
+ \| PlugInstall --sync | source $MYVIMRC
+\| endif
+
call plug#begin('~/.vim/plugged')
Plug 'mhinz/vim-startify'
@@ -40,26 +55,24 @@ Plug 'pechorin/any-jump.vim'
Plug 'tpope/vim-commentary'
Plug 'shime/vim-livedown'
Plug 'jiangmiao/auto-pairs'
-Plug 'alvan/vim-closetag'
-Plug 'MaxMEllon/vim-jsx-pretty'
Plug 'ap/vim-css-color'
+Plug 'ap/vim-buftabline'
Plug 'itchyny/lightline.vim'
Plug 'wakatime/vim-wakatime'
-Plug 'itchyny/vim-gitbranch'
Plug 'preservim/nerdtree' | Plug 'Xuyuanp/nerdtree-git-plugin'
Plug 'prettier/vim-prettier', { 'do': 'yarn install' }
Plug 'sheerun/vim-polyglot'
Plug 'dense-analysis/ale'
Plug 'neoclide/coc.nvim', {'branch': 'release'}
Plug 'maximbaz/lightline-ale'
-" On-demand lazy load
Plug 'liuchengxu/vim-which-key', { 'on': ['WhichKey', 'WhichKey!'] }
+Plug 'osyo-manga/vim-over'
" colorschemes
Plug 'joshdick/onedark.vim'
Plug 'kaicataldo/material.vim', { 'branch': 'main' }
-Plug 'sainnhe/sonokai'
Plug 'romgrk/doom-one.vim'
-Plug 'dracula/vim', { 'as': 'dracula' }
+Plug 'morhetz/gruvbox'
+Plug 'vv9k/vim-github-dark'
call plug#end()
@@ -297,6 +310,8 @@ let g:prettier#exec_cmd_path = "/usr/bin/prettier"
let g:lightline = {}
" 'one', 'material', 'darcula', 'deus'
let g:lightline.colorscheme = "deus"
+" let g:lightline.colorscheme = "one"
+" let g:lightline.colorscheme = "darcula"
let g:lightline.component_function = {
\ 'fugitive': 'MyFugitive',
\ 'readonly': 'Readonly',
@@ -378,20 +393,29 @@ endfunction
"COLORSCHEME
"------------------------------------------------------------------------------
set t_Co=256
-set termguicolors
-set noshowmode "disable default vim insert text at bottom
-let g:onedark_termcolors=256 "enable 256 colors
+" set termguicolors
+" let g:onedark_termcolors=256 "enable 256 colors
" colorscheme onedark "set colorsheme as onedark
+
"material theme
" let g:material_theme_style = 'default' | 'palenight' | 'ocean' | 'lighter' | 'darker' | 'default-community' | 'palenight-community' | 'ocean-community' | 'lighter-community' | 'darker-community'
let g:material_terminal_italics = 1
let g:material_theme_style = 'darker'
" let g:material_theme_style = 'darker-community'
-colorscheme material
+" colorscheme material
-let g:doom_one_terminal_colors = v:true
+" let g:doom_one_terminal_colors = v:true
" colorscheme doom-one
+let g:gruvbox_contrast_dark = "medium" "default
+" let g:gruvbox_contrast_dark = "soft"
+let g:gruvbox_improved_strings = 0
+let g:gruvbox_improved_warnings = 1
+colorscheme gruvbox
+
+" let g:gh_color = "soft"
+" colorscheme ghdark
+
"------------------------------------------------------------------------------
"""bash language server
"------------------------------------------------------------------------------
@@ -518,21 +542,29 @@ command! -nargs=0 OR :call CocActionAsync('runCommand', 'editor.action.org
set statusline^=%{coc#status()}%{get(b:,'coc_current_function','')}
" Mappings for CoCList
" Show all diagnostics.
-nnoremap