Merge branch 'master' of tardis:/dotfiles

diff --git a/Makefile b/Makefile
index e5e9da507790ce311b0c59e2e808b70f92ed7e31..665ef7c4029d281ef525e0698e6afa33bdf581fb 100644 (file)
--- 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 bb58d7cad3511be1e6ee72c7be8a38105ac7bacd..15c245818f63dce103e3a9f5622b2075fce7ce3a 100644 (file)
--- 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 9da4d247a1dd81ef5204ec1b418f1a242fcf10e9..1a49ab741c053ea0aba17e8eb530c0e795508ddf 100644 (file)
--- 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 3696096210f42d24d86b01fed0075d5181d04dc4..dc4da30d7b64c2827df4bdf9dbeb23e8a0e6f443 100644 (file)
--- 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 c6f21fc1513d75d2e5a1083f87ae291dc8a7d650..e40b474c7cc3136b090e09e92f770275751e825a 100644 (file)
--- 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 20156ff10e67c67965aeaf6ada1d5e02a581d600..8a6072a452dc516ab5d896c84319089c21a678ca 160000 (submodule)
--- 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 162ceafe125d4c2ae3acf21a7658fed00bebd806..957236e08f9380b4793da7c059d9633cf0d6e7f7 100644 (file)
--- 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, '<span font="Symbola 12">🔊</span> '.."$1", 1, device)

diff --git a/bin/dwb-social b/bin/dwb-social
index 27b1b69be8e009bd5cad190d5f5d51aca3c05cf0..dfa11de17a54c94e5596b4944ed98b4f5c79eb8d 100755 (executable)
--- 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 0e2520d86ce3e3389c0704d4550348334cc51b6a..4853171ae28a725d66885756487096d7c8df41df 100644 (file)
--- 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 9e397e2d6a568092266e8b6221b8e0c6a23c0723..01f99927082c6618b4a31fec1761dfcd9d365f83 100644 (file)
--- 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 fc4fe15f04bb4da36421b6cf5822a5474e63bced..e74ac439a0e17e5dd22bc990392e429ac7b79081 100644 (file)
--- 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 675110a9e2e93e4509773193c234f1237e4a76b9..3152415feef47a225ffe2f0ab606472c091f4398 100644 (file)
Binary files a/dwb/forms and b/dwb/forms differ

diff --git a/dwb/keys b/dwb/keys
index 69a4ec43a4f31847f1340e4b3d74c26ee7e1428c..9e796ea4d576ec945d727f8714ce09644f303d67 100644 (file)
--- 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 061e4db11cde897236cdacde244095ff8c4f5094..36743be95cfbb590975dcc978444b3c6885714d3 100644 (file)
--- 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 (executable)
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 260ac7e8f7140752038d7cc8fc0f984ffe95aa15..b4cfccc1c923e15071b180f6a8a9793550ee8d29 100755 (executable)
--- 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 bfbfc4c93ba4862057d6766642f54e8bcd8758da..06d260385da33f82bbb25e598e073ccf6dae774d 100644 (file)
--- 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 91757575a34d1777195eed37c696576dba52e420..2a7533d15082ae8f5d45846f8b81692c2d996cf1 100644 (file)
--- 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 "\<Tab>"
-  else
-    return "\<C-N>"
-endif
-endfunction
-inoremap <Tab> <C-R>=InsertTabWrapper()<CR>
-inoremap <S-Tab> <C-P>
-
 " 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 <leader>ag yiw:Ag \12"<cr>
+vnoremap <leader>ag y:Ag \12"<cr>
 
 " 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', '<cword>')<cr>
+" " vim-viewdoc {{{2
+" let g:no_viewdoc_maps = 1
+" nnoremap K :call ViewDoc('doc', '<cword>')<cr>
 
 " functions {{{1
 " auto source vimrc when saved

diff --git a/weechat/logger.conf b/weechat/logger.conf
index 6d65ea80fab46b9cb654e62ad52de45672d40f8f..48bd7c2c10c099cea6a8387143feceacd12b6e57 100644 (file)
--- 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 7c1e29e3136e72801b8d8e72f10f31bcc8637762..ac4498b0be75781c7e55a20743b6d6c01dd50661 100644 (file)
--- 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 5604a7c5dcc7457e6255e641349ca87b20b6da8a..a25e6fb27b4ad98e93a4418b9756f665cf04d7ba 100644 (file)
--- 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