aliases.local

@@ -16,6 +16,3 @@ alias be="bundle exec"
 alias fuckit="git reset HEAD --hard"
 
 alias httpserver="ruby -run -e httpd"
-
-# Shell
-alias sanify="stty sane"

bin/lib/os.rb

@@ -0,0 +1,21 @@
+class OS
+  ICONS = {
+    "Darwin" => "",
+    "Linux" => "",
+    "FreeBSD" => "",
+  }
+
+  def os
+    "#{icon} #{name}"
+  end
+
+  private
+
+  def name
+    @os ||= `uname -s`.strip
+  end
+
+  def icon
+    ICONS[name]
+  end
+end

bin/os

@@ -1,17 +1,5 @@
-#!/bin/sh
+#!/usr/bin/env ruby
 
-OS=`uname -s`
+require_relative "lib/os"
 
-case $OS in
+puts OS.new.os
-  Darwin)
-    printf ""
-    ;;
-  Linux)
-    printf ""
-    ;;
-  FreeBSD)
-    printf ""
-    ;;
-esac
-
-printf " $OS\n"

config/starship.toml

@@ -19,9 +19,6 @@ symbol = " "
 [elixir]
 symbol = " "
 
-[rust]
-symbol = " "
-
 [custom.os]
 disabled = false
 command = "os"

vim/vimrc.d/ctrlp.vim

@@ -0,0 +1,5 @@
+if executable('rg')
+  set grepprg=rg\ --color=never
+  let g:ctrlp_user_command = 'rg %s --files --color=never --glob ""'
+  let g:ctrlp_use_caching = 0
+endif

vim/vimrc.d/fzf.vim

@@ -1,4 +1,2 @@
-let $FZF_DEFAULT_COMMAND='rg --files'
-
 map <C-P> :FZF<CR>
 map <C-B> :Buffers<CR>

zshrc.local

@@ -34,6 +34,20 @@ fi
 export PATH=/usr/local/share/npm/bin:$PATH
 export NODE_PATH=/usr/local/lib/node_modules
 
+# Enable direnv
+if (( $+commands[direnv] )); then
+  #eval `direnv hook $0`
+  _direnv_hook() {
+    eval "$(direnv export $0)";
+  }
+  typeset -a precmd_functions
+  if [[ -z $precmd_functions[(r)_direnv_hook] ]]; then
+    precmd_functions+=_direnv_hook;
+  fi
+  # Make direnv use the system ruby. https://github.com/zimbatm/direnv/issues/42
+  export DIRENV_RUBY=/usr/bin/ruby
+fi
+
 # Environment config
 [[ -f ~/.zshrc.env ]] && source ~/.zshrc.env