From 354d23f3f8989347dbebda90c067eb78aba1d293 Mon Sep 17 00:00:00 2001
From: David Chen <chenwei2000121@163.com>
Date: Fri, 13 Sep 2019 09:14:01 +0800
Subject: [PATCH] fixes

---
 compton.conf              | 1 +
 fish/functions/cdiff.fish | 4 ++++
 fish/functions/diff.fish  | 4 ----
 fish/functions/fzf.fish   | 4 ++++
 fish/functions/gc.fish    | 4 ++++
 i3/config                 | 6 +++++-
 i3/sk.sh                  | 6 ++++++
 ranger/rc.conf            | 2 +-
 8 files changed, 25 insertions(+), 6 deletions(-)
 create mode 100644 fish/functions/cdiff.fish
 delete mode 100755 fish/functions/diff.fish
 create mode 100644 fish/functions/fzf.fish
 create mode 100644 fish/functions/gc.fish
 create mode 100755 i3/sk.sh

diff --git a/compton.conf b/compton.conf
index 2c8eda6..8cbe462 100644
--- a/compton.conf
+++ b/compton.conf
@@ -71,6 +71,7 @@ opacity-rule = [
 "60:name *?= 'Screenkey'",
 #"99:class_g = 'Darktable'", 
 "50:class_g = 'Dmenu'", 
+"100:class_g = 'google-chrome-stable'", 
 #"99:name *?= 'Event'", 
 #"99:class_g = 'Firefox'", 
 #"99:class_g = 'GIMP'", 
diff --git a/fish/functions/cdiff.fish b/fish/functions/cdiff.fish
new file mode 100644
index 0000000..2f1bd27
--- /dev/null
+++ b/fish/functions/cdiff.fish
@@ -0,0 +1,4 @@
+# Defined in - @ line 1
+function cdiff --description 'alias cdiff colordiff'
+	colordiff  $argv;
+end
diff --git a/fish/functions/diff.fish b/fish/functions/diff.fish
deleted file mode 100755
index c744e71..0000000
--- a/fish/functions/diff.fish
+++ /dev/null
@@ -1,4 +0,0 @@
-# Defined in - @ line 1
-function diff --description 'alias diff colordiff'
-	colordiff  $argv;
-end
diff --git a/fish/functions/fzf.fish b/fish/functions/fzf.fish
new file mode 100644
index 0000000..b025cfb
--- /dev/null
+++ b/fish/functions/fzf.fish
@@ -0,0 +1,4 @@
+# Defined in - @ line 1
+function fzf --description alias\ fzf\ fzf\ --preview\ \'head\ -100\ \{\}\'
+	command fzf --preview 'head -100 {}' $argv;
+end
diff --git a/fish/functions/gc.fish b/fish/functions/gc.fish
new file mode 100644
index 0000000..a0676b4
--- /dev/null
+++ b/fish/functions/gc.fish
@@ -0,0 +1,4 @@
+# Defined in - @ line 1
+function gc --description 'alias gc git config credential.helper store'
+	git config credential.helper store $argv;
+end
diff --git a/i3/config b/i3/config
index 767b85d..41cab37 100644
--- a/i3/config
+++ b/i3/config
@@ -38,6 +38,10 @@ bindsym $mod+s exec --no-startup-id dmenu_recency
 # launch categorized menu
 bindsym $mod+z exec --no-startup-id morc_menu
 
+# screenkey
+bindsym $mod+ctrl+s exec bash ~/.config/i3/sk.sh
+bindsym $mod+shift+ctrl+s exec killall screenkey
+
 ################################################################################################
 ## sound-section - DO NOT EDIT if you wish to automatically upgrade Alsa -> Pulseaudio later! ##
 ################################################################################################
@@ -372,7 +376,7 @@ bindsym $mod+m bar mode toggle
 #############################
 
 # Set inner/outer gaps
-gaps inner 14
+gaps inner 17
 gaps outer -2
 
 # Additionally, you can issue commands with the following syntax. This is useful to bind keys to changing the gap size.
diff --git a/i3/sk.sh b/i3/sk.sh
new file mode 100755
index 0000000..c53e554
--- /dev/null
+++ b/i3/sk.sh
@@ -0,0 +1,6 @@
+result=$(ps ax|grep -v grep|grep screenkey)
+if [ "$result" == "" ]; then
+  eval "screenkey --bg-color white --font-color black &"
+else
+  eval "killall screenkey"
+fi
diff --git a/ranger/rc.conf b/ranger/rc.conf
index b73b875..a69c128 100755
--- a/ranger/rc.conf
+++ b/ranger/rc.conf
@@ -338,7 +338,7 @@ map gud cd /usr/share/doc
 map gd cd /dev
 map go cd /opt
 map gv cd /var
-map gm cd /media
+map gm cd /run/media
 map gM cd /mnt
 map gr cd /