Merge remote-tracking branch 'origin/master' into nas

15 files changed, 141 insertions, 24 deletions

diff --git a/.XCompose b/.XCompose
index 59594a7..476ebac 100644
--- a/.XCompose
+++ b/.XCompose
@@ -1,19 +1,11 @@
 # -*- mode: conf -*-
 
 include "/usr/share/X11/locale/en_US.UTF-8/Compose"
+include "/home/dakkar/src/dotXCompose/dotXCompose"
+include "/home/dakkar/src/dotXCompose/emoji.compose"
 
 # http://cyberborean.wordpress.com/2008/01/06/compose-key-magic/
 <Multi_key> <less> <minus> : "←"  U2190  # <-
-<Multi_key> <minus> <less> : "←"  U2190  # -<
-<Multi_key> <minus> <greater> : "→" U2192  # ->
-
-<Multi_key> <period> <space> : "…"  # ellipsis
-<Multi_key> <minus> <plus> : "∓" # minus-plus
-
-<Multi_key> <equal> <less> : "⇐"
-<Multi_key> <equal> <greater> : "⇒"
-
-<Multi_key> <p> <i> : "π"
 
 <Multi_key> <colon> <D> : "😀" U1F600  # :D GRINNING FACE
 <Multi_key> <semicolon> <D> : "😁" U1F601  # ;D GRINNING FACE WITH SMILING EYES
diff --git a/.Xdefaults b/.Xdefaults
index a92a8d1..618d11e 100644
--- a/.Xdefaults
+++ b/.Xdefaults
@@ -12,8 +12,8 @@ emacs*Foreground: Wheat
 emacs*pointerColor: White
 emacs*cursorColor: White
 emacs*bitmapIcon: on
-Emacs.FontBackend: x,xft
-emacs*font: inconsolata-9
+!Emacs.FontBackend: x,xft
+!emacs*font: inconsolata-9
 !emacs*font: -misc-fixed-medium-r-semicondensed-*-*-120-*-*-c-*-iso10646-1
 emacs.geometry: 80x25
 
