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

17 files changed, 272 insertions, 0 deletions

diff --git a/.XCompose b/.XCompose
new file mode 100644
index 0000000..476ebac
--- /dev/null
+++ b/.XCompose
@@ -0,0 +1,23 @@
+# -*- 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> <colon> <D> : "😀" U1F600  # :D GRINNING FACE
+<Multi_key> <semicolon> <D> : "😁" U1F601  # ;D GRINNING FACE WITH SMILING EYES
+<Multi_key> <semicolon> <parenright> : "😉" U1F609  # ;) WINKING FACE
+<Multi_key> <bar> <parenright> : "😏" U1F60F # |) SMIRKING FACE
+<Multi_key> <colon> <bar> : "😐" U1F610 # :| NEUTRAL FACE
+<Multi_key> <p> <bar> : "😒" U1F612 # p| UNAMUSED FACE
+<Multi_key> <colon> <slash> : "😕" U1F615 # :/ CONFUSED FACE
+<Multi_key> <colon> <tilde> : "😖" U1F616 # :~ CONFOUNDED FACE
+<Multi_key> <colon> <s> : "😖" U1F616 # :s CONFOUNDED FACE
+<Multi_key> <colon> <p> : "😛" U1F61B  # :p FACE WITH STUCK-OUT TONGUE
+<Multi_key> <semicolon> <p> : "😜" U1F61C  # ;p FACE WITH STUCK-OUT TONGUE AND WINKING EYE
+<Multi_key> <parenleft> <parenleft> : "😞" U1F61E # (( DISAPPOINTED FACE
+<Multi_key> <colon> <o> : "😮" U1F62E  # :o FACE WITH OPEN MOUTH
+<Multi_key> <8> <o> : "😲" U1F623 # 8o ASTONISHED FACE
diff --git a/.Xdefaults b/.Xdefaults
new file mode 100644
index 0000000..a92a8d1
--- /dev/null
+++ b/.Xdefaults
@@ -0,0 +1,135 @@
+! Parts (C) 1996 By Greg J. Badros <gjb@cs.duke.edu>
+! You may use this file as specified under the GNU General Public License
+
+Xcursor.theme: justblue
+
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+! emacs, xemacs
+
+!emacs*Background: rgb:45/63/86
+emacs*Background: rgb:20/20/20
+emacs*Foreground: Wheat
+emacs*pointerColor: White
+emacs*cursorColor: White
+emacs*bitmapIcon: on
+Emacs.FontBackend: x,xft
+emacs*font: inconsolata-9
+!emacs*font: -misc-fixed-medium-r-semicondensed-*-*-120-*-*-c-*-iso10646-1
+emacs.geometry: 80x25
+
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+! xterm (and friends)
+
+XTerm*highlightSelection: true
+!XTerm*boldFont: -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso10646-1
+!XTerm*font: -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso10646-1
+!XTerm*font: -*-fixed-medium-r-normal--13-*-75-*-*-*-iso10646-1
+!XTerm*wideFont: -*-fixed-medium-r-normal-ja-13-*-75-*-*-*-iso10646-1
+XTerm*foreground: white
+!XTerm*background: rgb:45/63/86
+XTerm*background: rgb:10/10/10
+! Uncomment this to use color for the bold attribute
+XTerm*VT100*colorBDMode: off
+! Uncomment this to use color for underline attribute
+XTerm.VT100*colorULMode: off
+XTerm.VT100*underLine: on
+! Uncomment this to display the scrollbar
+XTerm*scrollBar: true
+
+! This resource specifies whether or not to ignore the 'alternate screen'
+! of applications such as vi. When it is on, these applications will restore
+! the contents of the screen when they are exited to what they were before
+! they were started. When it is off, the contents of vi will remain on the
+! screen after the program is quit.
+XTerm.VT100.titeInhibit: true
+
+! Uncomment this to turn off color mode in your xterms
+XTerm.VT100*colorMode: on
+XTerm.VT100*dynamicColors: on
+
+! Number of lines of scrollback to save
+XTerm*saveLines: 15000
+
+XTerm*reverseWrap: true
+
+XTerm*visualBell: true
+XTerm*alwaysHighlight: false
+XTerm*scrollTtyOutput: false
+XTerm*scrollKey: True
+XTerm*scrollTtyKeypress: True
+XTerm*loginShell: True
+XTerm*metaSendsEscape: True
+Scrollbar.JumpCursor: True
+!XTerm*color12: sky blue
+!XTerm*color4: navy blue
+
+Rxvt.inheritPixmap: true
+Rxvt.background: black
+Rxvt.foreground: white
+Rxvt.scrollColor: #4287c8
+Rxvt.borderColor: #4287c8
+Rxvt.color12: sky blue
+!Rxvt.color4: navy blue
+Rxvt.visualBell: true
+Rxvt.scrollTtyOutput: false
+Rxvt.scrollWithBuffer: true
+Rxvt.scrollTtyKeypress: true
+Rxvt.saveLines: 15000
+Rxvt.loginShell: true
+Rxvt.cutchars: \ !@#$%^&*(){}[]''"",.<>/?=+-\\|`~;:
+URxvt.shading: 25
+URxvt.tintColor: white
+URxvt.fading: 20
+URxvt.font: xft:Monospace:pixelsize=16
+URxvt.scrollstyle: plain
+URxvt.perl-ext-common:
+URxvt.modifier: Meta
+URxvt.geometry: 80x37
+URxvt.perl-ext: default,mymatcher
+URxvt.url-launcher: firefox
+URxvt.mymatcher.scheme.1: mailto
+URxvt.mymatcher.launcher.1: claws-mail
+URxvt.mymatcher.button: M-C-1
+URxvt.keysym.M-C-Return: perl:mymatcher:last
+URxvt.keysym.M-C-Tab: perl:mymatcher:list
+
+QuakeConsoleNeedsUniqueName*internalBorder: 0
+QuakeConsoleNeedsUniqueName*scrollBar: false
+QuakeConsoleNeedsUniqueName*loginShell: false
+
+xeyes*cols: 4
+xeyes*rows: 4
+
+xdvi.expert: true
+xdvi.shrinkFactor: 7
+xdvi.gsAlpha: true
+
+NetHack.tile_file: x11tiles2
+NetHack*map*font: -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-1
+
+XClock*update: 1
+!XClock*background: rgb:45/63/86
+XClock*background: rgb:0/0/0
+XClock*padding: 0
+XClock*foreground: rgb:A0/A0/A0
+XClock*analog: False
+XClock*font: -misc-fixed-medium-r-normal--13-120-75-75-c-*-iso8859-1
+XClock*render: False
+
+! The most common options that must be here :
+!  -buffer 2		The buffering method (choose the quickiest)
+!			See "BUFFERING" file for more info
+!  -keyboard 4  	The default keyboard :	1:AZERTY 2:QWERTY|
+!						3:AZERTY- 4:QWERTY-
+!						5:SPATIAL
+!  -smooth		if your host/display are fast
+!  -clearline 0 	if moving lines drop dirty points on screen
+!  -keytable		The keyboard definition if none of the predefined.
+!  -draw 0      	If the transparent face are too slow to display
+! You can have the option list typing : "bl -h"
+
+xbl*args: -x 5 -y 5 -z 10 -level 0 -bloctype 2 -land 0 -draw 0 -clearline 0 \
+	-buttonheight -1 -buffer 2 -keyboard 0 -keytable "14789632',ao;q p0"
+
+xpdf.initialZoom: width
+
diff --git a/.ackrc b/.ackrc
new file mode 100644
index 0000000..2ee6fc0
--- /dev/null
+++ b/.ackrc
@@ -0,0 +1,2 @@
+--pager=less
+
diff --git a/.aspell.conf b/.aspell.conf
new file mode 100644
index 0000000..a29d9c5
--- /dev/null
+++ b/.aspell.conf
@@ -0,0 +1,4 @@
+add-dict-alias en en_GB-w_accents
+add-dict-alias english en_GB-w_accents
+
+lang en_GB-w_accents
diff --git a/.bash_completion b/.bash_completion
new file mode 100644
index 0000000..4eb8044
--- /dev/null
+++ b/.bash_completion
@@ -0,0 +1,2 @@
+_xfunc perl _perldoc
+complete -F _perldoc -o bashdefault pm pd
diff --git a/.bash_profile b/.bash_profile
index 94a6622..df59e57 100644
--- a/.bash_profile
+++ b/.bash_profile
@@ -3,3 +3,4 @@
 # This file is sourced by bash for login shells.  The following line
 # runs your .bashrc and is recommended by the bash info pages.
 [[ -f ~/.bashrc ]] && . ~/.bashrc
