commit 3107fa0ae01c08ed01f1a14fdf6dbb9fd670d86c
parent f35d4048dce6e9ab4365d11518167e9258370fcf
Author: Antoine Amarilli <a3nm@a3nm.net>
Date: Fri, 6 Jan 2017 14:06:40 +0100
Merge branch 'master' of a3nm.net:git/myconfig
Diffstat:
10 files changed, 42 insertions(+), 16 deletions(-)
diff --git a/apt/headless b/apt/headless
@@ -40,3 +40,4 @@ geographiclib-tools # bigworld
gnutls-bin # for ssl debugging
dovecot-sieve # to edit my filters
pelican # blog
+convmv # rename files with broken names
diff --git a/apt/provsql b/apt/provsql
@@ -1,4 +1,4 @@
-postgresql-9.5
-postgresql-client-9.5
-postgresql-contrib-9.5
+postgresql
+postgresql-client
+postgresql-contrib
postgresql-server-dev-all
diff --git a/apt/server b/apt/server
@@ -28,7 +28,6 @@ xmlstarlet
apt-file
reportbug
dnsutils
-lbdb
iputils-ping
ethtool
liburi-perl # for ~/bin/mail_summary
@@ -72,3 +71,6 @@ manpages
tig
myrepos # update multiple repositories
git-svn
+
+lbdb
+elinks # to view HTML in mutt
diff --git a/gitconfig b/gitconfig
@@ -25,8 +25,14 @@
[push]
default = current
[credential]
- helper = store
+ helper = store
[core]
- excludesfile = /home/a3nm/config/gitignore
+ excludesfile = /home/a3nm/config/gitignore
[diff]
- compactionHeuristic = true
+ compactionHeuristic = true
+[merge "logs"]
+ name = log merger
+ driver = ~/bin/git-merge-log %O %A %B %L
+[merge "set"]
+ name = set merger
+ driver = ~/bin/git-merge-set %O %A %B %L
diff --git a/i3/config b/i3/config
@@ -24,13 +24,18 @@ floating_modifier $mod
focus_follows_mouse yes
-# start a terminal
-bindsym $mod+Return exec "urxvtcd -e ~/bin/urxvt_startup"
+bindsym $mod+shift+Return exec "urxvtcd"
+bindsym $mod+Return exec "urxvtpwd urxvtcd"
bindsym $mod+b exec "firefox"
bindsym $mod+o exec "urxvtcd -e ~/bin/my-mutt"
bindsym $mod+i exec "urxvtcd -e ~/bin_private/weechat"
bindsym $mod+Shift+s exec ~/bin/xpass
bindsym $mod+Shift+f exec ~/bin/xpapers
+bindsym $mod+y [urgent=latest] focus
+
+bindsym $mod+Shift+a move container to workspace back_and_forth; workspace back_and_forth
+
+workspace_auto_back_and_forth yes
# kill focused window
bindsym $mod+Shift+c kill
@@ -80,7 +85,7 @@ 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
+# bindsym $mod+Shift+a move workspace to output right
# focus the child container
#bindcode $mod+d fo****cus child
@@ -111,8 +116,8 @@ 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
+bindsym $mod+Shift+p move container to output left
+bindsym $mod+Shift+n move container to output right
# reload the configuration file
diff --git a/install.sh b/install.sh
@@ -30,6 +30,7 @@ ln -s ~/apps/fasd/fasd ~/bin
cd ~/config
mkdir -p ~/.elinks
mkdir -p ~/Mail_inbox
+mkdir -p ~/Mail_inbox/draft_tmp/{cur,new,tmp}
mkdir -p ~/.i3
ls ~/config/ | grep -vE "(README|TODO|elinks|mutt|vim|zsh|subversion)" | while read l; do ln -s ~/config/$l ~/.$l; done
mkdir -p ~/.mutt
diff --git a/mutt/muttrc b/mutt/muttrc
@@ -20,6 +20,7 @@ set editor="vim -c ':so ~/config/vim/vimrc_mail' +1 +/^$/"
set pgp_autosign
set pgp_replyencrypt
set pgp_use_gpg_agent
+set crypt_use_gpgme=no
set crypt_opportunistic_encrypt
message-hook '!(~g|~G) ~b"^-----BEGIN\ PGP\ (SIGNED\ )?MESSAGE"' "exec check-traditional-pgp"
@@ -54,9 +55,12 @@ set mail_check=5
set sort=threads
set sort_aux="last-date"
set strict_threads
+set nocollapse_unread
+bind index - collapse-thread
+bind index _ collapse-all
# formats
-set index_format="%{%d/%m %H:%M}%Z %-15.15L %?M?<#%03M>&?%s"
+set index_format="%{%d/%m %H:%M}%Z %-15.15L %?M?<#%03M>&? %s"
set pager_format="%4c -%Z- %C/%m: %-20.20n %s"
set status_format="%r%f %?l?%l? %?M?%M/?%m:%?n? N%n?%?o? O%o?%?d? D%d?%?F? !%F?%?t? *%t?%> %h (%s/%S%?V?-%V?) (%P)"
diff --git a/zsh/alias b/zsh/alias
@@ -55,6 +55,7 @@ alias sw="sr -browser=w3m"
alias wen="sw wikipedia"
alias dico="cat /usr/share/dict/french"
alias pingoo="ping google.com"
+alias ncdu="ncdu --confirm-quit"
# work around https://bugs.launchpad.net/ubuntu/+source/openssh/+bug/1342412
alias ssh-copy-id='ssh-copy-id -o "ControlPath=/nowhere" -o "ControlMaster=no"'
diff --git a/zsh/path b/zsh/path
@@ -1,6 +1,6 @@
#!/bin/bash
-PATH=~/bin_private:~/scripts/:~/bin:~/local/bin/:~/scripts/aliases:$PATH:/sbin:/usr/sbin
+PATH=~/bin_private:~/scripts/:~/bin:~/local/bin/:~/scripts/aliases:$PATH:/sbin:/usr/sbin:~/.subuser/bin
export PATH
LD_LIBRARY_PATH=~/local/lib:$LD_LIBRARY_PATH
export LD_LIBRARY_PATH
diff --git a/zsh/zshrc b/zsh/zshrc
@@ -2,6 +2,9 @@
. ~/.zsh/alias
. ~/.zsh/fontsize
+SHORTHOST=$(hostname | cut -d'.' -f1)
+export $SHORTHOST
+
zstyle ':completion:*' completer _expand _complete _ignored _match _correct _approximate _prefix
zstyle ':completion:*' max-errors 2
zstyle :compinstall filename '/home/a3_nm/.zshrc'
@@ -192,8 +195,8 @@ function precmd () {
local WD="$(pwd | sed "s/^\/home\/$USER/~/")"
if [ -n "$LASTCMD" ]
then
- echo -ne "\e]0;$LOCALNAME $HOST:$WD$ (was $LASTCMD $LASTDATE) `date +%T`\a"
- #echo -ne "\e]0;$LOCALNAME $HOST:$WD$ (was TODO $LASTDATE) `date +%T`\a"
+ echo -ne "\e]0;$LOCALNAME $SHORTHOST:$WD$ (was $LASTCMD $LASTDATE) `date +%T`\a"
+ #echo -ne "\e]0;$LOCALNAME $SHORTHOST:$WD$ (was TODO $LASTDATE) `date +%T`\a"
else
echo -ne "\e]0;urxvtc ready\a"
fi
@@ -217,6 +220,9 @@ manf () { man $1 | less -p "^ +$2"; }
mcd () { mkdir "$@" && cd ${@:$#} }
# move a file somewhere (with flags) and link it back here
mln () { mv "$@" && ln -s ${@:$#} }
+# move a file and own it
+# TODO: chown doesn't work, why?
+grab () { sudo mv "$1" "$2" && sudo chown a3nm:a3nm "$2" }
#TODO
bindkey '^Q' push-line
