buncha cleanup of old dumb stuff. also ls colors

Author: paulirish

Diff for: .bash_profile

@@ -12,6 +12,13 @@ case $- in
    *i*) source ~/.extra
 esac
 
+# here's LS_COLORS
+# github.com/trapd00r/LS_COLORS
+command -v gdircolors >/dev/null 2>&1 || alias gdircolors="dircolors"
+if which gdircolors > /dev/null; then
+	eval "$(gdircolors -b ~/.dircolors)"
+fi
+
 # generic colouriser
 GRC=`which grc`
 if [ "$TERM" != dumb ] && [ -n "$GRC" ]

Diff for: .bash_prompt

@@ -26,7 +26,6 @@ set_prompts() {
     local dateCmd=""
 
     if [ -x /usr/bin/tput ] && tput setaf 1 &> /dev/null; then
-
         tput sgr0 # Reset colors
 
         bold=$(tput bold)
@@ -45,24 +44,6 @@ set_prompts() {
         magenta=$(tput setaf 9)
         white=$(tput setaf 8)
         yellow=$(tput setaf 136)
-
-    else
-
-        bold=""
-        reset="\e[0m"
-
-        black="\e[1;30m"
-        blue="\e[1;34m"
-        cyan="\e[1;36m"
-        green="\e[1;32m"
-        orange="\e[1;33m"
-        purple="\e[1;35m"
-        red="\e[1;31m"
-        magenta="\e[1;31m"
-        violet="\e[1;35m"
-        white="\e[1;37m"
-        yellow="\e[1;33m"
-
     fi
 
     # Only show username/host if not default

Diff for: .bashrc

@@ -3,7 +3,6 @@
 
 [ -n "$PS1" ] && source ~/.bash_profile
 
-# when things like nvm/yarn/rvm add rando shit into my .bashrc i move them to ~/.extrarc just cuz
-[ -r "~/.extrarc" ] && source "~/.extrarc"
 
 [ -f ~/.fzf.bash ] && source ~/.fzf.bash
+# .dircolors

Diff for: .exports

@@ -1,3 +1,5 @@
+# file is shared between bash and fish
+
 # vim as default
 export EDITOR="vim"
 
@@ -10,13 +12,17 @@ export LANG="en_US"
 
 export HOMEBREW_CASK_OPTS="--appdir=/Applications"
 
-# here's LS_COLORS
-# github.com/trapd00r/LS_COLORS
-command -v gdircolors >/dev/null 2>&1 || alias gdircolors="dircolors"
-if which gdircolors > /dev/null; then
-	eval "$(gdircolors -b ~/.dircolors)"
-fi
+# highlighting inside manpages and elsewhere
+export LESS_TERMCAP_mb=$(printf '\e[01;31m')													# enter blinking mode – red
+export LESS_TERMCAP_md=$(printf '\e[01;35m')													# enter double-bright mode – bold, magenta
+export LESS_TERMCAP_me=$(printf '\e[0m')															# turn off all appearance modes (mb, md, so, us)
+export LESS_TERMCAP_se=$(printf '\e[0m')															# leave standout mode
+export LESS_TERMCAP_so=$(printf '\e[01;33m')													# enter standout mode – yellow
+export LESS_TERMCAP_ue=$(printf '\e[0m')															# leave underline mode
+export LESS_TERMCAP_us=$(printf '\e[04;36m')													# enter underline mode – cyan
 
 # fzf should be populated via the silver searcher (to respect gitignore and be faster): https://github.com/junegunn/fzf#respecting-gitignore
 # note.. without `ag` this is a good fallback: export FZF_DEFAULT_COMMAND='fd --type f'
-export FZF_DEFAULT_COMMAND='command ag -l -g ""'
+export FZF_DEFAULT_COMMAND='command ag --files-with-matches --filename-pattern ""'
+export FZF_CTRL_T_COMMAND='command ag --files-with-matches --filename-pattern ""'
+

Diff for: README.md

@@ -4,29 +4,21 @@
 * You're quite welcome to make suggestions, however I may decline if it's not of personal value to me.
 * If you're starting off anew, consider forking [mathias](https://github.com/mathiasbynens/dotfiles/) or [alrra](https://github.com/alrra/dotfiles/). [paulmillr](https://github.com/paulmillr/dotfiles) and [gf3](https://github.com/gf3/dotfiles) also have great setups
 
-## Setup
-#### installing & using
-
-* fork this to your own acct
-* clone that repo
-* read and run parts of `setup-a-new-machine.sh`
-* read and run `symlink-setup.sh`
-  * git config needs attention, read the notes.
-* use it. yay!
 
-#### maintenance
+## Setup
 
-* commit/push changes you want.
-* you can also hypothetically cherry-pick commits from me and mathias and our fork ecosystem.
+I would not suggest you just wholesale use my dotfiles. But there's a few files where there's great goodies you can steal.
 
 #### shell
 
 This repo contains config for fish and bash. As of March 2016, I'm using fish shell mostly, but fall back to bash once in a while. The bash and fish stuff are both well maintained. If you're using fish you'll want to do a `git submodule update --init`.
 
-
 ## my favorite parts.
 
-### [`.aliases`](https://github.com/paulirish/dotfiles/blob/master/.aliases) and [`.functions`](https://github.com/paulirish/dotfiles/blob/master/.functions)
+### aliases and functions
+
+* [`aliases.fish`](./fish/aliases.fish) and [`functions.fish`](./fish/functions.fish) and [`fish/functions/*`](./fish/functions/)
+* [`.aliases`](./.aliases) and [`.functions`](./.functions)
 
 So many goodies.
 
@@ -39,7 +31,7 @@ Basically it makes typing into the prompt amazing.
 * case insensitivity.
 * tab all the livelong day.
 
-
+### [.gitconfig](./gitconfig)
 
 ### Moving around in folders (`z`, `...`, `cdf`)
 `z` helps you jump around to whatever folder. It uses actual real magic to determine where you should jump to. Seperately there's some `...` aliases to shorten `cd ../..` and `..`, `....` etc. Then, if you have a folder open in Finder, `cdf` will bring you to it.
@@ -114,11 +106,8 @@ Mathias's repo is the canonical for this, but you should probably run his or min
 
 ### `~/bin`
 
-One-off binaries that aren't via an npm global or homebrew. [git open](https://github.com/paulirish/git-open), [wifi-password](https://github.com/rauchg/wifi-password), [coloredlogcat](https://developer.sinnerschrader-mobile.com/colored-logcat-reloaded/507/), [git-overwritten](https://github.com/mislav/dotfiles/blob/master/bin/git-overwritten), and `subl` for Sublime Text.
-
-### Syntax highlighting for these files
+One-off binaries that aren't via an npm global or homebrew. [git open](https://github.com/paulirish/git-open), [wifi-password](https://github.com/rauchg/wifi-password), [coloredlogcat](https://developer.sinnerschrader-mobile.com/colored-logcat-reloaded/507/), and `subl` for Sublime Text.
 
-If you edit this stuff, install [Dotfiles Syntax Highlighting](https://github.com/mattbanks/dotfiles-syntax-highlighting-st2) via [Package Control](http://wbond.net/sublime_packages/package_control)
 
 ### 2020 update
 

Diff for: brew-cask.sh

@@ -17,14 +17,11 @@ brew install --cask iterm2
 brew install --cask sublime-text
 brew install --cask imageoptim
 
-# fun
-brew install --cask limechat
 
 # less often
 brew install --cask disk-inventory-x
 brew install --cask screenflow
 brew install --cask vlc
-brew install --cask gpgtools
 
 brew install --cask spotify
 

Diff for: fish/config.fish

@@ -16,7 +16,7 @@ if test -e "$HOME/.extra.fish";
 end
 
 # THEME PURE #
-set -g async_prompt_functions _pure_prompt_git
+set -g async_prompt_functions _pure_prompt_git  # run this async! dope.
 set fish_function_path $HOME/.config/fish/functions/pure/functions/ $fish_function_path
 set fish_function_path $HOME/.config/fish/functions/pure/ $fish_function_path
 source $HOME/.config/fish/functions/pure/conf.d/pure.fish
@@ -81,28 +81,12 @@ set -g fish_pager_color_prefix cyan
 set -g fish_pager_color_progress cyan
 
 
-# highlighting inside manpages and elsewhere
-set -gx LESS_TERMCAP_mb \e'[01;31m'       # begin blinking
-set -gx LESS_TERMCAP_md \e'[01;38;5;74m'  # begin bold
-set -gx LESS_TERMCAP_me \e'[0m'           # end mode
-set -gx LESS_TERMCAP_se \e'[0m'           # end standout-mode
-set -gx LESS_TERMCAP_so \e'[38;5;246m'    # begin standout-mode - info box
-set -gx LESS_TERMCAP_ue \e'[0m'           # end underline
-set -gx LESS_TERMCAP_us \e'[04;38;5;146m' # begin underline
-
-
-# tabtab source for yarn package
-# uninstall by removing these lines or running `tabtab uninstall yarn`
-[ -f $HOME/.config/yarn/global/node_modules/tabtab/.completions/yarn.fish ]; and . $HOME/.config/yarn/global/node_modules/tabtab/.completions/yarn.fish
-
-
- # fzf should be populated via the silver searcher (to respect gitignore and be faster): https://github.com/junegunn/fzf#respecting-gitignore
- # note.. without `ag` this is a good fallback: set -gx FZF_DEFAULT_COMMAND 'fd --type f'
-set -gx FZF_DEFAULT_COMMAND 'command ag --files-with-matches --filename-pattern ""'
-set -gx FZF_CTRL_T_COMMAND "$FZF_DEFAULT_COMMAND"
-
+# pull in all shared `export …` aka `set -gx …`
+. ~/.exports
 
 # TODO debug this
 # this currently messes with newlines in my prompt. lets debug it later.
 test -e {$HOME}/.iterm2_shell_integration.fish ; and source {$HOME}/.iterm2_shell_integration.fish
 
+# fancy `ls` colors. this adds 20ms to shell init. from ~70 to ~90.
+eval (gdircolors -c ~/.dircolors)

Diff for: fish/functions/__bass.py

@@ -1,6 +1,6 @@
-# TODO: fish compatibility
 function log --description "git commit browser. uses fzf"
-  git log --graph --color=always --format="%C(auto)%h%d %s %C(black)%C(bold)%cr" "$argv" | \
+  # todo add "$argv" in there without breaking the no-argv case.
+  git log --graph --color=always --format="%C(auto)%h%d %s %C(black)%C(bold)%cr"  | \
   fzf --ansi --no-sort --reverse --tiebreak=index --toggle-sort=\` --bind "ctrl-m:execute:
                 echo '{}' | grep -o '[a-f0-9]\{7\}' | head -1 |
                 xargs -I % sh -c 'git show --color=always % | less -R'"