+
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/gtk-3.0/settings.ini b/.config/gtk-3.0/settings.ini
new file mode 100644
index 0000000..c7c47ac
--- /dev/null
+++ b/.config/gtk-3.0/settings.ini
@@ -0,0 +1,18 @@
+[Settings] 
+gtk-theme-name=Adwaita
+gtk-icon-theme-name=gnome
+gtk-font-name=Sans 6
+gtk-cursor-theme-name=justblue
+gtk-cursor-theme-size=0
+gtk-toolbar-style=GTK_TOOLBAR_BOTH
+gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
+gtk-button-images=1
+gtk-menu-images=1
+gtk-enable-event-sounds=1
+gtk-enable-input-feedback-sounds=1
+gtk-xft-antialias=1
+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
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 c354c79..f15daf3 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -14,6 +14,8 @@
         showbranch = true
         status = true
 
+[fetch]
+        prune = true
 [push]
 	default = tracking
 [pull]
@@ -26,8 +28,14 @@
         date = iso
 [rebase]
         stat = true
+        autosquash = true
+[transfer]
+        fsckobjects = true
+[grep]
+        patternType = perl
 [alias]
         cmp = diff -b --word-diff=color --word-diff-regex='[[:alnum:]_]+|[^[:space:]]'
+        cmpshow = show --word-diff=color --word-diff-regex='[[:alnum:]_]+|[^[:space:]]'
         cmplog = log -u -b --word-diff=color --word-diff-regex='[[:alnum:]_]+|[^[:space:]]'
         logc = log --oneline --graph
         refl = log -g --oneline 'HEAD@{now}' --date=relative
