Merge branch 'master' of git.barakmich.com:barak/dotfiles

.config/awesome/rc.lua

@@ -93,6 +93,25 @@ spacer = widget({type = "textbox"})
 separator = widget({type = "textbox"})
 spacer.text = " "
 separator.text = "|"
+-- Execute command and return its output. You probably won't only execute commands with one
+-- line of output
+function execute_command(command)
+   local fh = io.popen(command)
+   local str = ""
+   for i in fh:lines() do
+      str = str .. i
+   end
+   io.close(fh)
+   return str
+end
+
+pom = widget({type = "textbox"})
+pom.text = " " .. execute_command("~/src/tpm/tpm") .. " "
+pomtimer = timer({ timeout = 1})
+pomtimer:add_signal("timeout", function() 
+  pom.text = " " .. execute_command("~/src/tpm/tpm") .. " " 
+end)
+pomtimer:start()
 
 -- {{{ Menu
 -- Create a laucher widget and a main menu
@@ -275,6 +294,7 @@ for s = 1, screen.count() do
         spacer,
         separator,
         spacer,
+        pom,
         mytasklist[s],
         layout = awful.widget.layout.horizontal.rightleft
     }

.gitmodules

@@ -76,3 +76,6 @@
 [submodule ".vim/bundle/vim-bufferline"]
 	path = .vim/bundle/vim-bufferline
 	url = https://github.com/bling/vim-bufferline
+[submodule ".vim/bundle/tagbar"]
+	path = .vim/bundle/tagbar
+	url = git://github.com/majutsushi/tagbar

.tmux.conf

@@ -32,7 +32,7 @@ set -g status-fg white
 set -g status-interval 1
 set -g status-left '#[fg=green]#H#[default]'
 set -g status-left-length 20
-set -g status-right '#[fg=cyan,bold]%Y-%m-%d %H:%M:%S#[default]'
+set -g status-right '#[fg=green]#(~/src/tpm/tpm) #[fg=cyan,bold]%Y-%m-%d %H:%M:%S#[default]'
 
 # Notifying if other windows has activities
 setw -g monitor-activity on

.vim/bundle/tagbar

@@ -0,0 +1 @@
+Subproject commit 97d7b04bdd10cae424f8cb6be50ae7893b106ff4

.vim/plugin/gotags.vim

@@ -0,0 +1,27 @@
+let g:tagbar_type_go = {
+    \ 'ctagstype' : 'go',
+    \ 'kinds'     : [
+        \ 'p:package',
+        \ 'i:imports:1',
+        \ 'c:constants',
+        \ 'v:variables',
+        \ 't:types',
+        \ 'n:interfaces',
+        \ 'w:fields',
+        \ 'e:embedded',
+        \ 'm:methods',
+        \ 'r:constructor',
+        \ 'f:functions'
+    \ ],
+    \ 'sro' : '.',
+    \ 'kind2scope' : {
+        \ 't' : 'ctype',
+        \ 'n' : 'ntype'
+    \ },
+    \ 'scope2kind' : {
+        \ 'ctype' : 't',
+        \ 'ntype' : 'n'
+    \ },
+    \ 'ctagsbin'  : 'gotags',
+    \ 'ctagsargs' : '-sort -silent'
+    \ }

.vimrc

@@ -155,6 +155,8 @@ let g:NERDTreeDirArrows=0
 " * Tagbar plugin settings
 let g:tagbar_width = 40
 let g:tagbar_autofocus = 1
+let g:tagbar_autoclose = 1
+let g:tagbar_compact = 1
 
 " * Taglist plugin settings (deprecated)
 let Tlist_GainFocus_On_ToggleOpen = 1
@@ -369,7 +371,8 @@ endfunction
 " I don't know how I came up with gt for opening the tree, but it stuck.
 nmap gt :NERDTreeToggle<CR>
 " The same for the TagList, useful for large C files.
-nmap gb :TlistToggle<CR>
+"nmap gb :TlistToggle<CR>
+nmap gb :TagbarToggle<CR>
 "nnoremap gx :Kwbd<CR>
 " :Kwbd (defined below) really kills a buffer dead, and closes the window.
 " gK is similar.