Embracing vim-fugitive and todoist.nvim

4 files changed, 30 insertions, 2 deletions

diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index 8894158..a06a92c 100755
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -33,6 +33,8 @@ Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' }
 " Go Deoplete sources
 Plug 'stamblerre/gocode', { 'rtp': 'vim', 'do': '~/.vim/plugged/gocode/vim/symlink.sh' }
 Plug 'deoplete-plugins/deoplete-go', { 'do': 'make'}
+" Todoist with vim?
+Plug 'romgrk/todoist.nvim', { 'do': ':TodoistInstall' }
 " LaTeX deoplete
 Plug 'hisaknown/deoplete-latex'
 " Turning vim into an R IDE
@@ -220,6 +222,13 @@ let g:tex_no_error=1
 " Lightline config
 let g:lightline = {
       \ 'colorscheme': 'friffle',
+      \ 'active': {
+      \   'left': [ [ 'mode', 'paste' ],
+      \             [ 'gitbranch', 'readonly', 'filename', 'modified' ] ]
+      \   },
+      \ 'component_function': {
+      \   'gitbranch': 'FugitiveHead'
+      \   },
       \ }
 set noshowmode
 
@@ -243,6 +252,11 @@ nmap <C-Enter> <leader>l
 " Arduino settings
 let g:arduino_cmd = '/usr/bin/arduino'
 let g:arduino_dir = '/usr/share/arduino'
+" Vim fugitive settings
+nmap <leader>gh :diffget //3<CR>
+nmap <leader>gu :diffget //2<CR>
+nmap <leader>gs :G<CR>
+nmap <leader>gc :Gcommit<CR>
 
 
 " #---Universal Macros---# "
diff --git a/.config/sxhkd/sxhkdrc b/.config/sxhkd/sxhkdrc
index 0dc9a47..0b917b5 100644
--- a/.config/sxhkd/sxhkdrc
+++ b/.config/sxhkd/sxhkdrc
@@ -145,9 +145,9 @@ XF86WLAN
 ## TUI Audio Mixer (alsamixer)
 super + p
     killall alsamixer || dropdowntoggle audio alsamixer -c 0
-## TODOs (todotxt-machine)
+## TODOs (Todoist.nvim)
 super + space
-    killall todotxt-machine || dropdowntoggle todos todotxt-machine
+    dropdowntoggle todoist nvim +Todoist
 ## Terminal Calculator
 super + a
     dropdowntoggle calc tmux-r
diff --git a/.local/bin/dwmbar/dwmb-debarque b/.local/bin/dwmbar/dwmb-debarque
new file mode 100755
index 0000000..c9f70fe
--- /dev/null
+++ b/.local/bin/dwmbar/dwmb-debarque
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+count="$(curl https://www.ladebarque.com/achalandage |
+  grep "il y a " |
+  sed 's/.*il\ y\ a\ en\ ce\ moment.nbsp;\s//; s/.nbsp.*//')"
+
+echo "  $count "
+
+case $BLOCK_BUTTON in
+		1) $BROWSER https://www.ladebarque.com/achalandage ;;
+    2) notify-send -a "  La Débarque" "Syncing..." && kill -51 $(pidof dwmblocks) && notify-send -a "  La Débarque" "Done!" ;;
+    3) notify-send -a "La Débarque" "This block shows the number of people currently climbing at my local gym." ;;
+esac
diff --git a/.profile b/.profile
index bb36e90..c565c16 100644
--- a/.profile
+++ b/.profile
@@ -18,6 +18,7 @@ export REFERBIB=$HOME/Dropbox/A/Scholar/All/References/bibliography.refer
 export DISTRIB_ID=arch
 export DISTRIB_RELEASE=$(uname -r)
 export XDG_CONFIG_HOME=$HOME/.config
+export TODOIST_API_KEY="$(pass Todoist/api)"
 # export GOROOT=/usr/bin/go
 
 # fix "xdg-open fork-bomb" export your preferred browser from here