diff --git a/.gitignore.d/dotfiles b/.gitignore.d/dotfiles
new file mode 100644
index 0000000..93b9172
--- /dev/null
+++ b/.gitignore.d/dotfiles
@@ -0,0 +1,5 @@
+/.mrconfig
+!/.gitignore.d/
+/.gitignore.d/*
+!/.gitignore.d/dotfiles_mr
+*~
diff --git a/.gtkrc-2.0 b/.gtkrc-2.0
new file mode 100644
index 0000000..c723854
--- /dev/null
+++ b/.gtkrc-2.0
@@ -0,0 +1,21 @@
+# DO NOT EDIT! This file will be overwritten by LXAppearance.
+# Any customization should be done in ~/.gtkrc-2.0.mine instead.
+
+gtk-theme-name="Adwaita"
+gtk-icon-theme-name="gnome"
+gtk-font-name="Sans 6"
+gtk-cursor-theme-name="justblue"
+gtk-cursor-theme-size=0
+gtk-toolbar-style=GTK_TOOLBAR_BOTH
+gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
+gtk-button-images=1
+gtk-menu-images=1
+gtk-enable-event-sounds=1
+gtk-enable-input-feedback-sounds=1
+gtk-xft-antialias=1
+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/.gtkrc-2.0.mine b/.gtkrc-2.0.mine
new file mode 120000
index 0000000..5391a8c
--- /dev/null
+++ b/.gtkrc-2.0.mine
@@ -0,0 +1 @@
+.gtkrc.mine
\ No newline at end of file
diff --git a/.gtkrc.mine b/.gtkrc.mine
new file mode 100644
index 0000000..b7e1df6
--- /dev/null
+++ b/.gtkrc.mine
@@ -0,0 +1,11 @@
+gtk-key-theme-name = "Emacs"
+
+style "fedora-default"
+{
+ engine "nodoka"
+ {
+  animation = TRUE
+  gradients = TRUE
+ }
+}
+
diff --git a/.ledgerrc b/.ledgerrc
new file mode 100644
index 0000000..5fba08a
--- /dev/null
+++ b/.ledgerrc
@@ -0,0 +1,4 @@
+--file /home/dakkar/SHARE/dakkar-ledger
+#--cache /home/dakkar/.ledger-cache
+--date-format %Y-%m-%d
+#--equity-format \n%D %Y%C%P\n%/    %-34A  %12t\n
diff --git a/.xinitrc b/.xinitrc
new file mode 100755
index 0000000..5d43b59
--- /dev/null
+++ b/.xinitrc
@@ -0,0 +1,20 @@
+#!/bin/sh
+cd
+export LC_ALL=en_US.UTF-8
+sudo ./src/hal-automounter/hal-automounter.pl > automount.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
+#uim-xim --engine=anthy &
+gkrellm &
+(sleep 3;wpa_gui -t)&
+~/bin/mwatch &
+xpad &
+start-pulseaudio-x11
+gtk-redshift &
+
+exec dbus-launch --exit-with-session fvwm-crystal
+
diff --git a/.xsession b/.xsession
new file mode 120000
index 0000000..03280df
--- /dev/null
+++ b/.xsession
@@ -0,0 +1 @@
+.xinitrc
\ No newline at end of file