From 4eb3b1cbc9195e13791b347152a4dc8790a2e054 Mon Sep 17 00:00:00 2001
From: Shadowfacts <me@shadowfacts.net>
Date: Fri, 11 Dec 2020 18:39:23 -0500
Subject: [PATCH] Things

---
 .gitignore |  3 +++
 .vimrc     |  6 ++++--
 .zshrc     | 24 +++++++++++++++++++-----
 3 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 45404ab..1b521ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,6 @@
 !.gradle/gradle.properties
 
 !iterm2_settings/*
+
+!.config/fish/config.fish
+!.config/fish/conf.d/omf.fish
diff --git a/.vimrc b/.vimrc
index 4107962..ec7b901 100644
--- a/.vimrc
+++ b/.vimrc
@@ -58,6 +58,7 @@ set sidescrolloff=5
 set ignorecase
 set smartcase
 set cursorline
+set splitbelow splitright
 
 let g:mapleader=","
 let g:mix_format_on_save = 1
@@ -173,6 +174,7 @@ nmap <silent> ]g <Plug>(coc-diagnostic-next)
 
 " Remap keys for gotos
 nmap <silent> <C-]> <Plug>(coc-definition)
+nmap <silent> <C-w><C-]> <C-w>s<C-]>
 nmap <silent> gy <Plug>(coc-type-definition)
 nmap <silent> gi <Plug>(coc-implementation)
 nmap <silent> gr <Plug>(coc-references)
@@ -222,8 +224,8 @@ omap if <Plug>(coc-funcobj-i)
 omap af <Plug>(coc-funcobj-a)
 
 " Use <C-d> for select selections ranges, needs server support, like: coc-tsserver, coc-python
-nmap <silent> <C-d> <Plug>(coc-range-select)
-xmap <silent> <C-d> <Plug>(coc-range-select)
+" nmap <silent> <C-d> <Plug>(coc-range-select)
+" xmap <silent> <C-d> <Plug>(coc-range-select)
 
 " Use `:Format` to format current buffer
 command! -nargs=0 Format :call CocAction('format')
diff --git a/.zshrc b/.zshrc
index 83547d7..d147b04 100644
--- a/.zshrc
+++ b/.zshrc
@@ -17,20 +17,18 @@ alias fuck='$(thefuck $(fc -ln -1))'
 
 alias subl="/Applications/Sublime\ Text.app/Contents/SharedSupport/bin/subl"
 
-alias git=hub
-
 alias python=python3
 alias pip=pip3
 
-alias oldruby="/usr/bin/ruby"
-alias ruby="/usr/local/opt/ruby/bin/ruby"
+# alias oldruby="/usr/bin/ruby"
+# alias ruby="/usr/local/opt/ruby/bin/ruby"
 
 # Erlang/Elixir persistent shell history
 export ERL_AFLAGS="-kernel shell_history enabled"
 
 # lazily load nvm
 # export NVM_DIR=~/.nvm
-#. $(brew --prefix nvm)/nvm.sh
+# . $(brew --prefix nvm)/nvm.sh
 
 # nvm() {
 # 	unset -f nvm
@@ -68,6 +66,12 @@ export ERL_AFLAGS="-kernel shell_history enabled"
 # 	yarn "$@"
 # }
 
+export NODE_OPTIONS="--max-old-space-size=8000"
+
+# Ruby
+export PATH="$HOME/.rbenv/bin:$PATH"
+eval "$(rbenv init -)"
+
 # Go up N directories
 up() {
 	str=""
@@ -107,6 +111,16 @@ ca() {
 	git commit --amend "$@"
 }
 
+# pbedit: interactively edit the contents of the clipboard
+pbedit() {
+	tmpfile=`mktemp /tmp/pbedit.XXXXX`
+	pbpaste > $tmpfile
+	if vim -c "set nofixeol" $tmpfile ; then
+		pbcopy < $tmpfile
+	fi
+	rm $tmpfile
+}
+
 # default file openings
 alias -s ipr=open
 alias -s xcodeproj=open