From: Samir Benmendil Date: Sun, 24 Aug 2014 00:01:57 +0000 (+0100) Subject: Merge branch 'master' of tardis:/dotfiles X-Git-Url: https://git.rmz.io/dotfiles.git/commitdiff_plain/fb657354cd3a63f8415f7ee4716903c18c5ed549?hp=a3ec59efb33f7d3a2994a35e435e5c9ced030f40 Merge branch 'master' of tardis:/dotfiles --- diff --git a/Makefile b/Makefile index e5e9da5..665ef7c 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ APATH := $(realpath .) FILES := bin -DOTFILES := bash* conky* flexget git* goobookrc msmtp* mutt ncmpcpp offlineimap* profile weechat xbindkeysrc Xresources xprofile zprofile zshrc +DOTFILES := conky* git* goobookrc msmtp* mutt ncmpcpp offlineimap* profile weechat xbindkeysrc Xresources xprofile zprofile zshrc CONFIGFILES := aliases compton.conf git mimeo.conf mpd retroarch vim xkb zsh .PHONY: install $(FILES) $(DOTFILES) $(CONFIGFILES) diff --git a/awesome/autostart.lua b/awesome/autostart.lua index bb58d7c..15c2458 100644 --- a/awesome/autostart.lua +++ b/awesome/autostart.lua @@ -1,8 +1,8 @@ local utils = require("utils") -utils.run_once("dwb") -utils.run_once("dwb", "-r social --name dwb-social", "dwb-social") -utils.run_once("urxvtc -name ncmpcpp -icon ~/src/dotfiles/icons/bmp.png -e ncmpcpp", nil, "ncmpcpp") -utils.run_once("urxvtc -name weechat -icon ~/src/dotfiles/icons/im-irc.png -e weechat", nil, "weechat") -utils.run_once("urxvtc -name mutt -icon ~/src/dotfiles/icons/internet-mail.png -e mutt", nil, "mutt") -utils.run_once("dropboxd") +utils.run_once("dwb", "-r") +utils.run_once("dwb", "-r social --name dwb-social") +utils.run_once("urxvtc -name ncmpcpp -icon ~/src/dotfiles/icons/bmp.png -e ncmpcpp", nil, "ncmpcpp") +utils.run_once("urxvtc -name mopidy -icon ~/src/dotfiles/icons/bmp.png -e ncmpcpp -p 6601", nil, "ncmpcpp -p 6601") +utils.run_once("urxvtc -name weechat -icon ~/src/dotfiles/icons/im-irc.png -e weechat", nil, "weechat") +utils.run_once("urxvtc -name mutt -icon ~/src/dotfiles/icons/internet-mail.png -e mutt", nil, "mutt") diff --git a/awesome/rc.lua b/awesome/rc.lua index 9da4d24..1a49ab7 100644 --- a/awesome/rc.lua +++ b/awesome/rc.lua @@ -8,8 +8,6 @@ beautiful = require("beautiful") -- Notification library naughty = require("naughty") menubar = require("menubar") --- Pulseaudio widget ---local APW = require("apw/widget") -- {{{ Error handling -- Check if awesome encountered an error during startup and fell back to @@ -103,6 +101,5 @@ client.connect_signal("unfocus", function(c) c.border_color = beautiful.border_n -- Set keys root.keys(globalkeys) --- {{{ Autostart applications +-- Autostart applications require("autostart") --- }}} diff --git a/awesome/rules.lua b/awesome/rules.lua index 3696096..dc4da30 100644 --- a/awesome/rules.lua +++ b/awesome/rules.lua @@ -46,6 +46,9 @@ awful.rules.rules = { { rule = { class = "URxvt", instance = "ncmpcpp" }, properties = { tag = mediatag, function (c) awful.client.setmaster(c) end } }, + { rule = { class = "URxvt", instance = "mopidy" }, + properties = { tag = mediatag, + function (c) awful.client.setmaster(c) end } }, { rule = { class = "URxvt", instance = "weechat" }, properties = { tag = imtag, function (c) awful.client.setmaster(c) end } }, diff --git a/awesome/topbar.lua b/awesome/topbar.lua index c6f21fc..e40b474 100644 --- a/awesome/topbar.lua +++ b/awesome/topbar.lua @@ -82,7 +82,7 @@ for s = 1, screen.count() do -- Widgets that are aligned to the left local left_layout = wibox.layout.fixed.horizontal() - left_layout:add(mylauncher) + -- left_layout:add(mylauncher) left_layout:add(mytaglist[s]) left_layout:add(mypromptbox[s]) diff --git a/awesome/widgets/awesompd b/awesome/widgets/awesompd index 20156ff..8a6072a 160000 --- a/awesome/widgets/awesompd +++ b/awesome/widgets/awesompd @@ -1 +1 @@ -Subproject commit 20156ff10e67c67965aeaf6ada1d5e02a581d600 +Subproject commit 8a6072a452dc516ab5d896c84319089c21a678ca diff --git a/awesome/widgets/volume_widget.lua b/awesome/widgets/volume_widget.lua index 162ceaf..957236e 100644 --- a/awesome/widgets/volume_widget.lua +++ b/awesome/widgets/volume_widget.lua @@ -8,7 +8,7 @@ local volwidget = { } -- Select device local device = "" if utils.host == "chronos" then device = "alsa_output.pci-0000_00_1b.0.analog-stereo" end -if utils.host == "shada" then device = "alsa_output.pci-0000_00_14.2.analog-stereo" end +if utils.host == "shada" then device = "surround31" end -- Register widget volwidget = wibox.widget.textbox() vicious.register(volwidget, vicious.contrib.pulse, '🔊 '.."$1", 1, device) diff --git a/bin/dwb-social b/bin/dwb-social index 27b1b69..dfa11de 100755 --- a/bin/dwb-social +++ b/bin/dwb-social @@ -1,2 +1,2 @@ #!/bin/bash -dwb -r social --name dwb-social "$@" +exec dwb -r social --name dwb-social "$@" diff --git a/dwb/default/bookmarks b/dwb/default/bookmarks index 0e2520d..4853171 100644 --- a/dwb/default/bookmarks +++ b/dwb/default/bookmarks @@ -18,3 +18,4 @@ https://www.dropbox.com/ Dropbox https://www.facebook.com/ Facebook https://www.humblebundle.com/ Humble Bundle https://www.loomio.org/ Loomio +http://blog.techdev.de/code-snippet-edit-a-file-in-all-branches-using-git/ Code Snippet: Edit a File in all Branches using Git | techdev Solutions diff --git a/dwb/default/cookies.allow b/dwb/default/cookies.allow index 9e397e2..01f9992 100644 --- a/dwb/default/cookies.allow +++ b/dwb/default/cookies.allow @@ -12,6 +12,7 @@ .facebook.com .github.com .gitorious.org +.gmail.com .google.co.uk .google.com .google.nl @@ -34,6 +35,8 @@ .usenet-crawler.com .userscripts.org .www.dropbox.com +.www.facebook.com +.www.gmail.com .www.loomio.org .www.usenet-crawler.com .www.youtube.com @@ -52,10 +55,13 @@ chakraos.org community.playstarbound.com duckduckgo.com eleum.unimaas.nl +facebook.com forums.introversion.co.uk gist.github.com github.com gitorious.org +gmail.com +google.com jolla.com loomio.org mail.google.com @@ -79,6 +85,8 @@ www.amazon.de www.bnpparibasfortis.be www.chakra-project.org www.dropbox.com +www.facebook.com +www.gmail.com www.humblebundle.com www.introversion.co.uk www.loomio.org diff --git a/dwb/default/scripts.allow b/dwb/default/scripts.allow index fc4fe15..e74ac43 100644 --- a/dwb/default/scripts.allow +++ b/dwb/default/scripts.allow @@ -7,11 +7,13 @@ docs.scipy.org duckduckgo.com eleum.unimaas.nl en.wikipedia.org +encrypted.google.com github.com gitorious.org groups.google.com localhost mail.google.com +maps.google.com np.reddit.com piratenpad.de plus.google.com @@ -24,6 +26,7 @@ thetvdb.com together.jolla.com translate.google.com wiki.ros.org +www.amazon.co.uk www.amazon.com www.dropbox.com www.facebook.com @@ -34,4 +37,3 @@ www.loomio.org www.reddit.com www.ros.org www.usenet-crawler.com -www.youtube.com diff --git a/dwb/forms b/dwb/forms index 675110a..3152415 100644 Binary files a/dwb/forms and b/dwb/forms differ diff --git a/dwb/keys b/dwb/keys index 69a4ec4..9e796ea 100644 --- a/dwb/keys +++ b/dwb/keys @@ -1,16 +1,16 @@ [default] -save_search_field=gs -tab_new=ga -allow_session_cookie_tmp=CT -allow_cookie=CC -allow_session_cookie=CS -bookmark=M -buffers=gt -cancel_download=ad -sanitize= -clear_tab=gc -only= -close_tab=d +save_search_field= gs +tab_new= ga +allow_session_cookie_tmp= CT +allow_cookie= CC +allow_session_cookie= CS +bookmark= M +buffers= gt +cancel_download= ad +sanitize= +clear_tab= gc +only= +close_tab= d entry_escape=Control c entry_confirm=Control g entry_history_back=Control k @@ -27,152 +27,152 @@ complete_history=Control H complete_path=Control p complete_searchengines=Control S complete_userscript=Control U -download=gd +download= gd download_set_execute=Control x -command_mode=: -tabdo= -execute_javascript= -eval= -execute_userscript=eu -find_backward_ic=c? -find_backward=? -find_forward_ic=c/ -find_forward=/ -find_next=n -find_previous=N -focus_input=gi -focus_next=K -focus_tab=T -focus_prev=J -win_hist_back=wh -tab_hist_back=th -history_back=H -win_hist_forward=wl -tab_hist_forward=tl -history_forward=L -insert_mode=i -show_keys=Sk -load_html= -load_html_tab= -lock_domain=xd -lock_uri=xu -tab_move_left=gl -tab_move_right=gr -tab_move=gm +command_mode= : +tabdo= +execute_javascript= +eval= +execute_userscript= eu +find_backward_ic= c? +find_backward= ? +find_forward_ic= c/ +find_forward= / +find_next= n +find_previous= N +focus_input= gi +focus_next= K +focus_tab= T +focus_prev= J +win_hist_back= wh +tab_hist_back= th +history_back= H +win_hist_forward= wl +tab_hist_forward= tl +history_forward= L +insert_mode= i +show_keys= Sk +load_html= +load_html_tab= +lock_domain= xd +lock_uri= xu +tab_move_left= gl +tab_move_right= gr +tab_move= gm normal_mode=Control n open_editor=Control e -quickmark=b -tab_quickmark=B -win_quickmark=wb +quickmark= b +tab_quickmark= B +win_quickmark= wb start_page=Control h -web_inspector=wi -paste=pp -tab_paste=Pp -win_paste=wp -paste_primary=pP -win_paste_primary=wP -tab_paste_primary=PP +web_inspector= wi +paste= pp +tab_paste= Pp +win_paste= wp +paste_primary= pP +win_paste_primary= wP +tab_paste_primary= PP print=Control Mod1 p protect=Control P quit=Control q -reload_bookmarks= -reload=r -reload_bypass_cache=R -reload_quickmarks= -reload_userscripts= -save=sf -save_session=ZZ -save_named_session=gZZ -save_quickmark=m -scroll_down=j -scroll_right=l -scroll_left=h +reload_bookmarks= +reload= r +reload_bypass_cache= R +reload_quickmarks= +reload_userscripts= +save= sf +save_session= ZZ +save_named_session= gZZ +save_quickmark= m +scroll_down= j +scroll_right= l +scroll_left= h scroll_page_down=Control f scroll_page_up=Control b scroll_halfpage_down=Control d scroll_halfpage_up=Control u -scroll_bottom=G -scroll_top=gg -scroll_up=k -local_set= -set= -set_key=sk -set_local_setting=sl -set_setting=ss -show_settings=Ss -print_preview= -show_bookmarks=Sb -show_downloads=Sd -show_history=Sh -show_quickmarks=Sq +scroll_bottom= G +scroll_top= gg +scroll_up= k +local_set= +set= +set_key= sk +set_local_setting= sl +set_setting= ss +show_settings= Ss +print_preview= +show_bookmarks= Sb +show_downloads= Sd +show_history= Sh +show_quickmarks= Sq stop_loading=Control s -toggle_local_setting= -toggle_setting= +toggle_local_setting= +toggle_setting= toggle_tab=Control @Tab@ -toggle_plugins_host_tmp=pth -toggle_scripts_host=tsh -toggle_scripts_host_tmp=tth -toggle_scripts_uri=tsu -toggle_plugins_uri_tmp=ptu -toggle_scripts_uri_tmp=ttu -fullscreen=@F11@ -toggle_hidden_files=g. -toggle_plugins_host=ph -toggle_plugins_uri=pu -presentation_mode=@F12@ +toggle_plugins_host_tmp= pth +toggle_scripts_host= tsh +toggle_scripts_host_tmp= tth +toggle_scripts_uri= tsu +toggle_plugins_uri_tmp= ptu +toggle_scripts_uri_tmp= ttu +fullscreen= @F11@ +toggle_hidden_files= g. +toggle_plugins_host= ph +toggle_plugins_uri= pu +presentation_mode= @F12@ proxy=Control p -visible=xv -toggle_bars=xx -toggle_statusbar=xb -toggle_tabbar=xt -undo=u -view_source=gf -dump= -yank_title=yt -yank_title_primary=yT -yank=yy -yank_primary=yY -zoom== -zoom_in=+ -zoom_out=- -hints_background=;b -hints_images_background=.i -hints_url_background=.o -backopen_url=xO -backopen=xo -bookmarks=gb -hints=f -hints_clipboard=;y -hints_download=;d -hints_editable=;e -hints_images=;i -hints_links=;; -hints_primary=;Y -hints_rapid=;r -hints_url=;o -new_tab=V -new_win=W -open_url=go -open=o -hints_tab=F -hints_images_tab=;I -hints_url_tab=;O -tab_bookmarks=gB -tabopen_url=gO -tabopen=O -hints_win=wf -hints_rapid_win=;R -win_bookmarks=wB -winopen_url=wO -winopen=wo -adblock_reload_rules= -visual_mode=v -tabgrep= -repeat=. +visible= xv +toggle_bars= xx +toggle_statusbar= xb +toggle_tabbar= xt +undo= u +view_source= gf +dump= +yank_title= yt +yank_title_primary= yT +yank= yy +yank_primary= yY +zoom= = +zoom_in= + +zoom_out= - +hints_background= ;b +hints_images_background= .i +hints_url_background= .o +backopen_url= xO +backopen= xo +bookmarks= gb +hints= f +hints_clipboard= ;y +hints_download= ;d +hints_editable= ;e +hints_images= ;i +hints_links= ;; +hints_primary= ;Y +hints_rapid= ;r +hints_url= ;o +new_tab= V +new_win= W +open_url= go +open= o +hints_tab= F +hints_images_tab= ;I +hints_url_tab= ;O +tab_bookmarks= gB +tabopen_url= gO +tabopen= O +hints_win= wf +hints_rapid_win= ;R +win_bookmarks= wB +winopen_url= wO +winopen= wo +adblock_reload_rules= +visual_mode= v +tabgrep= +repeat= . entry_delete_active=Control d -jump=' -mark=` -hints_selector= +jump= ' +mark= ` +hints_selector= [mail] save_search_field=gs diff --git a/dwb/userscripts/extension_loader.js b/dwb/userscripts/extension_loader.js index 061e4db..36743be 100644 --- a/dwb/userscripts/extension_loader.js +++ b/dwb/userscripts/extension_loader.js @@ -123,6 +123,7 @@ hosts : { "docs.ros.org" : { "user-stylesheet-uri" : "file:///home/ramsi/.config/dwb/userstyles/doxygen.css" }, "paste.chakraos.org" : { "user-stylesheet-uri" : "file:///home/ramsi/.config/dwb/userstyles/paste.chakra-project.org.css" }, "plus.google.com" : { "user-stylesheet-uri" : "" }, + "maps.google.com" : { "user-stylesheet-uri" : "" }, "www.chakraos.org" : { "user-stylesheet-uri" : "file:///home/ramsi/.config/dwb/userstyles/chakra-project.org.css" }, }, // Settings applied based on the uri diff --git a/dwb/userscripts/vimeo.js b/dwb/userscripts/vimeo.js new file mode 100755 index 0000000..36c017e --- /dev/null +++ b/dwb/userscripts/vimeo.js @@ -0,0 +1,11 @@ +#!javascript + +var regex = new RegExp("(https?://vimeo.com/)(\\d*)"); + +Signal.connect("navigation", function (wv, frame, request) { + if (wv.mainFrame == frame && regex.test(request.uri)) { + var uri = system.spawnSync("youtube-dl -g "+request.uri.replace(regex, "$1$2")); + system.spawn("mpv "+uri.stdout); + } + return false; +}); diff --git a/dwb/userscripts/youtube.js b/dwb/userscripts/youtube.js index 260ac7e..b4cfccc 100755 --- a/dwb/userscripts/youtube.js +++ b/dwb/userscripts/youtube.js @@ -1,4 +1,4 @@ -#!javascript +#!javascript var regex = new RegExp("(https?://www.youtube.com/watch\\?)(?:.*&)*(v=.*)"); diff --git a/git/config b/git/config index bfbfc4c..06d2603 100644 --- a/git/config +++ b/git/config @@ -19,3 +19,9 @@ smtpserver = smtp.gmail.com smtpuser = samir.benmendil@gmail.com smtpserverport = 587 +[mergetool "fugitive"] + cmd = vim -f -c \"Gvdiff\" \"$MERGED\" +[merge] + tool = fugitive +[mergetool] + prompt = no diff --git a/vim/vimrc b/vim/vimrc index 9175757..2a7533d 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -15,7 +15,7 @@ Bundle 'gmarik/vundle' Bundle 'bling/vim-airline' Bundle 'elzr/vim-json' -Bundle 'ervandew/ag.git' +Bundle 'rking/ag.vim' Bundle 'http://git.code.sf.net/p/vim-latex/vim-latex' Bundle 'kien/ctrlp.vim' Bundle 'kshenoy/vim-signature' @@ -37,8 +37,13 @@ Bundle 'ompugao/ctrlp-ros' Bundle 'firef0x/pkgbuild.vim' Bundle 'derekwyatt/vim-fswitch' " seems to have problems right now... may be add later? -"Bundle 'jalcine/cmake.vim' -Bundle 'powerman/vim-plugin-viewdoc' +" Bundle 'jalcine/cmake.vim' +" Bundle 'powerman/vim-plugin-viewdoc' + +Bundle 'airblade/vim-gitgutter' +Bundle 'Raimondi/delimitMate' +Bundle 'SirVer/ultisnips' +Bundle 'Lokaltog/vim-easymotion' " remove entries first set runtimepath -=$HOME/.vim @@ -197,18 +202,6 @@ set nrformats=hex " number formats recognized for CTRL-A and CTRL- " whether to use a popup menu for Insert mode completion set completeopt=longest,menuone,preview -" Indent if we're at the beginning of a line. Else, do completion. -function! InsertTabWrapper() - let col = col('.') - 1 - if !col || getline('.')[col - 1] !~ '\k' - return "\" - else - return "\" -endif -endfunction -inoremap =InsertTabWrapper() -inoremap - " fix legacy vi inconsistency map Y y$ @@ -287,6 +280,8 @@ set viewdir=$XDG_CACHE_HOME/vim " plugins {{{1 " ag {{{2 let g:AgSmartCase = 1 +nnoremap ag yiw:Ag " +vnoremap ag y:Ag " " airline {{{2 let g:airline_detect_whitespace=2 @@ -342,6 +337,10 @@ let g:tagbar_autoshowtag = 1 let g:tagbar_width = 25 let g:tagbar_iconchars = ['+', '-'] +" UltiSnips {{{2 +let g:UltiSnipsEditSplit = 'vertical' +let g:UltiSnipsSnippetsDir = "$XDG_CONFIG_HOME/vim/ultisnips" + " YouCompleteMe {{{2 let g:ycm_extra_conf_globlist = ['~/src/*','/mnt/data/src/*'] let g:ycm_add_preview_to_completeopt = 1 @@ -357,9 +356,9 @@ let g:tex_flavor='latex' let g:Tex_DefaultTargetFormat='pdf' let g:Tex_MultipleCompileFormats='pdf' -" vim-viewdoc {{{2 -let g:no_viewdoc_maps = 1 -nnoremap K :call ViewDoc('doc', '') +" " vim-viewdoc {{{2 +" let g:no_viewdoc_maps = 1 +" nnoremap K :call ViewDoc('doc', '') " functions {{{1 " auto source vimrc when saved diff --git a/weechat/logger.conf b/weechat/logger.conf index 6d65ea8..48bd7c2 100644 --- a/weechat/logger.conf +++ b/weechat/logger.conf @@ -17,7 +17,7 @@ mask = "$plugin.$name.weechatlog" name_lower_case = on nick_prefix = "" nick_suffix = "" -path = "%h/logs/" +path = "~/.cache/weechat/logs/" replacement_char = "_" time_format = "%Y-%m-%d %H:%M:%S" diff --git a/zshenv b/zshenv index 7c1e29e..ac4498b 100644 --- a/zshenv +++ b/zshenv @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/env zsh export PATH="$HOME/bin:$PATH" export XDG_CONFIG_HOME="$HOME/.config" export XDG_DATA_HOME="$HOME/.local/share" diff --git a/zshrc b/zshrc index 5604a7c..a25e6fb 100644 --- a/zshrc +++ b/zshrc @@ -20,7 +20,6 @@ typeset -U fpath # make fpath a unique array autoload -U ${fpath[1]}/*(:t) # loads all functions in the first element of fpath # initialise completion -[[ -d "$ZSH_CACHE" ]] || mkdir -p "$ZSH_CACHE" autoload -U compinit; compinit -d "$ZSH_CACHE/zcompdump" # miscelaneous options @@ -36,7 +35,6 @@ setopt dvorak # correct_all uses dvorak typeset -U path # make path a unique array [[ -d ~/.local/bin ]] && path=(~/.local/bin $path) [[ -d ~/bin ]] && path=(~/bin $path) -[[ -d /extra ]] && path=($path /extra/bin /extra/usr/bin /extra/sbin /extra/usr/sbin) [[ -d /opt/android-sdk ]] && path=($path /opt/android-sdk/platform-tools) # source aliases