diff --git a/.bash_completion b/.bash_completion
index 4bbfc04..0dd54ff 100644
--- a/.bash_completion
+++ b/.bash_completion
@@ -1,2 +1,9 @@
-_xfunc perl _perldoc
-complete -F _perldoc -o bashdefault pm
\ No newline at end of file
+# -*- mode: sh -*-
+
+bcdir="$HOME/.bash_completion.d"
+if [[ -d "$bcdir" && -r "$bcdir" && -x "$bcdir" ]]; then
+    for i in "$bcdir"/*.bashcomp; do
+        [[ -f $i && -r $i ]] && . "$i"
+    done
+fi
+
diff --git a/.bash_completion.d/dmount.bashcomp b/.bash_completion.d/dmount.bashcomp
new file mode 100644
index 0000000..7299a9b
--- /dev/null
+++ b/.bash_completion.d/dmount.bashcomp
@@ -0,0 +1,7 @@
+# -*- mode: sh -*-
+
+_dmount_list() {
+    COMPREPLY=( $( compgen -W '$(dmount --list)' -- "$2" ) )
+}
+
+complete -F _dmount_list dmount
diff --git a/.bash_completion.d/mupdf.bashcomp b/.bash_completion.d/mupdf.bashcomp
new file mode 100644
index 0000000..dd02b65
--- /dev/null
+++ b/.bash_completion.d/mupdf.bashcomp
@@ -0,0 +1,25 @@
+# mupdf(1) completion                                     -*- shell-script -*-
+
+_mupdf()
+{
+    local cur prev words cword split
+    _init_completion -s || return
+
+    case $prev in
+        --help*|-h|-p|-r|-W|-H|-S|-U|-x)
+            return
+            ;;
+    esac
+
+    $split && return
+
+    if [[ $cur == -* ]]; then
+        COMPREPLY=( $( compgen -W '$( _parse_help "$1" --help )' \
+            -- "$cur" ) )
+        [[ $COMPREPLY == *= ]] && compopt -o nospace
+        return
+    fi
+
+    _filedir '@(@(?(e)ps|?(E)PS|[pf]df|[PF]DF|dvi|DVI)?(.gz|.GZ|.bz2|.BZ2|.xz|.XZ)|cb[rz]|djv?(u)|gif|jp?(e)g|miff|tif?(f)|pn[gm]|p[bgp]m|bmp|xpm|ico|xwd|tga|pcx|epub)'
+} &&
+complete -F _mupdf mupdf
diff --git a/.bash_completion.d/pd.bashcomp b/.bash_completion.d/pd.bashcomp
new file mode 100644
index 0000000..4eb8044
--- /dev/null
+++ b/.bash_completion.d/pd.bashcomp
@@ -0,0 +1,2 @@
+_xfunc perl _perldoc
+complete -F _perldoc -o bashdefault pm pd
diff --git a/.bash_completion.d/website.bashcomp b/.bash_completion.d/website.bashcomp
new file mode 120000
index 0000000..cd8d05a
--- /dev/null
+++ b/.bash_completion.d/website.bashcomp
@@ -0,0 +1 @@
+/home/dakkar/website/thenautilus/website.bashcomp
\ No newline at end of file
diff --git a/.bash_profile b/.bash_profile
index f7c29eb..c146385 100644
--- a/.bash_profile
+++ b/.bash_profile
@@ -6,15 +6,51 @@ EDITOR=vi
 export EDITOR
 
 source ~/perl5/perlbrew/etc/bashrc
-export PATH="${HOME}/bin:${PATH}"
+export PATH="${HOME}/bin:${HOME}/.raku/bin:${PATH}"
+export GPG_TTY="$(tty)"
+
+eval "$(keychain --eval --inherit any-once --agents ssh id_rsa id_ed25519)"
+
+function e() {
+    emacsclient -n "$@"
+}
+
+function se() {
+    emacsclient -n "${@/#//sudo::}"
+}
+
+function pd() {
+    if [[ $1 == -b ]]; then
+        firefox "https://metacpan.org/pod/$2"
+    else
+        if type cpandoc &>/dev/null; then
+            cpandoc "$@"
+        else
+            perldoc "$@"
+        fi
+    fi
+}
 
 function pm() {
     local fn
     local ex
-    fn="$(perldoc -l "$1")"
+    fn="$(pd -lm "$1")"
     ex=$?
     if [[ $ex != 0 ]]; then
         return $ex
     fi
     emacsclient -c -n "$fn"
 }
+
+function killmerged() {
+    for b in $(git branch --merged HEAD --no-contains HEAD|grep -vE 'stage|master|svn|develop|uat'); do
+        b="${b##+( )}"
+        b="${b%%+( )}"
+        git branch -d $b && git push origin :$b
+    done
+}
+
+export PERLDOC='-MPod::Text::Color::Delight'
+
+fortune
+
diff --git a/.config/Yubico/u2f_keys b/.config/Yubico/u2f_keys
new file mode 100644
index 0000000..291a090
--- /dev/null
+++ b/.config/Yubico/u2f_keys
@@ -0,0 +1 @@
+dakkar:TSjB7MrP1bnTzw3B2_iutHC-htsWaTk-GdHCjw9nZOE9fDoi6JiP-9Ysig3oYwal8B7ZhXPR-pY5apAJKxaRxw,04ebd3766782950a327c70b35e02d227faea091bee86d07616985797f9122beb87183c2ebd7a5c739133b334772669672f12ec2c978857bdeaf889b25eb3c0f40e
\ No newline at end of file
diff --git a/.config/redshift/redshift.conf b/.config/redshift/redshift.conf
new file mode 100644
index 0000000..c10009c
--- /dev/null
+++ b/.config/redshift/redshift.conf
@@ -0,0 +1,15 @@
+[redshift]
+temp-day=5700
+temp-night=3500
+
+fade=1
+
+location-provider=manual
+adjustment-method=randr
+
+[manual]
+lat=51
+lon=0
+
+[randr]
+screen=0
diff --git a/.gitconfig b/.gitconfig
index 7d88cc2..478387c 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -14,19 +14,36 @@
         showbranch = true
         status = true
 
+[color.diff]
+        oldMoved = normal red
+        oldMovedDimmed = normal red dim
+        oldMovedAlternative = normal red italic
+        oldMovedAlternativeDimmed = normal red italic dim
+        newMoved = normal green
+        newMovedDimmed = normal green dim
+        newMovedAlternative = normal green italic
+        newMovedAlternativeDimmed = normal green italic dim
+
+[fetch]
+	prune = true
+[fetch.fsck]
+        zeroPaddedFilemode = warn
 [push]
 	default = tracking
 [pull]
-        rebase = true
+        rebase = merges
 [diff]
         mnemonicprefix = true
         renames = copies
+        colorMoved = zebra
 [log]
         decorate = short
         date = iso
 [rebase]
         stat = true
         autosquash = true
+[transfer]
+        fsckobjects = true
 [grep]
         patternType = perl
 [alias]
@@ -37,3 +54,4 @@
         refl = log -g --oneline 'HEAD@{now}' --date=relative
         st = status -bs
         tracked = ls-tree -r --name-only --full-name HEAD
+        stashed = stash list --pretty=format:'%gd: %Cred%h%Creset %Cgreen[%ar]%Creset %gs'
diff --git a/.gtkrc-2.0 b/.gtkrc-2.0
index af91f3e..c723854 100644
--- a/.gtkrc-2.0
+++ b/.gtkrc-2.0
@@ -17,4 +17,5 @@ gtk-xft-hinting=1
 gtk-xft-hintstyle="hintfull"
 gtk-xft-rgba="rgb"
 gtk-color-scheme="tooltip_fg_color:#FFFFFF\nbase_color:#FFFFFF\nselected_fg_color:#FFFFFF\ntext_color:#313739\nbg_color:#EDEDED\ninsensitive_bg_color:#F4F4F2\ntooltip_bg_color:#343434\nselected_bg_color:#4A90D9\nfg_color:#2E3436\n"
+gtk-key-theme-name="Emacs"
 include "/home/dakkar/.gtkrc-2.0.mine"
diff --git a/.inputrc b/.inputrc
index 1c592ed..0205ecf 100644
--- a/.inputrc
+++ b/.inputrc
@@ -1,5 +1,8 @@
 set show-all-if-ambiguous on
 set visible-stats on
+set colored-stats on
+set colored-completion-prefix on
+
 "\e[A": history-search-backward
 "\e[B": history-search-forward
 "\es": menu-complete
diff --git a/.ledgerrc b/.ledgerrc
index 1b02f85..5fba08a 100644
--- a/.ledgerrc
+++ b/.ledgerrc
@@ -1,4 +1,4 @@
 --file /home/dakkar/SHARE/dakkar-ledger
---cache /home/dakkar/.ledger-cache
+#--cache /home/dakkar/.ledger-cache
 --date-format %Y-%m-%d
---equity-format \n%D %Y%C%P\n%/    %-34A  %12t\n
+#--equity-format \n%D %Y%C%P\n%/    %-34A  %12t\n
diff --git a/.xinitrc b/.xinitrc
index 497cacc..a991457 100755
--- a/.xinitrc
+++ b/.xinitrc
@@ -1,18 +1,27 @@
 #!/bin/sh
+
+if [[ -z "$DBUS_SESSION_BUS_ADDRESS" ]]; then
+    eval $(dbus-launch --exit-with-x11 --sh-syntax)
+fi
+
 cd
 export LC_ALL=en_US.UTF-8
-sudo ./src/hal-automounter/hal-automounter.pl > automount.log 2>&1 &
-xgamma -gamma 1
+xset s off
+#sudo ./src/hal-automounter/hal-automounter.pl > automount.log 2>&1 &
+( . ~/.perlbrew/init && xscreensaver-dbus > xscreensaver-dbus.log 2>&1 & )
+gamma 1
 xsetroot -solid black
 #export XMODIFIERS=@im=uim
 export GTK_IM_MODULE="xim"
 xrdb -load .Xdefaults
-xset dpms 1800 3600 3600
+#xset dpms 1800 3600 3600
 #uim-xim --engine=anthy &
+emacs --bg-daemon --font Monospace </dev/null &>emacs.log &
 gkrellm &
+(sleep 3;wpa_gui -t)&
 ~/bin/mwatch &
 xpad &
 start-pulseaudio-x11
+gtk-redshift &
 
-exec dbus-launch --exit-with-session fvwm-crystal
-
+exec fvwm-crystal