Updates to vim, readme and other

README.md

@@ -2,13 +2,30 @@
 
 ## Install
 
-### Essential Packages + Applications
+```bash
+./dotfiles install
+```
+
+## Add a package to the install list
+
+```bash
+./dotfiles add {package_name}
+```
+
+example:
+
+```bash
+./dotfiles add ungoogled-chromium
+```
+
+## Edit a config file
 
 ```bash
-sh packs+apps.sh
+./dotfiles edit {file_name}
 ```
 
-### Essential packages only
+example:
+
 ```bash
-sh packs.sh
+./dotfiles edit bspwmrc
 ```

config/.zshrc

@@ -16,6 +16,14 @@ plugins=(git colorize docker yarn vscode sudo alias-finder archlinux zsh-histdb
 # Oh-my-zsh
 source $ZSH/oh-my-zsh.sh
 
+# Fzf variables
+if type rg &> /dev/null; then
+  export FZF_DEFAULT_COMMAND='rg --files'
+  export FZF_DEFAULT_OPTS='-m --height 50% --border'
+fi
+
+export EDITOR="nvim"
+
 # Keybinds
 bindkey "^z" undo
 bindkey "^y" redo

config/init.vim

@@ -1,17 +1,31 @@
 command Ws w|so%
 
+let mapleader = " "
+
 " Simple keybinds
-nnoremap <C-s> :w<CR>
+nnoremap <silent> <C-s> :w<CR>
-nnoremap <C-q> :q<CR>
+nnoremap <silent> <C-q> :q<CR>
-inoremap <C-s> <ESC>:w<CR>
+inoremap <silent> <C-s> <ESC>:w<CR>
+
+nnoremap <silent> <S-E> :10Term<CR>
+
+nnoremap <silent> <A-Up> :m-2<CR>
+nnoremap <silent> <A-Down> :m+1<CR>
 
-nnoremap <S-E> :10Term<CR>
+" Easy split navigation
+nnoremap <C-w> <C-w>w
+nnoremap <C-h> <C-w>h
+nnoremap <C-j> <C-w>j
+nnoremap <C-k> <C-w>k
+nnoremap <C-l> <C-w>l
 
 :set tabstop=4
 
 :set relativenumber
 
-:set timeout timeoutlen=20 ttimeoutlen=20
+:set timeout timeoutlen=500 ttimeoutlen=500
+
+:set clipboard=unnamedplus
 
 let s:fontsize = 12
 
@@ -36,25 +50,30 @@ Plug 'airblade/vim-gitgutter'
 Plug 'tpope/vim-fugitive'
 Plug 'mattn/emmet-vim'
 Plug 'Valloric/YouCompleteMe'
-Plug 'terryma/vim-multiple-cursors'
+Plug 'mg979/vim-visual-multi'
 Plug 'prettier/vim-prettier', { 'do': 'yarn install --frozen-lockfile --production' }
 Plug 'sainnhe/sonokai'
 Plug 'ryanoasis/vim-devicons'
 Plug 'vimlab/split-term.vim'
 Plug 'sirver/UltiSnips'
 Plug 'honza/vim-snippets'
-Plug 'lambdalisue/suda.vim'
 " Plug 'thaerkh/vim-workspace'
 Plug 'Raimondi/delimitMate'
+
 call plug#end()
 
 " Fzf
-nnoremap <C-p> :Files<CR>
+nnoremap <silent> <Leader>p :Files<CR>
+nnoremap <silent> <Leader>f :Rg<CR>
 
 " Prettier settings
 let g:prettier#autoformat = 1
 let g:prettier#autoformat_require_pragma = 0
 
+" Vim eunuch setting
+nnoremap <silent> <Leader>e :SudoEdit<CR>
+nnoremap <silent> <Leader>s :SudoWrite<CR>
+
 " Workspace settings
 " let g:workspace_autocreate = 1
 
@@ -63,13 +82,12 @@ let g:prettier#autoformat_require_pragma = 0
 
 let NERDTreeMinimalUI = 1
 let NERDTreeDirArrows = 1
+let NERDTreeShowHidden = 1
 
-nnoremap <C-t> :NERDTreeToggle<CR>
+nnoremap <silent> <C-t> :NERDTreeToggle<CR>
-nnoremap <C-f> :NERDTreeFind<CR>
-nnoremap <C-n> :NERDTree<CR>
 
-nnoremap ] :tabn<CR>
+nnoremap <silent> <Leader>] :tabn<CR>
-nnoremap [ :tabp<CR>
+nnoremap <silent> <Leader>[ :tabp<CR>
 
 " Lightline config
 set noshowmode

config/micro/bindings.json

@@ -1,4 +0,0 @@
-{
-	"Alt-/": "lua:comment.comment",
-	"CtrlUnderscore": "lua:comment.comment"
-}

config/micro/settings.json

@@ -1,7 +0,0 @@
-{
-    "colorscheme": "material-tc",
-    "mkparents": true,
-    "saveundo": true,
-    "tabmovement": true,
-    "tabsize": 2
-}

config/picom.conf

@@ -3,7 +3,7 @@ popup_menu    = { shadow = false; };
 utility       = { shadow = false; };
 
 backend = "glx";
-vsync = "opengl-swc";
+vsync = "true";
 
 glx-copy-from-front = true;
 glx-swap-method = 2;

config/vscodium.json

@@ -31,5 +31,23 @@
   },
   "[typescript]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "diffEditor.ignoreTrimWhitespace": false,
+  "typescript.updateImportsOnFileMove.enabled": "always",
+  "redhat.telemetry.enabled": false,
+  "[javascript]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "[html]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "[jsonc]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "[markdown]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "terminal.integrated.env.linux": {
+    "EDITOR": "codium"
   }
 }

dotfiles

@@ -2,7 +2,6 @@
 
 export ROOT=~/dotfiles
 export DOTFILES=$ROOT
-export EDITOR=micro
 
 case $1 in
     edit)

install.conf.yaml

@@ -19,10 +19,6 @@
     ~/gpg.conf: config/gpg.conf
     ~/.ssh/config: config/ssh
 
-    # Micro
-    ~/.config/micro/settings.json: config/micro/settings.json
-    ~/.config/micro/bindings.json: config/micro/bindings.json
-
     # NVim
     ~/.config/nvim/init.vim: config/init.vim