Permalink
Browse files

Merge branch 'release'

* release: (58 commits)
  installed formula via brew on macOS
  yarn global pkgs updates
  add note about working with mkv matroska file format using mkvtoolnix
  update comments in `bashrc`, refine key bindings for mpv, and adjust vscode font size for tv screen
  clean up alacritty settings
  some groovy new key bindings for mpv and add a abbr for alacritty
  experimenting with font sizes in alacritty, and update erlang
  setup a `plugin_vim-polyglot.vim` file for creating and editing settings related to the `vim-polyglot` plugin
  update `.gitignore` to ignore Blender recent files
  add notes about working with Blender.app on macOS as a video editor
  update Blender startup settings
  add `Blender` dir for backing up Blender 2.79 configuration files into dotfiles repo
  add notes about creating asciicasts, and editing animated GIF with GIMP
  finished editing gif for github issue
  vim config hell for javascript / JSX
  vim config hell for javascript / JSX
  vim plugin updates
  migrate from `vim-jsx` + `vim-javascript` plugins to just `vim-jsx-pretty`
  update `README.md` specific to Vim and Neovim related settings / setup
  overhaul several different files related to Vim and Neovim, and setup various defs / explanations in `editors/vim/README.md
  ...
  • Loading branch information...
ipatch committed Dec 28, 2018
2 parents 25b7133 + b303c7f commit ea67091839c41c14513ea13a6f78ac8cf7392f8d
Showing with 422 additions and 215 deletions.
  1. +5 βˆ’0 .gitignore
  2. +1 βˆ’1 .wiki
  3. +1 βˆ’1 asdf/tool-versions.rogue.capin
  4. +4 βˆ’0 config/Blender/2.79/config/bookmarks.txt
  5. BIN config/Blender/2.79/config/startup.blend
  6. BIN config/Blender/2.79/config/userpref.blend
  7. +5 βˆ’3 config/alacritty/alacritty.yml
  8. +5 βˆ’5 config/bash/bashrc
  9. +24 βˆ’6 config/brew/macOS/High Sierra/Brewfile
  10. +1 βˆ’4 config/fish/conf.d/001_load_paths.fish
  11. +0 βˆ’36 config/fish/conf.d/007_load_pyen.fish
  12. +12 βˆ’5 config/fish/config.fish
  13. +5 βˆ’12 config/fish/interactive.fish
  14. +7 βˆ’2 config/fish/{ β†’ interactive}/abbreviations.fish
  15. 0 config/fish/{ β†’ interactive}/aliases.fish
  16. +31 βˆ’0 config/fish/interactive/load_pyenv.fish
  17. +26 βˆ’3 config/git/gitconfig
  18. +70 βˆ’37 config/inkscape/preferences.xml
  19. +8 βˆ’2 config/mpv/input.conf
  20. +4 βˆ’2 config/nvim/init.vim
  21. +1 βˆ’1 config/vscode/settings.json
  22. +23 βˆ’1 editors/vim/README.md
  23. +31 βˆ’0 editors/vim/vim/after/plugin/README.md
  24. +0 βˆ’15 editors/vim/vim/after/plugin/plugin_identLine.vim
  25. +26 βˆ’0 editors/vim/vim/after/plugin/plugin_indentLine.vim
  26. +0 βˆ’8 editors/vim/vim/after/plugin/plugin_indent_line.vim
  27. 0 editors/vim/vim/after/plugin/{plugin_language_client.vim β†’ plugin_language_client.vim.bak}
  28. +6 βˆ’0 editors/vim/vim/after/plugin/plugin_tcomment_vim.vim.bak
  29. +7 βˆ’0 editors/vim/vim/after/plugin/plugin_vim-jsx.vim.bak
  30. +5 βˆ’0 editors/vim/vim/after/plugin/plugin_vim-polyglot.vim
  31. +2 βˆ’0 editors/vim/vim/after/plugin/plugin_vim_commentary.vim
  32. +11 βˆ’0 editors/vim/vim/after/plugin/plugin_vim_context_commentstring.vim.bak
  33. +4 βˆ’0 editors/vim/vim/autoload/{wincent β†’ }/settings.vim
  34. +0 βˆ’29 editors/vim/vim/autoload/wincent/autocmds.vim
  35. +0 βˆ’21 editors/vim/vim/autoload/wincent/mappings/visual.vim
  36. +4 βˆ’4 editors/vim/vim/plugin/mappings.vim
  37. +10 βˆ’2 editors/vim/vimrc
  38. +1 βˆ’0 jobs/bin/less
  39. +18 βˆ’0 jobs/bin/mac-microcode-version
  40. +42 βˆ’0 jobs/bin/rotate-video
  41. +5 βˆ’0 jobs/bin/video-rotation
  42. +2 βˆ’2 jobs/macOS/Users/mr-fancy/Library/LaunchAgents/com.chrisrjones.brew-update-Brewfile.plist
  43. +2 βˆ’2 jobs/macOS/Users/mr-fancy/Library/LaunchAgents/com.chrisrjones.brew-updatedb.plist
  44. +2 βˆ’2 jobs/macOS/Users/mr-fancy/Library/LaunchAgents/com.chrisrjones.rm_ds_store_files.plist
  45. +9 βˆ’7 lang/javascript/yarn-global-packages
  46. +1 βˆ’1 lang/javascript/yarnrc.rogue.capin
  47. +1 βˆ’1 lang/rust/cargo-installed-crates.rogue
@@ -129,6 +129,11 @@ config/mpv/mpv_history.log
config/GIMP/2.10/themes/*
!config/GIMP/2.10/.gitkeep

##############################
# Blender
##
config/Blender/2.79/config/recent-files.txt

##############################
# Python - pyenv
##
2 .wiki
Submodule .wiki updated from c81724 to 738106
@@ -1,4 +1,4 @@
ruby 2.5.3
ocaml 4.04.2
erlang 21.1.1
erlang 21.2.1
elixir 1.7.4
@@ -0,0 +1,4 @@
[Bookmarks]
[Recent]
/Users/capin/Movies/my-screencasts/blender-editing/
/Users/capin/Movies/my-screencasts/diana-ford-escape-oil-change/
Binary file not shown.
Binary file not shown.
@@ -41,6 +41,11 @@ draw_bold_text_with_bright_colors: true
# Font configuration (changes require restart)
font:
# The normal (roman) font face to use.
# size: 18

# Point size of the font
size: 20

normal:
family: "IBMPlexMono Nerd Font Mono"
# Style can be specified to pick a specific face.
@@ -58,9 +63,6 @@ font:
# Style can be specified to pick a specific face.
style: "ExtraLight Italic"

# Point size of the font
size: 13.0

# Offset is the extra space around each character. offset.y can be thought of
# as modifying the linespacing, and offset.x as modifying the letter spacing.
offset:
@@ -1,16 +1,16 @@
#!/usr/bin/env bash

##############################
# User specified file for configuring BASH.
# $USER specified file for configuring BASH.
# Author: Chris Jones
# Contact: @truckmonth <- twitter
# Contact: chris.r.jones.1983@gmail.com <- email
# Contact: @ipatch <- github
# Contact: twitter > @truckmonth
# Contact: email > chris.r.jones.1983@gmail.com <- email
# Contact: github > @ipatch
##

# shellcheck source=/dev/null

##############################
# NOTE: in macOS ~/.bashrc is loaded before ~/.bash_profile
# 1) /etc/profile
# 2) /etc/bash.bashrc
# 3) ~/.bashrc | NOTE non-login interactive mode
@@ -1,7 +1,9 @@
tap "caskformula/caskformula"
tap "eddieantonio/eddieantonio"
tap "heroku/brew"
tap "homebrew/bundle"
tap "homebrew/cask"
tap "homebrew/cask-drivers"
tap "homebrew/cask-fonts"
tap "homebrew/cask-versions"
tap "homebrew/completions"
@@ -14,6 +16,8 @@ tap "lukechilds/tap"
tap "neomutt/neomutt", "git@github.com:ipatch/homebrew-neomutt.git"
tap "universal-ctags/universal-ctags"
cask "java"
cask "java8"
cask "osxfuse"
cask "xquartz"
brew "adns"
brew "apr"
@@ -47,7 +51,6 @@ brew "bash-completion"
brew "bc"
brew "bdw-gc"
brew "bfg"
brew "binutils", link: true
brew "gmp"
brew "mpfr"
brew "gcc"
@@ -73,6 +76,8 @@ brew "curl"
brew "go"
brew "dep"
brew "dialog"
brew "libyaml"
brew "docker-compose"
brew "doxygen"
brew "gpatch"
brew "perl"
@@ -81,10 +86,12 @@ brew "pcre2"
brew "editorconfig"
brew "elinks"
brew "libunistring"
brew "nettle"
brew "p11-kit"
brew "gnutls"
brew "emacs"
brew "exercism"
brew "exiftool"
brew "fakeroot"
brew "fdk-aac"
brew "fribidi"
@@ -95,6 +102,7 @@ brew "icu4c"
brew "harfbuzz"
brew "lame"
brew "pango"
brew "sdl2"
brew "x264"
brew "x265"
brew "ffmpeg", args: ["HEAD", "with-fdk-aac", "with-fontconfig", "with-freetype", "with-game-music-emu", "with-libbluray", "with-librsvg", "with-openh264", "with-rtmpdump", "with-srt", "with-wavpack"]
@@ -103,7 +111,9 @@ brew "findutils", args: ["with-default-names"]
brew "fish", args: ["HEAD"]
brew "libusb"
brew "flashrom"
brew "fop"
brew "fortune"
brew "fswatch"
brew "fzf"
brew "gawk"
brew "webp"
@@ -117,6 +127,7 @@ brew "glide"
brew "gnu-sed", args: ["with-default-names"]
brew "gnu-time", args: ["with-default-names"]
brew "libgpg-error"
brew "libassuan"
brew "libgcrypt"
brew "libksba"
brew "npth"
@@ -135,10 +146,15 @@ brew "highlight"
brew "html-xml-utils"
brew "htop"
brew "httpie"
brew "hugo"
brew "ideviceinstaller"
brew "ifuse"
brew "imagemagick"
brew "iproute2mac"
brew "jansson"
brew "jemalloc"
brew "jpeg-turbo"
brew "oniguruma"
brew "jq"
brew "kubernetes-cli"
brew "libarchive"
@@ -156,7 +172,6 @@ brew "libuv"
brew "libvterm"
brew "libxml2"
brew "libxslt"
brew "libyaml"
brew "llvm"
brew "lsusb"
brew "lua@5.1"
@@ -166,6 +181,7 @@ brew "m4"
brew "make", args: ["with-default-names"]
brew "maven"
brew "minicom"
brew "mkvtoolnix"
brew "mongodb", restart_service: true
brew "mujs"
brew "youtube-dl"
@@ -177,13 +193,14 @@ brew "mutt"
brew "nasm"
brew "ncurses"
brew "neofetch"
brew "neovim", args: ["HEAD"]
brew "neovim"
brew "nghttp2"
brew "py2cairo"
brew "nmap", args: ["with-pygtk"]
brew "node"
brew "nss"
brew "opam"
brew "open-ocd"
brew "openssl@1.1"
brew "openvpn"
brew "pandoc"
@@ -233,6 +250,7 @@ brew "xorriso"
brew "yarn"
brew "zlib"
brew "zsh"
brew "eddieantonio/eddieantonio/imgcat"
brew "ipatch/us-05/openssh", args: ["HEAD", "with-ldns"]
brew "ipatch/us-05/qemu", args: ["HEAD", "with-docs", "with-hax", "with-hvf", "with-libusb"]
brew "lukechilds/tap/gifgen"
@@ -243,14 +261,17 @@ cask "arduino"
cask "atom"
cask "avidemux"
cask "background-music"
cask "bbc-iplayer-downloads"
cask "bitbar"
cask "blender"
cask "chromium"
cask "clipy"
cask "diffmerge"
cask "discord"
cask "docker"
cask "dolphin"
cask "dotnet"
cask "duet"
cask "etcher"
cask "fanny"
cask "firefox"
@@ -270,7 +291,6 @@ cask "hyper-canary"
cask "impactor"
cask "inkscape"
cask "iterm2"
cask "java8"
cask "jbidwatcher"
cask "jdownloader"
cask "kap"
@@ -287,7 +307,6 @@ cask "minikube"
cask "mpv"
cask "natron"
cask "openshot-video-editor"
cask "osxfuse"
cask "postico"
cask "postman"
cask "powershell"
@@ -304,7 +323,6 @@ cask "soundflower"
cask "soundflowerbed"
cask "spectacle"
cask "spotify"
cask "telegram"
cask "tigervnc-viewer"
cask "transmission"
cask "tuntap"
@@ -34,18 +34,14 @@ set -l paths \
$HOME/.cargo/bin \
$HOME/go/bin \
$HOME/Library/Android/sdk/platform-tools \
/opt/Code/github/PUBLIC/chromium/depot_tools \
/opt/X11/bin \
$brew_prefix/bin \
$brew_prefix/sbin \
$brew_prefix/opt/ccache/libexec \
$brew_prefix/opt/llvm/bin \
$brew_prefix/opt/libressl/bin \
$brew_prefix/opt/python/libexec/bin \
$brew_prefix/opt/go/libexec/bin \
$brew_prefix/opt/coreutils/libexec/bin \
$HOME/.local/bin \
$HOME/.pyenv/bin \
$HOME/.config/yarn/bin \
/Applications/microchip/xc16/v1.35/bin \
# The below PATH entries are inherited from the `/usr/bin/env` on macOS, Linux is another story
@@ -54,6 +50,7 @@ $HOME/.config/yarn/bin \
# /sbin \
# /bin \

# TODO remove entries from $PATH if their not in the above list
for p in $paths
if not contains $p $PATH; and test -d $p
# append PATH entries, ie. top entry appears first in PATH

This file was deleted.

Oops, something went wrong.
@@ -18,10 +18,9 @@
set fish_greeting "" # disable default fish greeting

if status --is-interactive
source $HOME/.config/fish/interactive.fish
source $HOME/.config/fish/interactive.fish # interactive.fish sources files contained within `~/.config/fish/interactive/`

# Base16 Shell - a sane colorscheme for better shell colors 🌈
# eval sh $HOME/.config/base16-shell/scripts/base16-default-dark.sh
set BASE16_SHELL "$HOME/.config/base16-shell"
source "$BASE16_SHELL/profile_helper.fish"
end
@@ -37,6 +36,7 @@ set -gx XDG_CACHE_HOME $HOME/.cache
set -gx XDG_CONFIG_DATA $HOME/.local/share
set -gx code /opt/code
set -gx github /opt/code/github
set -gx gitlab /opt/code/gitlab
set -gx private /opt/code/github/PRIVATE
set -gx public /opt/code/github/PUBLIC
set -gx fish_emoji_width 2 # NOT COMPATIBLE with fish <= 2.7.1
@@ -105,7 +105,8 @@ if type -q fzf
# --follow: Follow symlinks
# --glob: Additional conditions for search (in this case ignore everything in the .git/ folder)
if type -q rg
set -gx FZF_DEFAULT_COMMAND 'rg --files --no-ignore --hidden --follow --glob "!.git/*"'
set -gx FZF_DEFAULT_COMMAND 'rg \
--files --no-ignore --hidden --follow --glob "!.git/*"'
else
# DO SOMETHING!
end
@@ -157,8 +158,14 @@ case Darwin
#########################
# Add check for syntax highlighting for `less`
##
[ -x "/usr/local/share/nvim/runtime/macros/less.sh" ]; and \
alias less='/usr/local/share/nvim/runtime/macros/less.sh';
if not test -x "/usr/local/share/nvim/runtime/macros/less.sh" \
-a -L "$HOME/.local/bin/less"
# ln -sf /usr/local/share/nvim/runtime/macros/less.sh $dots/jobs/bin/less
alias less='$brew_prefix/share/nvim/runtime/macros/less.sh';
# alias less='/home/linuxbrew/.linuxbrew/share/nvim/runtime/macros/less.sh';

# echo "less ln made"
end
else if type -q vim
set -gx EDITOR /usr/local/bin/vim
set -gx VISUAL /usr/local/binvim
@@ -1,18 +1,11 @@
##############################
# fish shell - interactive.fish
##
# TODO: repeating the below expression `if test -f $HOME` seems like a code πŸ‘ƒ

# Load abbreviations.
if test -f $HOME/.config/fish/abbreviations.fish
source $HOME/.config/fish/abbreviations.fish
end

if test -f $HOME/.config/fish/aliases.fish
source $HOME/.config/fish/aliases.fish
end

if test -f $HOME/.asdf/asdf.fish
# Get asdf version manager working with fish.
# NOTE abbr(s) and aliases set within the interactive fish files will need to reset everytime fish is reinitialized or else the will no persist when running `exec fish`
if test -d $HOME/.config/fish/interactive
for f in $HOME/.config/fish/interactive/*.fish
source $f
end
source $HOME/.asdf/asdf.fish
end
Oops, something went wrong.

0 comments on commit ea67091

Please sign in to comment.