commit af02904dc4f5f687ef21f9ae4dc84e61e58b53d7
parent 3fa55050c9d7db36e484fcb80dd45ebe09221fa3
Author: Antoine Amarilli <a3nm@a3nm.net>
Date: Tue, 25 Mar 2014 09:13:09 +0100
Merge mu.a3nm.net:config
Diffstat:
22 files changed, 96 insertions(+), 19 deletions(-)
diff --git a/Xdefaults b/Xdefaults
@@ -14,8 +14,10 @@ URxvt.cursorColor2: #FFFFFF
URxvt.jumpScroll: true
urxvt*font: -*-Terminus*-*-*-*-*-*-*-*-*-*-*-*
urxvt*boldFont: -*-Terminus-*-*-*-*-*-*-*-*-*-*-*-*
-urxvt*perl-lib: /usr/lib/urxvt/perl/
+#urxvt*perl-lib: config/urxvt/perl
+urxvt*perl-lib: /usr/lib/urxvt/perl
URxvt.perl-ext: default,matcher,url-picker,keyboard-select,url-select,urxvt-pipe,clipboard
+URxvt.perl-ext-common: default,url-picker
#urxvt*urlLauncher: sensible-browser
urxvt*matcher.button: 1
URxvt*url-picker*order: descending
diff --git a/apt/desktop b/apt/desktop
@@ -106,3 +106,6 @@ xcalib
gnome-terminal
syslinux
mbr
+android-tools-adb
+android-tools-fastboot
+dvd+rw-tools
diff --git a/apt/dict b/apt/dict
@@ -0,0 +1,4 @@
+wamerican-insane
+wdiff
+wfrench
+stardict-xmlittre
diff --git a/apt/embedded b/apt/embedded
@@ -0,0 +1,2 @@
+emdebian-archive-keyring
+g++-4.7-arm-linux-gnueabi
diff --git a/apt/external b/apt/external
@@ -7,3 +7,4 @@ libgraph-modulardecomposition-perl
libboost-program-options-dev
pdfedit
logkeys
+dropbox
diff --git a/apt/laptop b/apt/laptop
@@ -1,2 +1,3 @@
powertop
acpi
+acpi-support-base
diff --git a/apt/latex b/apt/latex
@@ -17,3 +17,5 @@ hevea
biblatex
latexdiff
texlive-publishers
+biber
+cm-super
diff --git a/apt/minimal b/apt/minimal
@@ -34,3 +34,6 @@ gnupg
gnupg2
tsocks
gawk
+bc
+colordiff
+info
diff --git a/apt/misc b/apt/misc
@@ -90,8 +90,6 @@ doxygen
doxygen-latex
dpatch
dpkg-dev
-dtach
-dvd+rw-tools
dvtm
ed
eject
diff --git a/apt/notmuch-mutt b/apt/notmuch-mutt
@@ -0,0 +1,3 @@
+libterm-readline-gnu-perl
+libstring-shellquote-perl
+libmail-box-perl
diff --git a/apt/server b/apt/server
@@ -15,7 +15,6 @@ gcc
pbzip2
mtools
s3ql
-command-not-found
pigz
make
emacs
@@ -27,3 +26,10 @@ sqlite3
sshfs
fetchmail
cmake
+at
+atop
+apt-rdepends
+apt-listchanges
+apt-show-versions
+apt-utils
+iptables
diff --git a/apt/toadd b/apt/toadd
@@ -0,0 +1,2 @@
+parallel
+python-xkit
diff --git a/apt/webserver b/apt/webserver
@@ -0,0 +1 @@
+apache2
diff --git a/elinks b/elinks
@@ -0,0 +1 @@
+set document.colors.use_document_colors=1
diff --git a/gitconfig b/gitconfig
@@ -21,3 +21,5 @@
# http://gitimmersion.com/lab_11.html
hist = log --pretty=format:\"%h %ad | %s%d [%an]\" --graph --date=short
ldiff = !rcs-latexdiff
+[push]
+ default = simple
diff --git a/i3/config b/i3/config
@@ -32,9 +32,9 @@ bindsym $mod+i exec "urxvtcd -e irssi"
bindsym $mod+Shift+c kill
# start dmenu (a program launcher)
-bindsym $mod+p exec "exe=`dmenu < ~/temp/path` && exec $exe"
-bindsym $mod+shift+p exec "exe=`dmenu < ~/temp/path` && exec urxvtcd -e $exe"
-bindsym $mod+Shift+w exec "wen=`dmenu < /dev/null` && exec ~/scripts/aliases/wwen $wen"
+bindsym $mod+e exec "exe=`dmenu < ~/temp/path` && exec $exe"
+bindsym $mod+shift+e exec "exe=`dmenu < ~/temp/path` && exec urxvtcd -e $exe"
+bindsym $mod+Shift+w exec "wen=`dmenu < /dev/null` && exec ~/bin/wwen $wen"
# change focus
bindsym $mod+h focus left
@@ -74,6 +74,8 @@ bindsym $mod+Tab exec todo
bindsym $mod+u focus parent
bindsym $mod+a workspace back_and_forth
+# assuming that there are at most two outputs
+bindsym $mod+Shift+a move workspace to output right
# focus the child container
#bindcode $mod+d fo****cus child
@@ -102,6 +104,12 @@ bindsym $mod+Shift+asterisk move container to workspace 8
bindsym $mod+Shift+parenleft move container to workspace 9
bindsym $mod+Shift+parenright move container to workspace 10
+bindsym $mod+p workspace prev
+bindsym $mod+n workspace next
+bindsym $mod+Shift+p move window to workspace prev; workspace prev
+bindsym $mod+Shift+n move window to workspace next; workspace next
+
+
# reload the configuration file
bindsym $mod+Shift+D reload
# restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
@@ -128,6 +136,7 @@ mode "resize" {
# back to normal: Enter or Escape
bindsym Return mode "default"
bindsym Escape mode "default"
+ bindsym $mod+r mode "default"
}
bindsym $mod+r mode "resize"
diff --git a/install.sh b/install.sh
@@ -4,9 +4,11 @@ mkdir -p ~/logs
mkdir -p ~/temp/{vim,mutt}
mkdir -p ~/temp/vim/{temp,backup}
mkdir -p ~/apps
+mkdir -p ~/.elinks
mkdir -p ~/Mail_inbox
mkdir -p ~/.gnupg
-ls ~/config/ | grep -vE "(README|TODO)" | while read l; do ln -s ~/config/$l ~/.$l; done
+ls ~/config/ | grep -vE "(README|TODO|elinks)" | while read l; do ln -s ~/config/$l ~/.$l; done
+ln -s ~/config/elinks ~/.elinks/elinks.conf
ln -s ~/.mutt/muttrc ~/.muttrc
ln -s ~/.vim/vimrc ~/.vimrc
ln -s ~/.zsh/zshrc ~/.zshrc
diff --git a/mailcap b/mailcap
@@ -2,5 +2,8 @@ application/pdf; /usr/bin/evince '%s'; test=test "$DISPLAY" != ""; description=P
application/x-pdf; /usr/bin/evince '%s'; test=test "$DISPLAY" != ""; description=Portable Document Format; nametemplate=%s.pdf
image/gif; /usr/bin/mplayer '%s'
text/html; ~/bin/mutt_bgrun firefox %s; nametemplate=%s.html
+# text/html; w3m -dump %s; nametemplate=%s.html; copiousoutput
+text/html; iconv -f %{charset} %s | elinks -dump %{charset} -dump -dump-color-mode 1 -no-references /dev/stdin 2>/dev/null | sed 's/ *$//' | sed 's/ //'; copiousoutput
# text/html; links %s; nametemplate=%s.html
# text/html; w3m -dump %s; nametemplate=%s.html; copiousoutput
+
diff --git a/mutt/muttrc b/mutt/muttrc
@@ -2,21 +2,17 @@
set folder=~/Mail_inbox
set spoolfile="~/Mail_inbox/inbox"
-set postponed="=inbox"
set record=~/Mail_alot/sent
# don't save draft mail in a place that might get cleaned up unexpectedly
set tmpdir="~/temp/mutt/"
# speeds things up sometimes
set header_cache=~/.cache/mutt_header_cache
# aliases
-set alias_file=~/config/mutt/aliases
-source ~/config/mutt/aliases
set reverse_alias
set query_command="lbdbq '%s'"
-set sendmail="~/bin/msmtpQ -a default --read-envelope-from"
# == Editor ==
-set editor="vim -c 'set tw=72' +/^$ ++1"
+set editor="vim -c 'silent% s:\\%x1B\\[.\\{-}m::ge' -c 'set tw=72' +1 +/^$/"
# == Personal stuff ==
source "~/.mutt/perso"
@@ -71,7 +67,7 @@ set delete
# == GPG ==
set pgp_autosign
set pgp_replyencrypt
-set pgp_use_gpg_agent
+# set pgp_use_gpg_agent
message-hook '!(~g|~G) ~b"^-----BEGIN\ PGP\ (SIGNED\ )?MESSAGE"' "exec check-traditional-pgp"
# == Colors ==
@@ -182,7 +178,9 @@ macro index z \
<enter-command>set pipe_decode=\$my_old_pipe_decode wait_key=\$my_old_wait_key<enter>" \
"notmuch: reconstruct thread"
-# recall selected mail
+# == Postponed mail ==
+
+set postponed="=inbox"
macro index,pager R \
"<enter-command>set my_old_resolve=\$resolve noresolve<enter>\
d<resend-message>\
@@ -190,10 +188,27 @@ d<resend-message>\
"recall"
set noabort_unmodified # because of this use of 'R'
+# TODO: try instead to use real 'R' after having saved to a specific folder
+# along the lines of:
+#macro index,pager R \
+# "<enter-command>set postponed='=draft_written'<enter>\
+# s=draft_written<enter>\
+# <recall-message>\
+# c=draft_written<enter>\
+# t~a<enter>;s=inbox<enter>\
+# I\
+# <enter-command>set postponed='=inbox'<enter>" \
+# "recall"
+
+
+
# keep old mail around to complete threads
set maildir_trash
-color index black black ~D # deleted
+color index brightblack black ~D # deleted
color index black red !~(!~D) # deleted THREADS
macro index B "l~(! ~D)<enter>"
+folder-hook . push 'B=*'
+
+auto_view text/html
diff --git a/screenrc_light b/screenrc_light
@@ -0,0 +1,17 @@
+defscrollback 8000
+hardstatus alwayslastline
+
+#hardstatus string '%{= kG}%-Lw%{= kW}%50> %n%f* %t%{= kG}%+Lw%< %{= kG}%-=%c:%s%{-}'
+#hardstatus string '%{= mK}%-Lw%{= KW}%50>%n%f* %t%{= mK}%+Lw%< %{= kG}%-=%D %d %M %Y %c:%s%{-}'
+#hardstatus string '%{= kG}[ %{G}%H %{g}][%= %{= kw}%?%-Lw%?%{r}(%{W}%n*%f%t%?(%u)%?%{r})%{w}%?%+Lw%?%?%= %{g}][%{B} %d/%m %{W}%c %{g}]'
+
+hardstatus string '%{= kG}%-Lw%{= kW}%50> %n%f* %t%{= kG}%+Lw%< %{= kG}%-=%d/%m %c:%s%{-}'
+# hardstatus string '%{= kG}%-Lw%{= kW}%50> %n%f* %t%{= kG}%+Lw%< %{= kG}%-=%99`%d/%m %c:%s%{-}'
+
+startup_message off
+nethack on
+
+# backtick 99 2 2 uptime
+
+
+
diff --git a/vim/vimrc b/vim/vimrc
@@ -25,8 +25,8 @@ filetype on
filetype plugin on
filetype indent on
-autocmd FileType html,htmldjango,jinjahtml,eruby,mako let b:closetag_html_style=1
-autocmd FileType html,xhtml,xml,htmldjango,jinjahtml,eruby,mako source ~/.vim/bundle/closetag/plugin/closetag.vim
+" autocmd FileType html,htmldjango,jinjahtml,eruby,mako let b:closetag_html_style=1
+" autocmd FileType html,xhtml,xml,htmldjango,jinjahtml,eruby,mako source ~/.vim/bundle/closetag/plugin/closetag.vim
set ofu=syntaxcomplete#Complete
let g:SuperTabDefaultCompletionType = "context"
diff --git a/zsh/path b/zsh/path
@@ -1,6 +1,6 @@
#!/bin/bash
-PATH=$PATH:~/scripts/:~/local/bin/:~/scripts/aliases:/sbin:/usr/sbin
+PATH=$PATH:~/scripts/:~/bin:~/local/bin/:~/scripts/aliases:/sbin:/usr/sbin
export PATH
LD_LIBRARY_PATH=$LD_LIBRARY_PATH:~/local/lib
export LD_LIBRARY_PATH
