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

8 files changed, 48 insertions, 13 deletions

diff --git a/.XCompose b/.XCompose
index 59594a7..5ea8dd1 100644
--- a/.XCompose
+++ b/.XCompose
@@ -1,19 +1,10 @@
 # -*- mode: conf -*-
 
-include "/usr/share/X11/locale/en_US.UTF-8/Compose"
+#include "/usr/share/X11/locale/en_US.UTF-8/Compose"
+include "/home/dakkar/src/dotXCompose/dotXCompose"
 
 # 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 0bd54f4..a92a8d1 100644
--- a/.Xdefaults
+++ b/.Xdefaults
@@ -13,7 +13,7 @@ emacs*pointerColor: White
 emacs*cursorColor: White
 emacs*bitmapIcon: on
 Emacs.FontBackend: x,xft
-emacs*font: inconsolata-12
+emacs*font: inconsolata-9
 !emacs*font: -misc-fixed-medium-r-semicondensed-*-*-120-*-*-c-*-iso10646-1
 emacs.geometry: 80x25
 
diff --git a/.config/Yubico/u2f_keys b/.config/Yubico/u2f_keys
index b0bb545..ef328bc 100644
--- a/.config/Yubico/u2f_keys
+++ b/.config/Yubico/u2f_keys
@@ -1 +1,2 @@
 dakkar:d9_Fyz9d0-GMcvQwWOfd4nhVix7yWzNpwPfk3lWzEgmzC9elswQRBH5btgqyvqNcTn-YiNE5m6NBq4SLCAYBwQ,0463f72b3b50b4de19e2351a9dda1de1038ec1df1393cc13e34744b6bd55d256e1c06a2f88701a3a7884fab090dc0aac004ca6437837935446b361a9e6889e9282
+dakkar:TSjB7MrP1bnTzw3B2_iutHC-htsWaTk-GdHCjw9nZOE9fDoi6JiP-9Ysig3oYwal8B7ZhXPR-pY5apAJKxaRxw,04ebd3766782950a327c70b35e02d227faea091bee86d07616985797f9122beb87183c2ebd7a5c739133b334772669672f12ec2c978857bdeaf889b25eb3c0f40e
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/.gitconfig b/.gitconfig
index 7d88cc2..955dbab 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -27,6 +27,8 @@
 [rebase]
         stat = true
         autosquash = true
+[transfer]
+        fsckobjects = true
 [grep]
         patternType = perl
 [alias]
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/.xinitrc b/.xinitrc
index d786503..1b1be45 100755
--- a/.xinitrc
+++ b/.xinitrc
@@ -7,9 +7,10 @@ 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 &
 gkrellm &
+(sleep 3;wpa_gui -t)&
 ~/bin/mwatch &
 xsetwacom set stylus PressCurve 0 0 100 100
 xsetwacom set eraser PressCurve 0 0 100 100