From f5577dd0479d67b6d37dbf2bf597ce74dba808c2 Mon Sep 17 00:00:00 2001 From: Samir Benmendil Date: Fri, 4 Oct 2013 00:25:26 +0200 Subject: [PATCH 01/16] add vim-airline --- .gitmodules | 3 +++ vim/bundle/vim-airline | 1 + 2 files changed, 4 insertions(+) create mode 160000 vim/bundle/vim-airline diff --git a/.gitmodules b/.gitmodules index a6aef1b..447a11a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -16,3 +16,6 @@ [submodule "vim/bundle/nerdtree"] path = vim/bundle/nerdtree url = https://github.com/scrooloose/nerdtree.git +[submodule "vim/bundle/vim-airline"] + path = vim/bundle/vim-airline + url = https://github.com/bling/vim-airline diff --git a/vim/bundle/vim-airline b/vim/bundle/vim-airline new file mode 160000 index 0000000..008eb8c --- /dev/null +++ b/vim/bundle/vim-airline @@ -0,0 +1 @@ +Subproject commit 008eb8cd3b54380cb2af59bdf0075a622501a0e5 -- 2.49.0 From fe561a9969e304f16698d6b7fe2c2520256321f1 Mon Sep 17 00:00:00 2001 From: Samir Benmendil Date: Fri, 4 Oct 2013 01:08:27 +0200 Subject: [PATCH 02/16] huge edit/organize - separate into folds - add some plugin customizations - cleanup --- vimrc | 169 ++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 92 insertions(+), 77 deletions(-) diff --git a/vimrc b/vimrc index 99d28ba..5ed5e5b 100644 --- a/vimrc +++ b/vimrc @@ -1,43 +1,87 @@ " My vimrc file. " -" Maintainer: Samir Benmendil +" Maintainer: Samir Benmendil " if v:progname =~? "evim" finish endif -" TODO -" organize this file, never thought it'll get this big -" TODO - -" pathogen.vim runtime path manipulation -silent! call pathogen#infect() - " Use Vim settings, rather than Vi settings (much better!). " This must be first, because it changes other options as a side effect. set nocompatible -" allow backspacing over everything in insert mode -set backspace=indent,eol,start +" pathogen.vim runtime path manipulation +silent! call pathogen#infect() +" search {{{ +set incsearch +set ignorecase +set smartcase +set hlsearch +nmap q :nohl +" }}} + +" NERDTree {{{ +" open/close NERDTree with \e +nmap e :NERDTreeToggle +" to open files/dirs +let NERDTreeMapActivateNode='' +" open NERDTree if no files were selected +autocmd vimenter * if !argc() | NERDTree | endif +" close vim if only NERDTree is open +autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTreeType") && b:NERDTreeType == "primary") | q | endif +" }}} + +" airline {{{ +let g:airline#extensions#tabline#enabled = 1 +" }}} + +" tabbing {{{ +:nmap b :set expandtab tabstop=4 shiftwidth=4 softtabstop=4 +:nmap B :set expandtab tabstop=8 shiftwidth=8 softtabstop=4 +:nmap M :set noexpandtab tabstop=8 softtabstop=4 shiftwidth=4 +:nmap m :set expandtab tabstop=2 shiftwidth=2 softtabstop=2 +" }}} + +" backup {{{ if has("vms") set nobackup " do not keep a backup file, use versions instead else set backup " keep a backup file set backupdir=$HOME/.vim/backupdir endif -set history=50 " keep 50 lines of command line history -set ruler " show the cursor position all the time -set showcmd " display incomplete commands -set incsearch " do incremental searching -set number " show some linenumbers -" viminfo defaults but save file in .vim -set viminfo='100,<50,s10,h,n~/.vim/viminfo - -" For Win32 GUI: remove 't' flag from 'guioptions': no tearoff menu entries -" let &guioptions = substitute(&guioptions, "t", "", "g") +" }}} + +" appearance {{{ +set background=dark " Dark background, d'uh! +set number " show some linenumbers +set showmatch " Show matching brackets. +set showbreak=▒▒ " show these chars for wrapped lines +set list listchars=tab:»·,trail:· " show these chars for tabs and trailing spaces +" }}} + +" misc options {{{ +set history=500 " keep 500 lines of command line history +set ruler " show the cursor position all the time +set confirm " Ask what to do when closing unsaved documents +set showcmd " Show (partial) command in status line. +set autowrite " Automatically save before commands like :next and :make +"set hidden " Hide buffers when they are abandoned +set splitright " split right when using :vsp +set scrolloff=5 " keep at least n lines above/below +set backspace=indent,eol,start " allow backspacing over everything in insert mode + +set viminfo='100,<50,s10,h,n~/.vim/viminfo " viminfo defaults but save file in .vim +" }}} + +" tabs {{{ +set softtabstop=4 +set shiftwidth=4 +set expandtab +" }}} +" misc bindings {{{ " Don't use Ex mode, use Q for formatting map Q gq @@ -45,33 +89,41 @@ map Q gq " so that you can undo CTRL-U after inserting a line break. inoremap u -"paste toggle +" Press `` to toggle insert and replace mode (no key on Mac keyboard) +imap `` +" }}} + +" paste toggle {{{ nmap :set paste! paste? imap :set paste! vmap :set paste!gv -set pastetoggle= +set pastetoggle= +" }}} +" mouse {{{ " In many terminal emulators the mouse works just fine, thus enable it. -"if has('mouse') -" "xterm mouse with middleclick paste -" nnoremap i -" vnoremap s -" set mouse=rnv -" "choose either one -" set ttymouse=xterm -" "set ttymouse=xterm2 -"endif +if has('mouse') + "xterm mouse with middleclick paste + nnoremap i + vnoremap s + set mouse=rnv + "choose either one + set ttymouse=xterm + "set ttymouse=xterm2 +endif +" }}} +" syntax {{{ " Switch syntax highlighting on, when the terminal has colors " Also switch on highlighting the last used search pattern. if &t_Co > 2 || has("gui_running") syntax on - set hlsearch endif +" }}} +" autocmd {{{ " Only do this part when compiled with support for autocommands. if has("autocmd") - " Enable file type detection. " Use the default filetype settings, so that mail gets 'tw' set to 72, " 'cindent' is on in C files, etc. @@ -98,13 +150,11 @@ if has("autocmd") \ endif augroup END - else - set autoindent " always set autoindenting on +endif " has("autocmd") }}} -endif " has("autocmd") - +" DiffOrig {{{ " Convenient command to see the difference between the current buffer and the " file it was loaded from, thus the changes you made. " Only define it when not defined already. @@ -112,45 +162,9 @@ if !exists(":DiffOrig") command DiffOrig vert new | set bt=nofile | r # | 0d_ | diffthis \ | wincmd p | diffthis endif +" }}} -" Ask what to do when closing unsaved documents -set confirm - -" If using a dark background within the editing area and syntax highlighting -" turn on this option as well -set background=dark - -" The following are commented out as they cause vim to behave a lot -" differently from regular Vi. They are highly recommended though. -set showcmd " Show (partial) command in status line. -set showmatch " Show matching brackets. -set ignorecase " Do case insensitive matching -set smartcase " Do smart case matching -set incsearch " Incremental search -set autowrite " Automatically save before commands like :next and :make -"set hidden " Hide buffers when they are abandoned -"set mouse=a " Enable mouse usage (all modes) - -" expand tabs -set softtabstop=4 -set shiftwidth=4 -set expandtab - -set showbreak=▒▒ -" show these chars for tabs and trailing spaces -set list listchars=tab:»·,trail:· - -set pastetoggle= -" split right when using :vsp -set splitright - -set scrolloff=3 " keep at least 3 lines above/below -" Press i to enter insert mode, and ii to exit. -imap ii -" Press `` to toggle insert and replace mode (no key on Mac keyboard) -imap `` - -" fold between {{{ }}} +" fold {{{ set foldmethod=marker set foldlevelstart=99 " space will toggle current fold in normal mode, if not in a fold, normal @@ -160,7 +174,9 @@ vnoremap zf " save and restore folds autocmd BufWinLeave *.* mkview autocmd BufWinEnter *.* silent loadview +" }}} +function! NextIndent(exclusive, fwd, lowerlevel, skipblanks) " {{{ " Jump to the next or previous line that has the same level or a lower " level of indentation than the current line. " @@ -172,7 +188,6 @@ autocmd BufWinEnter *.* silent loadview " false: Go to line with the same indentation level " skipblanks (bool): true: Skip blank lines " false: Don't skip blank lines -function! NextIndent(exclusive, fwd, lowerlevel, skipblanks) let line = line('.') let column = col('.') let lastline = line('$') @@ -207,4 +222,4 @@ onoremap [l :call NextIndent(0, 0, 0, 1) onoremap ]l :call NextIndent(0, 1, 0, 1) onoremap [L :call NextIndent(1, 0, 1, 1) onoremap ]L :call NextIndent(1, 1, 1, 1) -" end of jump indent +" end of jump indent }}} -- 2.49.0 From 8308ffb485b90d3467f1c0df05ae199f82a8cbc6 Mon Sep 17 00:00:00 2001 From: Samir Benmendil Date: Fri, 4 Oct 2013 15:53:18 +0200 Subject: [PATCH 03/16] set colours for URxvt only fixes a warning when running vim --- Xresources | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/Xresources b/Xresources index cb424d2..87fa239 100644 --- a/Xresources +++ b/Xresources @@ -44,32 +44,32 @@ URxvt.keysym.C-A-V: perl:clipboard:paste_escaped ! {{{ Colours URxvt*.depth: 32 -*background: [75]#222222 -*foreground: #f8f8f2 +URxvt*.background: [75]#222222 +URxvt*.foreground: #f8f8f2 ! Black -*color0: #262729 -*color8: #262729 +URxvt*.color0: #262729 +URxvt*.color8: #262729 ! Red -*color1: #f92671 -*color9: #ff669d +URxvt*.color1: #f92671 +URxvt*.color9: #ff669d ! Green -*color2: #a6e22e -*color10: #beed5f +URxvt*.color2: #a6e22e +URxvt*.color10: #beed5f ! Yellow -*color3: #fd971f -*color11: #e6db74 +URxvt*.color3: #fd971f +URxvt*.color11: #e6db74 ! Blue -*color4: #1692d0 -*color12: #66d9ef +URxvt*.color4: #1692d0 +URxvt*.color12: #66d9ef ! Magenta -*color5: #9e6ffe -*color13: #df92f6 +URxvt*.color5: #9e6ffe +URxvt*.color13: #df92f6 ! Cyan -*color6: #5e7175 -*color14: #a3babf +URxvt*.color6: #5e7175 +URxvt*.color14: #a3babf ! White -*color7: #ffffff -*color15: #ffffff +URxvt*.color7: #ffffff +URxvt*.color15: #ffffff ! Cursor -*cursorColor: #b5d2dd +URxvt*.cursorColor: #b5d2dd ! }}} -- 2.49.0 From 2e2286a242b12b4f5d65bc8618d6372de9b872f8 Mon Sep 17 00:00:00 2001 From: Samir Benmendil Date: Fri, 4 Oct 2013 15:54:37 +0200 Subject: [PATCH 04/16] add chakra-project.org --- dwb/default/cookies.allow | 1 + 1 file changed, 1 insertion(+) diff --git a/dwb/default/cookies.allow b/dwb/default/cookies.allow index dc8009a..1378eab 100644 --- a/dwb/default/cookies.allow +++ b/dwb/default/cookies.allow @@ -47,3 +47,4 @@ talkgadget.google.com plus.google.com sourceforge.net .sourceforge.net +chakra-project.org -- 2.49.0 From cdd2aa65ee027cf62e7be13e10f33fe8549d9dc2 Mon Sep 17 00:00:00 2001 From: Samir Benmendil Date: Thu, 10 Oct 2013 01:32:37 +0200 Subject: [PATCH 05/16] add extra to search path --- bin/socheck | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/socheck b/bin/socheck index bd5a855..ef724e9 100755 --- a/bin/socheck +++ b/bin/socheck @@ -2,8 +2,8 @@ sudo -v -files=$(find /usr/bin -maxdepth 1 -type f) -libs=$(find /usr/lib/*.so* -maxdepth 1 -type f) +files=$(find /usr/bin /extra/usr/bin -maxdepth 1 -type f) +libs=$(find /usr/lib/*.so* /extra/usr/lib/*.so* -maxdepth 1 -type f) clear echo "Searching broken binaries...." -- 2.49.0 From 3931b2de970375a8cc7361845a12f424c09c38b2 Mon Sep 17 00:00:00 2001 From: Samir Benmendil Date: Thu, 10 Oct 2013 01:40:01 +0200 Subject: [PATCH 06/16] add sodepend (only show direct depends) --- bin/sodepend | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100755 bin/sodepend diff --git a/bin/sodepend b/bin/sodepend new file mode 100755 index 0000000..6189e8b --- /dev/null +++ b/bin/sodepend @@ -0,0 +1,12 @@ +#!/bin/bash + +pkg=$1 + +libs=$(pacman -Qlq $pkg | grep -e 'bin/.' -e '\.so') + +libdepends=( $(objdump -p $libs | sed -n 's/NEEDED\s*//p' | sort -u) ) +libpaths=( $(locate -b ${libdepends[@]/\//\\/} | grep -e '^/usr/lib/' -e '^/extra/usr/lib/') ) +#sudo -v +#libpaths=$(sudo ldd $libs | sed -rn '/^\t/ s/.* => (\S+).*/\1/p' | sort -u) + +pacman -Qoq ${libpaths[@]} | sort -u | grep -v "^$pkg$" -- 2.49.0 From 63dba7ee02bc3152b0820a4ce163bf19c9d88a2e Mon Sep 17 00:00:00 2001 From: Samir Benmendil Date: Sun, 13 Oct 2013 00:52:27 +0200 Subject: [PATCH 07/16] add rules and autostart for "dwb -r social" also restrict the dwb rules to normal windows --- awesome/autostart.lua | 1 + awesome/rules.lua | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/awesome/autostart.lua b/awesome/autostart.lua index 7163234..f445570 100644 --- a/awesome/autostart.lua +++ b/awesome/autostart.lua @@ -1,6 +1,7 @@ local utils = require("utils") utils.run_once("dwb") +utils.run_once("dwb", "-r social --name dwb-social") utils.run_once("kopete") utils.run_once("quassel") utils.run_once("kontact") diff --git a/awesome/rules.lua b/awesome/rules.lua index 977b091..63ddfec 100644 --- a/awesome/rules.lua +++ b/awesome/rules.lua @@ -35,8 +35,10 @@ awful.rules.rules = { { rule = { class = "Clementine" }, properties = { tag = mediatag, switchtotag = true } }, - { rule = { class = "Dwb" }, + { rule = { class = "Dwb", type = "normal", instance = "dwb" }, properties = { tag = wwwtag } }, + { rule = { class = "Dwb", type = "normal", instance = "dwb-social" }, + properties = { tag = tags[2][4] } }, { rule = { class = "Qupzilla" }, properties = { tag = wwwtag } }, { rule = { class = "Qupzilla", name = "Detached ViewTube - QupZilla" }, -- 2.49.0 From 9b99a15cc40a09e560d19d5ec110e3ff901c7443 Mon Sep 17 00:00:00 2001 From: Samir Benmendil Date: Sun, 13 Oct 2013 00:54:54 +0200 Subject: [PATCH 08/16] add gpg encrypted forms waiting for portix to apply my patch for the forms to actually work with " and / --- dwb/.gitignore | 1 - dwb/forms | Bin 0 -> 1008 bytes 2 files changed, 1 deletion(-) create mode 100644 dwb/forms diff --git a/dwb/.gitignore b/dwb/.gitignore index b499979..2f9578f 100644 --- a/dwb/.gitignore +++ b/dwb/.gitignore @@ -1,6 +1,5 @@ adblock_lists/ default/hsts -forms default/cookies default/commands.history default/history diff --git a/dwb/forms b/dwb/forms new file mode 100644 index 0000000000000000000000000000000000000000..a4473d2cb32fe9032a434f2812c1d26ae6082985 GIT binary patch literal 1008 zcmZo=;$hC|)o3qa@?6fy|Icvx>8O0x1J}3wkVi@5rlE!#Nu&al`X3kF^3-5h1!%m&I6Wc1j?uhFShU_cbjv8FLJ^Q&< zP^!uYA&d52xtouVS+0=n+&HU$azVST!2Cp)Hb;)g=)K0}f$!GddRcPfv&NM9g4-VQ zL|Q==EmXCf7L%-=k*p8cmgZy4?8b<`t98|9-AN@iBJJ?uQkI@7^|i zSuEaiH8lG3wD){cp3J742VPrWbrIO@w!iUBU1VQD3ir&w1#?zB*rvMfVM{{6uCwx6 z4)U0vYyG$9?OEslA67nDmEo|nw_jr4qUkALsub4iZVwOlKJ)T{N!@y(i8dXUojbFy z-_+=uadZ94dYk*2Q;d{%_Iy5Kv2W*_fY*jrm+qv0?n;r-dN=F(T4wn)H~vdA`geA& zT~c^KKIE#)?&@dZPgYEiiB;Khx&Bvd$F6)G9^2&~*G}92sM6zGG4G9lPT{S-dnWy@ z>%B3V^P742lV#Nx_Bo!;ofh+a)utfkho=n$s>=^8+d1!?vGumO91&->=zCmGI8qYK z%**oVBFxJM>4d3gQAg&6~^-&Fivp&4>IclG@3 zAJ=JRvHS^H+i6+3@p7cmq5cErPtAop1VX&~KOURIE_v%%Qt`9sO9$l`UkE?CP$s@Q z?5D=DlGDrcb3gbeZD4t9df>`T7W<2db4`k8UjIDbR9m1T0jnHx}LEfv4hBDmDoYL={`Ry+@{XfW=`Z&KxRQuy>#my_#qAqXfV7BZM zv`U`)c809!o~iO?Oy2x3y}Qbeoj(#YML3x$BYNSEnzS48-Unq~3a0)0c`c=k!(;O5gkTRxp19z`ju-4b z{8Mjm<>n~pp5naoKzRPMSn+d8>qXDs{(F4#Y1_+3KYsEp{`cuUwWcRE)+ub7^S8-jHSX*NKwQK3r&wqJ@?H{g)+!FBj)aAD;7aWR@JS{9Z zH!|2TS}w8amuT>%X=kKlA0JuU{Z%3D^VE40Vgme^T}ulX{S z*)dc)=-E;ud$uDp%dWcg%h=SK{c5@psQUSalijB9?Q51w3G0e{Fxq?b>^)D3FxmNf f+jIWIGDKTNA|9S227F18E`Q`!uk^}N? literal 0 HcmV?d00001 -- 2.49.0 From 78cf2ce541f5b6ddd96e98df4630105c440a06d8 Mon Sep 17 00:00:00 2001 From: Samir Benmendil Date: Mon, 14 Oct 2013 09:52:31 +0200 Subject: [PATCH 09/16] add some passwds --- dwb/forms | Bin 1008 -> 1008 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/dwb/forms b/dwb/forms index a4473d2cb32fe9032a434f2812c1d26ae6082985..31d638a776d44bbd99385b707cd128095a44e55f 100644 GIT binary patch literal 1008 zcmZo=;$hC|)o3qa@?6d+z_3tmOGbK{@$Q89LsMit*uAb4C;sef*GygQrm^^#?hXz! zhV8ZCVK3Vw@`dIy^DoS5zItqp)7vY(jlCbCd3KO5+zApSJ|JLg-uhbG0uCUzuSvljPv#d2ukrFc;jkK$mT4gEqezE4}%4z?y z;gp*$mx(dojV^2ErigDb!tdT+lVt03JpOiVKxV}GO)je)HEuuHaKh%=3V-SUk5s0y z?An}Sr@y-PL}PDVqNUjL51XE!k!ATg=l<1KCzFJhd*qh)7+qSixH%-~go>9yiIOS=pF9jTV(t6o?5CxpQb$tBLK2+Oj8i z*|WVgte=_$U1>{_ZCBc%a_-uZ;8@E?SCaec-zYH7QezAGu07j#@jNNsv=4&$o>9~6 z=UBEo?kYU17T@aKIs0PV7ORC$F1ics`>QkKYD2vn!~S|-Iw;2&|5SSO*-XVu@k2$8 z5&QC0Pj^o`AT)7{ns_{y&D1G>ujJjTytC!(lXah*ZdY{u@okJc_UzE2g!YWh@4md5 z@oVDIW*fsKyU?l?r`EFkc1?St{rKf&_pJ(s^S4EZwj_U!d;Tu6SWD;czb^}nw$2V( z*OB|};)jVFoEB~Qouln#q_c1T*8LNslAg=PY3L+>G1~g~sHb0@d!vBZot2!AOBU1| zRax-;E6avJ7Q+V@RtmK~s6NS+AEG3-cXnDAkH~Y4eLhAKaeOvc%+lvP*`BlGg9xvt zh}7(Ln{UrwYcgrgJYj?DO3p!QccdA27D$*z7==CeE#*2RkyCItw5UyAb@{t(CCmSu zW0Ny`{P#q4@8Y@%xnJKLU^ZRx!*WMCn$J8O0x1J}3wkVi@5rlE!#Nu&al`X3kF^3-5h1!%m&I6Wc1j?uhFShU_cbjv8FLJ^Q&< zP^!uYA&d52xtouVS+0=n+&HU$azVST!2Cp)Hb;)g=)K0}f$!GddRcPfv&NM9g4-VQ zL|Q==EmXCf7L%-=k*p8cmgZy4?8b<`t98|9-AN@iBJJ?uQkI@7^|i zSuEaiH8lG3wD){cp3J742VPrWbrIO@w!iUBU1VQD3ir&w1#?zB*rvMfVM{{6uCwx6 z4)U0vYyG$9?OEslA67nDmEo|nw_jr4qUkALsub4iZVwOlKJ)T{N!@y(i8dXUojbFy z-_+=uadZ94dYk*2Q;d{%_Iy5Kv2W*_fY*jrm+qv0?n;r-dN=F(T4wn)H~vdA`geA& zT~c^KKIE#)?&@dZPgYEiiB;Khx&Bvd$F6)G9^2&~*G}92sM6zGG4G9lPT{S-dnWy@ z>%B3V^P742lV#Nx_Bo!;ofh+a)utfkho=n$s>=^8+d1!?vGumO91&->=zCmGI8qYK z%**oVBFxJM>4d3gQAg&6~^-&Fivp&4>IclG@3 zAJ=JRvHS^H+i6+3@p7cmq5cErPtAop1VX&~KOURIE_v%%Qt`9sO9$l`UkE?CP$s@Q z?5D=DlGDrcb3gbeZD4t9df>`T7W<2db4`k8UjIDbR9m1T0jnHx}LEfv4hBDmDoYL={`Ry+@{XfW=`Z&KxRQuy>#my_#qAqXfV7BZM zv`U`)c809!o~iO?Oy2x3y}Qbeoj(#YML3x$BYNSEnzS48-Unq~3a0)0c`c=k!(;O5gkTRxp19z`ju-4b z{8Mjm<>n~pp5naoKzRPMSn+d8>qXDs{(F4#Y1_+3KYsEp{`cuUwWcRE)+ub7^S8-jHSX*NKwQK3r&wqJ@?H{g)+!FBj)aAD;7aWR@JS{9Z zH!|2TS}w8amuT>%X=kKlA0JuU{Z%3D^VE40Vgme^T}ulX{S z*)dc)=-E;ud$uDp%dWcg%h=SK{c5@psQUSalijB9?Q51w3G0e{Fxq?b>^)D3FxmNf f+jIWIGDKTNA|9S227F18E`Q`!uk^}N? -- 2.49.0 From 35f1597f0f3a06b210dacc6d380f34d4c5cda4ff Mon Sep 17 00:00:00 2001 From: Samir Benmendil Date: Mon, 14 Oct 2013 09:52:50 +0200 Subject: [PATCH 10/16] fix rule for chronos --- awesome/rules.lua | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/awesome/rules.lua b/awesome/rules.lua index 63ddfec..e9b66ca 100644 --- a/awesome/rules.lua +++ b/awesome/rules.lua @@ -10,6 +10,9 @@ if utils.host == "chronos" then wwwtag = tags[1][2] end if utils.host == "shada" then imtag = tags[2][2] end if utils.host == "chronos" then imtag = tags[1][3] end +if utils.host == "shada" then socialtag = tags[2][4] end +if utils.host == "chronos" then socialtag = tags[1][5] end + awful.rules.rules = { -- All clients will match this rule. { rule = { }, @@ -38,7 +41,7 @@ awful.rules.rules = { { rule = { class = "Dwb", type = "normal", instance = "dwb" }, properties = { tag = wwwtag } }, { rule = { class = "Dwb", type = "normal", instance = "dwb-social" }, - properties = { tag = tags[2][4] } }, + properties = { tag = socialtag } }, { rule = { class = "Qupzilla" }, properties = { tag = wwwtag } }, { rule = { class = "Qupzilla", name = "Detached ViewTube - QupZilla" }, -- 2.49.0 From bef5a8755799e0fec3104c06148a041717953e9a Mon Sep 17 00:00:00 2001 From: Samir Benmendil Date: Mon, 14 Oct 2013 11:05:41 +0200 Subject: [PATCH 11/16] add reddit --- dwb/forms | Bin 1008 -> 1099 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/dwb/forms b/dwb/forms index 31d638a776d44bbd99385b707cd128095a44e55f..a9a67431f74a4b715370efe0eb08a9fb38badacc 100644 GIT binary patch literal 1099 zcmZo=;$hC|)o3qa@?6d+z_6f?zb$q7^Pdc>m{)(lbfmPsyg2q~!A_&quResaro|jn z67S#sQmB0GybZP160)w^7wXz=eok5ZKH~Tkp{do+Ur+VW+ot`YH901m+1o6s$~ZY; z?RoFAZ=FXiD~|Gix)S4l&7)RWJZ74pU~}xQbfz|@>9HH+<)2+kuH*d_c6r~mU7y|e z#=LZU(0ZZy>8rUHgc_L24^Eh9sh4AKw(y?m*59oEPTPK0*pgNs*}nS8(9-g4!FuIiMG7pkW1h9SM6-m-V8HQuq{pZ~CF^t9fztCsV!0#SxQi=KJPt zjSJYSn=3Z0ZQ|@2v8gw<7fcsA*PO5K{8KJo+V1%Irs5@@0%0Xo)=x&Zz}h>W^zT;Zi}jUZ|W|+WIRw)lb)}CSVL^a z1I}waYrY9-rDvT^D%CxbbatnA^TyZilkz^yFuZ&(Lf~D}Eg`cVY_A#3ndhYU6tHxk zxVI_AGVJzSu15WM&CadJH&y0z0XKz-L+-y1h*6E;wvI1*oFitrpb65O_+}a)2 zwfkOltXqaF>}v90ot*#0KU>Saa$ZkAE3UWgx~azEnv=)o zY+bS~;&G1K(_IIy%`_``(i*xVh)NMRu-vRBi6NT&(snn}dk+%+-19 zta{x2ffHVslCbCd3KO5+zApSJ|JLg-uhbG0uCUzuSvljPv#d2ukrFc;jkK$mT4gEqezE4}%4z?y z;gp*$mx(dojV^2ErigDb!tdT+lVt03JpOiVKxV}GO)je)HEuuHaKh%=3V-SUk5s0y z?An}Sr@y-PL}PDVqNUjL51XE!k!ATg=l<1KCzFJhd*qh)7+qSixH%-~go>9yiIOS=pF9jTV(t6o?5CxpQb$tBLK2+Oj8i z*|WVgte=_$U1>{_ZCBc%a_-uZ;8@E?SCaec-zYH7QezAGu07j#@jNNsv=4&$o>9~6 z=UBEo?kYU17T@aKIs0PV7ORC$F1ics`>QkKYD2vn!~S|-Iw;2&|5SSO*-XVu@k2$8 z5&QC0Pj^o`AT)7{ns_{y&D1G>ujJjTytC!(lXah*ZdY{u@okJc_UzE2g!YWh@4md5 z@oVDIW*fsKyU?l?r`EFkc1?St{rKf&_pJ(s^S4EZwj_U!d;Tu6SWD;czb^}nw$2V( z*OB|};)jVFoEB~Qouln#q_c1T*8LNslAg=PY3L+>G1~g~sHb0@d!vBZot2!AOBU1| zRax-;E6avJ7Q+V@RtmK~s6NS+AEG3-cXnDAkH~Y4eLhAKaeOvc%+lvP*`BlGg9xvt zh}7(Ln{UrwYcgrgJYj?DO3p!QccdA27D$*z7==CeE#*2RkyCItw5UyAb@{t(CCmSu zW0Ny`{P#q4@8Y@%xnJKLU^ZRx!*WMCn$J Date: Mon, 14 Oct 2013 11:21:37 +0200 Subject: [PATCH 12/16] add dwb-social --- bin/dwb-social | 2 ++ 1 file changed, 2 insertions(+) create mode 100755 bin/dwb-social diff --git a/bin/dwb-social b/bin/dwb-social new file mode 100755 index 0000000..27b1b69 --- /dev/null +++ b/bin/dwb-social @@ -0,0 +1,2 @@ +#!/bin/bash +dwb -r social --name dwb-social "$@" -- 2.49.0 From 7c542e0a047eba445172fe8269d9a5ed7ebd1275 Mon Sep 17 00:00:00 2001 From: Samir Benmendil Date: Mon, 14 Oct 2013 11:22:39 +0200 Subject: [PATCH 13/16] comment some stuff --- bin/rename-video.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/bin/rename-video.sh b/bin/rename-video.sh index 017179d..637bdfe 100755 --- a/bin/rename-video.sh +++ b/bin/rename-video.sh @@ -4,16 +4,15 @@ get_videoinfo() { local -a mediainfo IFS=, mediainfo=( $(mediainfo --Output='Video;%Width%,%Height%,%ScanType%,%Format%,%Codec%' "$1") ) - mediainfo=( $(ffprobe -select_streams v -show_entries stream=codec_name,width,height -of compact "$1" 2> /dev/null) ) + #TODO ffprobe returns better parseable output but doesn't give info on scan_type (use it for audio only?) +# IFS='|' +# mediainfo=( $(ffprobe -select_streams v -show_entries stream=codec_name,width,height -of compact=nk=1 -i file:"$1" 2> /dev/null) ) local width=${mediainfo[0]} local height=${mediainfo[1]} local scan=${mediainfo[2]} local format=${mediainfo[3]} local codecid=${mediainfo[4]} - echo ${mediainfo[@]} - return - # same tests xbmc does: # https://github.com/xbmc/xbmc/blob/master/xbmc/utils/StreamDetails.cpp#L514 if (( $width <= 720 && $height <= 480 )); then -- 2.49.0 From c0f7765e93241e28861e908c2b368e2510b10a1e Mon Sep 17 00:00:00 2001 From: Samir Benmendil Date: Mon, 14 Oct 2013 23:34:36 +0200 Subject: [PATCH 14/16] add amazon --- dwb/forms | Bin 1099 -> 1163 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/dwb/forms b/dwb/forms index a9a67431f74a4b715370efe0eb08a9fb38badacc..e3a41e2f4138c48e4b48d13d6de42a3f5c64ce1d 100644 GIT binary patch literal 1163 zcmZo=;$hC|)o3qa@?6fy|IcP|n{4gDZxT*VRHc6Hlu)wxKCR*1`i8_+YO#ytnOP3C zZ|L4N>xSgcPnIk}PNRF?&N+;E2PZ02pAgft*s#FaqW=C> z7MDgT?ox%-X0fc%Jjav@BF;Z5qhD;qrQ56wFn=MeoM+M`-t zRpPtD+tLj$G=g7>@^R@+*M4JYVCiY7vRkB}Doj=1x}{R)(o4pWwCQbyNgU@`ZMKIc zyYq1FTO%IvcX8k5O&_Ld@9a{3F{LipvcV>B@|jY@g*=C69p5%3@Po=kQIi)@D-7$? z>i*y3lAjsqdGz63S>B-ew>RFa5eQEG?O%WFgz&HZ$!q@zPV(LCb|h-Xi%Wc+TGL~L z7QN^wu5E7WVVpQq{3GLYrL8wNtn0PE)nhBN!^-}und4l^&TG@1ttCv19j0BK>Dl=$ zq58aPH{GhBQ3U~_Eu))VKqIIK_#GB(+Han*7$-(wmKrmlJa*|3~?fsMPm` z+Qo7CmG8N$!fbylo?38!$-#xkEVc5ESN7P|<-T8@WuRXaztFr!q4UYIsvL<~Iei(c2PoS2HGe*4p&-Zrf@vAelP9vZ~_Y gRfVf%3yNlSm7Empy{`TCTQ}>h{;&q4{Z}G*0Uh`%hyVZp literal 1099 zcmZo=;$hC|)o3qa@?6d+z_6f?zb$q7^Pdc>m{)(lbfmPsyg2q~!A_&quResaro|jn z67S#sQmB0GybZP160)w^7wXz=eok5ZKH~Tkp{do+Ur+VW+ot`YH901m+1o6s$~ZY; z?RoFAZ=FXiD~|Gix)S4l&7)RWJZ74pU~}xQbfz|@>9HH+<)2+kuH*d_c6r~mU7y|e z#=LZU(0ZZy>8rUHgc_L24^Eh9sh4AKw(y?m*59oEPTPK0*pgNs*}nS8(9-g4!FuIiMG7pkW1h9SM6-m-V8HQuq{pZ~CF^t9fztCsV!0#SxQi=KJPt zjSJYSn=3Z0ZQ|@2v8gw<7fcsA*PO5K{8KJo+V1%Irs5@@0%0Xo)=x&Zz}h>W^zT;Zi}jUZ|W|+WIRw)lb)}CSVL^a z1I}waYrY9-rDvT^D%CxbbatnA^TyZilkz^yFuZ&(Lf~D}Eg`cVY_A#3ndhYU6tHxk zxVI_AGVJzSu15WM&CadJH&y0z0XKz-L+-y1h*6E;wvI1*oFitrpb65O_+}a)2 zwfkOltXqaF>}v90ot*#0KU>Saa$ZkAE3UWgx~azEnv=)o zY+bS~;&G1K(_IIy%`_``(i*xVh)NMRu-vRBi6NT&(snn}dk+%+-19 zta{x2ffHVs Date: Wed, 16 Oct 2013 06:57:15 +0200 Subject: [PATCH 15/16] add c-p.org/bugs --- dwb/forms | Bin 1163 -> 1239 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/dwb/forms b/dwb/forms index e3a41e2f4138c48e4b48d13d6de42a3f5c64ce1d..c812bcb07c618471cb58cfeb79b34b007ec0e8cd 100644 GIT binary patch literal 1239 zcmZo=;$hC|)o3qa@?6fy|4*-Bx5X?D9Y>|zd{v^0E8l1;bSunCy!k3VOPll4wf?A* z!uJ2q`4fLey?@BdP{|~C*HQT0;fVqE&u`UpaSA(_RX)0;vtm(WzoXFQwC>Ztn^h`S zv@d?r^1G${_OfrB+M)Zs6h0sQQnJQ3W5*i%%Ta4tQ)XJ(yt}LMLg^%L$m3It9QPR) zS{z#U@_z{P>F?%`n-@*mb?dpTL*KohmrZ78?0Hjv(%@UiGnebXG{4CPrB2Up5q-S% ze!79of~<#~D}ulBi%#ggQ712uFVK~6TfnEJ|N6J+|8*6+;>~2*3z#OoI6RS?uVK5} z+lgMj-{#MlY@}2%Yfn&@#nMTuR#==ciY+O5ZRp~4vYX3&dUwo8@o!?eqMN+k7q+#ZJkX>~y-&sQ=%J*pmYL&m6vgSYpPNMA@9BJ6In! zaA~{`Y5ecMYeDyB=^F{NU7qaWSn+*o8|ycn?`p?FU-4B}cZxms{dxaLZqh~t^(V{; zYh6qB32m8Z|2gp3Os}rQ9ippDyR2``|5xlZ*)yo2`i0S^t+SXH=I7M~LFbZptGN&C+?RfMa@3`lj2zXS#ini=la4AE zDEZX271;k;px-R#we00t3pJ^*xmT~9ihbrKl)9E>>og|CP*(+219#O+-=>tTjQ$Y) zuVjAAbI<8shcA9Vx8+ByyYPlJQ7U)(p6q*KD-^LWE#zQpopx}g+@>D>SE2XTmQMRR zFJWo-^5l;K=Wf;hk1un$a3!L2deBfFT>DGnDN%-Xnoc3iI=yNOfKZr1pB&nve%>6P5e;cJmpn3>-uGQC|?Bj(iv z;rqS`O>4~;e*PI&r~R>RC+A6xEj-bs)vF?zzPD&|bJf4;JsK2r_?4;ahrrAQhztyd7i%}wkvDKw~cGn&L{gdKYlNK ztxYfS<@^IIC8;m}hA1ssySYkU$k^iSUN%nK=2^f07*>m%Ub>d$n@e*>MwG?W7gjRf z8586se_2kB-2QEqtaX6Mo-5jmAD*mfR%kyPr#k(ghGgKwb6MxIKK2DSAKolyAIB%T zKbTWjV%uVw_!VJg!k_f|`Se@;kNsiRebiI-q~!HWp`DqDuQu3h=K1a6w?}1i|JwEb zC%(3^G0a?jy|r{gX~@NkOxq7#)_id};v3V~xf?@RmFBg6IXyw(!A`By9tw6Fek!Y% L#r-@u`OgXfozG}Z literal 1163 zcmZo=;$hC|)o3qa@?6fy|IcP|n{4gDZxT*VRHc6Hlu)wxKCR*1`i8_+YO#ytnOP3C zZ|L4N>xSgcPnIk}PNRF?&N+;E2PZ02pAgft*s#FaqW=C> z7MDgT?ox%-X0fc%Jjav@BF;Z5qhD;qrQ56wFn=MeoM+M`-t zRpPtD+tLj$G=g7>@^R@+*M4JYVCiY7vRkB}Doj=1x}{R)(o4pWwCQbyNgU@`ZMKIc zyYq1FTO%IvcX8k5O&_Ld@9a{3F{LipvcV>B@|jY@g*=C69p5%3@Po=kQIi)@D-7$? z>i*y3lAjsqdGz63S>B-ew>RFa5eQEG?O%WFgz&HZ$!q@zPV(LCb|h-Xi%Wc+TGL~L z7QN^wu5E7WVVpQq{3GLYrL8wNtn0PE)nhBN!^-}und4l^&TG@1ttCv19j0BK>Dl=$ zq58aPH{GhBQ3U~_Eu))VKqIIK_#GB(+Han*7$-(wmKrmlJa*|3~?fsMPm` z+Qo7CmG8N$!fbylo?38!$-#xkEVc5ESN7P|<-T8@WuRXaztFr!q4UYIsvL<~Iei(c2PoS2HGe*4p&-Zrf@vAelP9vZ~_Y gRfVf%3yNlSm7Empy{`TCTQ}>h{;&q4{Z}G*0Uh`%hyVZp -- 2.49.0 From ced2503ba7d51b1e898512c9bfa37d6d1cbb2ba5 Mon Sep 17 00:00:00 2001 From: Samir Benmendil Date: Wed, 16 Oct 2013 08:37:56 +0200 Subject: [PATCH 16/16] use level folds looks a bit cleaner to me --- vimrc | 50 ++++++++++++++++++-------------------------------- 1 file changed, 18 insertions(+), 32 deletions(-) diff --git a/vimrc b/vimrc index 5ed5e5b..55906d8 100644 --- a/vimrc +++ b/vimrc @@ -14,15 +14,14 @@ set nocompatible " pathogen.vim runtime path manipulation silent! call pathogen#infect() -" search {{{ +" search {{{1 set incsearch set ignorecase set smartcase set hlsearch nmap q :nohl -" }}} -" NERDTree {{{ +" NERDTree {{{1 " open/close NERDTree with \e nmap e :NERDTreeToggle " to open files/dirs @@ -31,37 +30,32 @@ let NERDTreeMapActivateNode='' autocmd vimenter * if !argc() | NERDTree | endif " close vim if only NERDTree is open autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTreeType") && b:NERDTreeType == "primary") | q | endif -" }}} -" airline {{{ +" airline {{{1 let g:airline#extensions#tabline#enabled = 1 -" }}} -" tabbing {{{ +" tabbing {{{1 :nmap b :set expandtab tabstop=4 shiftwidth=4 softtabstop=4 :nmap B :set expandtab tabstop=8 shiftwidth=8 softtabstop=4 :nmap M :set noexpandtab tabstop=8 softtabstop=4 shiftwidth=4 :nmap m :set expandtab tabstop=2 shiftwidth=2 softtabstop=2 -" }}} -" backup {{{ +" backup {{{1 if has("vms") set nobackup " do not keep a backup file, use versions instead else set backup " keep a backup file set backupdir=$HOME/.vim/backupdir endif -" }}} -" appearance {{{ +" appearance {{{1 set background=dark " Dark background, d'uh! set number " show some linenumbers set showmatch " Show matching brackets. set showbreak=▒▒ " show these chars for wrapped lines set list listchars=tab:»·,trail:· " show these chars for tabs and trailing spaces -" }}} -" misc options {{{ +" misc options {{{1 set history=500 " keep 500 lines of command line history set ruler " show the cursor position all the time set confirm " Ask what to do when closing unsaved documents @@ -73,15 +67,13 @@ set scrolloff=5 " keep at least n lines above/below set backspace=indent,eol,start " allow backspacing over everything in insert mode set viminfo='100,<50,s10,h,n~/.vim/viminfo " viminfo defaults but save file in .vim -" }}} -" tabs {{{ +" tabs {{{1 set softtabstop=4 set shiftwidth=4 set expandtab -" }}} -" misc bindings {{{ +" misc bindings {{{1 " Don't use Ex mode, use Q for formatting map Q gq @@ -91,16 +83,14 @@ inoremap u " Press `` to toggle insert and replace mode (no key on Mac keyboard) imap `` -" }}} -" paste toggle {{{ +" paste toggle {{{1 nmap :set paste! paste? imap :set paste! vmap :set paste!gv set pastetoggle= -" }}} -" mouse {{{ +" mouse {{{1 " In many terminal emulators the mouse works just fine, thus enable it. if has('mouse') "xterm mouse with middleclick paste @@ -111,17 +101,15 @@ if has('mouse') set ttymouse=xterm "set ttymouse=xterm2 endif -" }}} -" syntax {{{ +" syntax {{{1 " Switch syntax highlighting on, when the terminal has colors " Also switch on highlighting the last used search pattern. if &t_Co > 2 || has("gui_running") syntax on endif -" }}} -" autocmd {{{ +" autocmd {{{1 " Only do this part when compiled with support for autocommands. if has("autocmd") " Enable file type detection. @@ -152,9 +140,9 @@ if has("autocmd") augroup END else set autoindent " always set autoindenting on -endif " has("autocmd") }}} +endif " has("autocmd") -" DiffOrig {{{ +" DiffOrig {{{1 " Convenient command to see the difference between the current buffer and the " file it was loaded from, thus the changes you made. " Only define it when not defined already. @@ -162,9 +150,8 @@ if !exists(":DiffOrig") command DiffOrig vert new | set bt=nofile | r # | 0d_ | diffthis \ | wincmd p | diffthis endif -" }}} -" fold {{{ +" fold {{{1 set foldmethod=marker set foldlevelstart=99 " space will toggle current fold in normal mode, if not in a fold, normal @@ -174,9 +161,8 @@ vnoremap zf " save and restore folds autocmd BufWinLeave *.* mkview autocmd BufWinEnter *.* silent loadview -" }}} -function! NextIndent(exclusive, fwd, lowerlevel, skipblanks) " {{{ +function! NextIndent(exclusive, fwd, lowerlevel, skipblanks) " {{{1 " Jump to the next or previous line that has the same level or a lower " level of indentation than the current line. " @@ -222,4 +208,4 @@ onoremap [l :call NextIndent(0, 0, 0, 1) onoremap ]l :call NextIndent(0, 1, 0, 1) onoremap [L :call NextIndent(1, 0, 1, 1) onoremap ]L :call NextIndent(1, 1, 1, 1) -" end of jump indent }}} +" end of jump indent -- 2.49.0