From bfbb3b20272b050f7c72f76cfbd7af98e42dfb51 Mon Sep 17 00:00:00 2001
From: Colin Powell <colin@onec.me>
Date: Mon, 27 Jan 2020 01:03:45 -0500
Subject: [PATCH] Few more FreeBSD fixes to dotfiles

---
 fish/.config/fish/config.fish                      |  3 +++
 fish/.config/fish/fish_variables                   |  2 +-
 .../fish/functions/fish_user_key_bindings.fish     |  2 ++
 git/.gitconfig                                     |  3 ---
 i3/.Xresources                                     |  3 +++
 x/.xinitrc                                         | 14 ++++++++++++--
 6 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/fish/.config/fish/config.fish b/fish/.config/fish/config.fish
index 66baffc..40280a1 100644
--- a/fish/.config/fish/config.fish
+++ b/fish/.config/fish/config.fish
@@ -3,7 +3,10 @@ set -gx PATH ~/.cargo/bin $PATH
 set -gx PATH ~/.emacs.d/bin $PATH
 set -gx PATH ~/.fzf/bin $PATH
 set -gx PATH ~/.local/bin $PATH
+set -gx PATH ~/.asdf/install/rust/stable/bin $PATH
 fzf_key_bindings
 set -gx EDITOR vi
 set -gx XDG_RUNTIME_DIR /run/user/(id -u)
 eval (python -m virtualfish)
+direnv hook fish | source
+
diff --git a/fish/.config/fish/fish_variables b/fish/.config/fish/fish_variables
index 190956b..c87e254 100644
--- a/fish/.config/fish/fish_variables
+++ b/fish/.config/fish/fish_variables
@@ -41,7 +41,7 @@ SETUVAR fish_pager_color_completion:\x1d
 SETUVAR fish_pager_color_description:B3A06D\x1eyellow
 SETUVAR fish_pager_color_prefix:white\x1e\x2d\x2dbold\x1e\x2d\x2dunderline
 SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan
-SETUVAR fish_user_paths:/Users/colinpowell/\x2efzf/bin
+SETUVAR fish_user_paths:/Users/colinpowell/\x2efzf/bin\x1e/home/powellc/\x2efzf/bin
 SETUVAR pure_begin_prompt_with_current_directory:true
 SETUVAR pure_color_command_duration:pure_color_warning
 SETUVAR pure_color_current_directory:pure_color_primary
diff --git a/fish/.config/fish/functions/fish_user_key_bindings.fish b/fish/.config/fish/functions/fish_user_key_bindings.fish
index 3698914..c53e599 100644
--- a/fish/.config/fish/functions/fish_user_key_bindings.fish
+++ b/fish/.config/fish/functions/fish_user_key_bindings.fish
@@ -1,2 +1,4 @@
 function fish_user_key_bindings
 end
+
+fzf_key_bindings
diff --git a/git/.gitconfig b/git/.gitconfig
index 177bd0f..e25e89d 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -27,9 +27,6 @@
 	hs  = for-each-ref --sort=-committerdate refs/heads/ --format='%(HEAD) %(color:yellow)%(refname:short)%(color:reset) - %(color:red)%(objectname:short)%(color:reset) - %(contents:subject) - %(authorname) (%(color:green)%(committerdate:relative)%(color:reset))'
 [merge]
 	conflictstyle = diff3
-[pager]
-  diff = diff-so-fancy | less --tabs=1,5 -RFX
-  show = diff-so-fancy | less --tabs=1,5 -RFX
 [gpg]
 	program = /usr/local/bin/gpg
 [status]
diff --git a/i3/.Xresources b/i3/.Xresources
index 26647d3..0798511 100644
--- a/i3/.Xresources
+++ b/i3/.Xresources
@@ -1,2 +1,5 @@
 setxkbmap -model pc105 -layout us,ru -option grp:ctrls_toggle
 setxkbmap -option caps:escape -option compose:ralt &
+
+Xcursor*theme: dmz
+Xcursor*size: 24
diff --git a/x/.xinitrc b/x/.xinitrc
index 58d00c6..d0268bd 100644
--- a/x/.xinitrc
+++ b/x/.xinitrc
@@ -1,2 +1,12 @@
-SETXKBMAP -option caps:escape &
-setxkbmap -option compose:menu &
+export XDG_RUNTIME_DIR=/tmp
+if [ ! -d  "$XDG_RUNTIME_DIR" ]; then
+    mkdir "$XDG_RUNTIME_DIR"
+    chmod 0700 "$XDG_RUNTIME_DIR"
+fi
+
+setxkbmap -model pc105 -layout us,ru -option grp:ctrls_toggle
+setxkbmap -option caps:escape -option compose:ralt &
+
+emacs --daemon
+
+exec i3