Merge branch 'master' of http://github.com/uvaes/dotfiles

5 files changed, 27 insertions, 12 deletions

diff --git a/.mutt/muttrc b/.mutt/muttrc
index f1df0de..df3a634 100644
--- a/.mutt/muttrc
+++ b/.mutt/muttrc
@@ -6,13 +6,13 @@ set envelope_from    = "yes"
 set weed
 
 # Encryption
-source /usr/share/doc/mutt-kz/samples/gpg.rc
-set pgp_use_gpg_agent = yes
-set pgp_sign_as = 08AC6A48
-set pgp_timeout = 3600
-set crypt_autosign = no
-set crypt_replyencrypt = yes
-set fcc_clear = yes
+# source /usr/share/doc/mutt-kz/samples/gpg.rc
+# set pgp_use_gpg_agent = yes
+# set pgp_sign_as = 08AC6A48
+# set pgp_timeout = 3600
+# set crypt_autosign = no
+# set crypt_replyencrypt = yes
+# set fcc_clear = yes
 
 # Folders
 set folder           = ~/.mail
diff --git a/.notes/Notes b/.notes/Notes
index 6c65166..326c04c 100644
--- a/.notes/Notes
+++ b/.notes/Notes
@@ -6,7 +6,6 @@ Notes
       ◦ Investigate proof of spectral convergence
       ◦ Register by the health center in London
    • Medium priority
-      ◦ Implement Smolyak algorithm
       ◦ Investigate proof of weak convergence
       ◦ Obtain rigourous homogenization result
    • Low priority
@@ -14,10 +13,9 @@ Notes
 
 # General Todos
    • High priority
-      ◦ Email to agency
    • Medium priority
       ◦ Book ticket to Paris
-      ◦ Message Hidayet, Greg, Alex, Francesc
+      ◦ Message Hidayet, Alex
    • Low priority
 
                                      * * *
diff --git a/.uzbl/bookmarks b/.uzbl/bookmarks
index d0bb5ab..c1de50b 100644
--- a/.uzbl/bookmarks
+++ b/.uzbl/bookmarks
@@ -3,6 +3,10 @@ http://bknguyen.be/ Khoi
 https://www.youtube.com/ Youtube
 http://www.economist.com/ Economist
 http://scholar.google.co.uk/ Scholar
-https://www.linkedin.com/profile/view?id=AAIAABBkh-EB6quFF-ih36lPoOTg8229XdlkmtI&trk=nav_responsive_tab_profile LinkedIn
 https://www.warlight.net/ Warlight
 http://192.168.0.20/#home Raspberry Pi
+https://exchange.imperial.ac.uk/owa/ Imperial email
+https://www.facebook.com/ Facebook
+https://translate.google.co.uk/ Translate
+https://mail.google.com/mail/u/1/#inbox Gmail
+https://www.linkedin.com/ Linked In
diff --git a/.vim/vimrc b/.vim/vimrc
index 09d3184..d6a30bd 100644
--- a/.vim/vimrc
+++ b/.vim/vimrc
@@ -22,7 +22,7 @@ Plug 'junegunn/vim-peekaboo'
 Plug 'junegunn/rainbow_parentheses.vim'
 Plug 'justinmk/vim-sneak'
 Plug 'kassio/neoterm', { 'on' : 'T' }
-Plug 'kien/ctrlp.vim'
+Plug 'ctrlpvim/ctrlp.vim'
 Plug 'lervag/vimtex'
 Plug 'majutsushi/tagbar'
 Plug 'mileszs/ack.vim', { 'on' : 'Ack' }
diff --git a/install.sh b/install.sh
index 1c358e5..d165f5a 100755
--- a/install.sh
+++ b/install.sh
@@ -38,6 +38,12 @@ install_zsh() {
     ln -s $dotdir/.zsh .zsh
 }
 
+install_uzbl() {
+    ln -s $dotdir/.uzbl uzbl
+    cd $HOME/.local/share/uzbl
+    ln -s $dotdir/.uzbl/bookmarks bookmarks
+}
+
 uninstall_offlineimap() {
     rm -f .offlineimaprc
     rm -f .offlineimap.py
@@ -51,6 +57,11 @@ uninstall_zsh() {
     rm -rf .zsh .zshrc
 }
 
+uninstall_uzbl() {
+    rm -rf uzbl
+    rm -f $HOME/.local/share/uzbl/bookmarks
+}
+
 dotdirs[.uzbl]="$HOME/.config/uzbl"
 dotdirs[.zathurarc]="$HOME/.config/zathura/zathurarc"
 
@@ -58,10 +69,12 @@ install[.offlineimap]='install_offlineimap'
 install[.vim]='install_vim'
 install[.mutt]='install_mutt'
 install[.zsh]='install_zsh'
+install[.uzbl]='install_uzbl'
 
 uninstall[.offlineimap]='uninstall_offlineimap'
 uninstall[.vim]='uninstall_vim'
 uninstall[.zsh]='uninstall_zsh'
+uninstall[.uzbl]='uninstall_uzbl'
 
 clean_dotfiles() {
     for file in ${(@k)dotdirs}; do