From e842787d164924f62f34908cddf7cda3b9183b5e Mon Sep 17 00:00:00 2001
From: Barak Michener <me@barakmich.com>
Date: Fri, 13 Nov 2020 15:13:51 -0800
Subject: [PATCH] add git aliases and fe extensions

---
 .bash_aliases                       | 4 ++++
 .config/coc/extensions/package.json | 5 ++++-
 .gitconfig                          | 3 +++
 .vimrc                              | 7 ++++---
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/.bash_aliases b/.bash_aliases
index 272f2bb..045adcf 100644
--- a/.bash_aliases
+++ b/.bash_aliases
@@ -104,6 +104,10 @@ dobenchx() {
 }
 alias benchx=dobenchx
 
+do_killgrep() {
+	ps auxwww | grep $1 | awk '{print $2}' | xargs kill
+}
+alias killgrep=do_killgrep
 #function gvim () {
       #`which gvim` $* &> /dev/null
 #}
diff --git a/.config/coc/extensions/package.json b/.config/coc/extensions/package.json
index a744de5..e85cf8e 100644
--- a/.config/coc/extensions/package.json
+++ b/.config/coc/extensions/package.json
@@ -3,6 +3,9 @@
     "coc-json": ">=1.3.2",
     "coc-python": ">=1.2.13",
     "coc-snippets": ">=2.2.3",
+    "coc-svelte": ">=0.1.1",
+    "coc-tailwindcss": ">=0.7.0",
+    "coc-tsserver": ">=1.6.0",
     "coc-ultisnips": ">=1.2.3"
   }
-}
+}
\ No newline at end of file
diff --git a/.gitconfig b/.gitconfig
index 327c77b..9e1b2bf 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -3,6 +3,7 @@
   email = me@barakmich.com
 
 [alias] 
+  br = branch -a -v
   st = status -uno
   stat = status -uno
   ci = commit
@@ -16,6 +17,8 @@
   ours   = "!f() { git checkout --ours $@ && git add $@; }; f"
   theirs = "!f() { git checkout --theirs $@ && git add $@; }; f"
   praise = blame
+  hist = show-branch -a
+  undo-last = reset HEAD^
 
 [diff]  
   renamelimit = 0
diff --git a/.vimrc b/.vimrc
index c733457..6db13ae 100644
--- a/.vimrc
+++ b/.vimrc
@@ -167,14 +167,15 @@ Plug 'ervandew/supertab'
 " Plugins for syntax
 Plug 'lunaru/vim-less'
 Plug 'hylang/vim-hy', {'for': 'hy'}
-Plug 'mhartington/nvim-typescript'
-Plug 'posva/vim-vue'
+"Plug 'mhartington/nvim-typescript'
+Plug 'leafOfTree/vim-svelte-plugin'
+"Plug 'posva/vim-vue'
 Plug 'Shougo/context_filetype.vim'
 Plug 'idris-hackers/idris-vim', {'for': 'idris'}
 Plug 'derekwyatt/vim-scala', {'for': 'scala'}
 Plug 'hwayne/tla.vim'
 Plug 'zchee/vim-goasm'
-Plug 'cappyzawa/starlark.vim'
+"Plug 'cappyzawa/starlark.vim'
 
 " Plugins that autocomplete
 "Plug 'Shougo/deoplete.nvim'