diff --git a/.gitmodules b/.gitmodules index 4c171ea..24d0358 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,12 +1,12 @@ [submodule "link/vim-config"] path = link/vim-config url = https://github.com/tedkulp/vim-config.git -[submodule "link/.emacs.d"] - path = link/.emacs.d - url = https://github.com/syl20bnr/spacemacs.git [submodule "link/zgen"] path = link/zgen url = https://github.com/tarjoilija/zgen.git [submodule "link/zsh-quickstart-kit"] path = link/zsh-quickstart-kit url = https://github.com/unixorn/zsh-quickstart-kit.git +[submodule "link/.tmux"] + path = link/.tmux + url = https://github.com/gpakosz/.tmux.git diff --git a/brew b/brew index 3ad1ea3..7db7224 100755 --- a/brew +++ b/brew @@ -28,7 +28,6 @@ brew upgrade brew install ack brew install ag -brew install ansible brew install antigen brew install apple-gcc42 brew install awscli @@ -36,11 +35,10 @@ brew install chruby brew install coreutils brew install docker brew install docker-compose -brew install docker-machine brew install elixir -brew install emacs --HEAD --use-git-head --with-cocoa --with-gnutls --with-rsvg --with-imagemagick brew install erlang brew install ffmpeg +brew install fx brew install gdbm brew install git brew install gnupg2 @@ -58,7 +56,6 @@ brew install maven brew install mkvtoolnix brew install ngrok2 brew install nmap -brew install nvm brew install openssl brew install pandoc brew install phantomjs @@ -67,7 +64,6 @@ brew install reattach-to-user-namespace brew install ruby-install brew install stow brew install teensy_loader_cli -brew install tesseract brew install the_platinum_searcher brew install the_silver_searcher brew install tmux diff --git a/cask b/cask index 92f3fca..3167bbd 100755 --- a/cask +++ b/cask @@ -13,50 +13,48 @@ if [ -x "$brew_path" ] ; then brew cask install "${@}" } - ## TODO: Update after JG contract is over installcask java8 + installcask 1password installcask adobe-creative-cloud installcask alfred + installcask anki installcask arq - installcask atom installcask bartender installcask bettertouchtool + installcask burp-suite + installcask daisydisk installcask dash installcask discord installcask dropbox installcask firefox installcask fluid - installcask gitter - installcask gitup installcask google-chrome - installcask google-earth - installcask gopro-studio installcask handbrake installcask handbrakecli installcask hazel + installcask hyper-canary installcask imazing installcask istat-menus installcask iterm2 - installcask java8 installcask keycastr - installcask mactex - installcask makemkv installcask microsoft-office installcask moom + installcask nextcloud installcask ngrok installcask postman - installcask resilio-sync + installcask robo-3t installcask rowanj-gitx - installcask sharemouse + installcask secure-pipes + installcask sequel-pro installcask shimo installcask skype installcask slack installcask spotify + installcask superduper installcask teamviewer - installcask toggl - installcask vagrant installcask virtualbox + installcask visual-studio-code installcask vlc installcask whatsapp else diff --git a/data/Fira Code iScript/FiraCode-Bold.ttf b/data/Fira Code iScript/FiraCode-Bold.ttf new file mode 100644 index 0000000..0d78eef Binary files /dev/null and b/data/Fira Code iScript/FiraCode-Bold.ttf differ diff --git a/data/Fira Code iScript/FiraCode-Light.ttf b/data/Fira Code iScript/FiraCode-Light.ttf new file mode 100644 index 0000000..18b9e9a Binary files /dev/null and b/data/Fira Code iScript/FiraCode-Light.ttf differ diff --git a/data/Fira Code iScript/FiraCode-Medium.ttf b/data/Fira Code iScript/FiraCode-Medium.ttf new file mode 100644 index 0000000..d106632 Binary files /dev/null and b/data/Fira Code iScript/FiraCode-Medium.ttf differ diff --git a/data/Fira Code iScript/FiraCode-Regular.ttf b/data/Fira Code iScript/FiraCode-Regular.ttf new file mode 100644 index 0000000..0fb0817 Binary files /dev/null and b/data/Fira Code iScript/FiraCode-Regular.ttf differ diff --git a/data/Fira Code iScript/FiraCode-Retina.ttf b/data/Fira Code iScript/FiraCode-Retina.ttf new file mode 100644 index 0000000..5bbb74b Binary files /dev/null and b/data/Fira Code iScript/FiraCode-Retina.ttf differ diff --git a/data/Fira Code iScript/FiraCodeiScript-Bold.ttf b/data/Fira Code iScript/FiraCodeiScript-Bold.ttf new file mode 100644 index 0000000..8ae6863 Binary files /dev/null and b/data/Fira Code iScript/FiraCodeiScript-Bold.ttf differ diff --git a/data/Fira Code iScript/FiraCodeiScript-Italic.ttf b/data/Fira Code iScript/FiraCodeiScript-Italic.ttf new file mode 100644 index 0000000..aa86bb4 Binary files /dev/null and b/data/Fira Code iScript/FiraCodeiScript-Italic.ttf differ diff --git a/data/Fira Code iScript/FiraCodeiScript-Regular.ttf b/data/Fira Code iScript/FiraCodeiScript-Regular.ttf new file mode 100644 index 0000000..b63a446 Binary files /dev/null and b/data/Fira Code iScript/FiraCodeiScript-Regular.ttf differ diff --git a/data/Fira Code iScript/FiraFlott-Italic.ttf b/data/Fira Code iScript/FiraFlott-Italic.ttf new file mode 100644 index 0000000..6530d14 Binary files /dev/null and b/data/Fira Code iScript/FiraFlott-Italic.ttf differ diff --git a/data/Fira Code iScript/FiraFlott-Medium.ttf b/data/Fira Code iScript/FiraFlott-Medium.ttf new file mode 100644 index 0000000..82b4879 Binary files /dev/null and b/data/Fira Code iScript/FiraFlott-Medium.ttf differ diff --git a/data/SolarizedDark.itermcolors b/data/SolarizedDark.itermcolors deleted file mode 100644 index ed31a4a..0000000 --- a/data/SolarizedDark.itermcolors +++ /dev/null @@ -1,213 +0,0 @@ - - - - - Ansi 0 Color - - Blue Component - 0.19370138645172119 - Green Component - 0.15575926005840302 - Red Component - 0.0 - - Ansi 1 Color - - Blue Component - 0.14145714044570923 - Green Component - 0.10840655118227005 - Red Component - 0.81926977634429932 - - Ansi 10 Color - - Blue Component - 0.38298487663269043 - Green Component - 0.35665956139564514 - Red Component - 0.27671992778778076 - - Ansi 11 Color - - Blue Component - 0.43850564956665039 - Green Component - 0.40717673301696777 - Red Component - 0.32436618208885193 - - Ansi 12 Color - - Blue Component - 0.51685798168182373 - Green Component - 0.50962930917739868 - Red Component - 0.44058024883270264 - - Ansi 13 Color - - Blue Component - 0.72908437252044678 - Green Component - 0.33896297216415405 - Red Component - 0.34798634052276611 - - Ansi 14 Color - - Blue Component - 0.56363654136657715 - Green Component - 0.56485837697982788 - Red Component - 0.50599193572998047 - - Ansi 15 Color - - Blue Component - 0.86405980587005615 - Green Component - 0.95794391632080078 - Red Component - 0.98943418264389038 - - Ansi 2 Color - - Blue Component - 0.020208755508065224 - Green Component - 0.54115492105484009 - Red Component - 0.44977453351020813 - - Ansi 3 Color - - Blue Component - 0.023484811186790466 - Green Component - 0.46751424670219421 - Red Component - 0.64746475219726562 - - Ansi 4 Color - - Blue Component - 0.78231418132781982 - Green Component - 0.46265947818756104 - Red Component - 0.12754884362220764 - - Ansi 5 Color - - Blue Component - 0.43516635894775391 - Green Component - 0.10802463442087173 - Red Component - 0.77738940715789795 - - Ansi 6 Color - - Blue Component - 0.52502274513244629 - Green Component - 0.57082360982894897 - Red Component - 0.14679534733295441 - - Ansi 7 Color - - Blue Component - 0.79781103134155273 - Green Component - 0.89001238346099854 - Red Component - 0.91611063480377197 - - Ansi 8 Color - - Blue Component - 0.15170273184776306 - Green Component - 0.11783610284328461 - Red Component - 0.0 - - Ansi 9 Color - - Blue Component - 0.073530435562133789 - Green Component - 0.21325300633907318 - Red Component - 0.74176257848739624 - - Background Color - - Blue Component - 0.15170273184776306 - Green Component - 0.11783610284328461 - Red Component - 0.0 - - Bold Color - - Blue Component - 0.56363654136657715 - Green Component - 0.56485837697982788 - Red Component - 0.50599193572998047 - - Cursor Color - - Blue Component - 0.51685798168182373 - Green Component - 0.50962930917739868 - Red Component - 0.44058024883270264 - - Cursor Text Color - - Blue Component - 0.19370138645172119 - Green Component - 0.15575926005840302 - Red Component - 0.0 - - Foreground Color - - Blue Component - 0.51685798168182373 - Green Component - 0.50962930917739868 - Red Component - 0.44058024883270264 - - Selected Text Color - - Blue Component - 0.56363654136657715 - Green Component - 0.56485837697982788 - Red Component - 0.50599193572998047 - - Selection Color - - Blue Component - 0.19370138645172119 - Green Component - 0.15575926005840302 - Red Component - 0.0 - - - diff --git a/data/com.googlecode.iterm2.plist b/data/com.googlecode.iterm2.plist deleted file mode 100644 index c76aea2..0000000 Binary files a/data/com.googlecode.iterm2.plist and /dev/null differ diff --git a/link/.hyper.js b/link/.hyper.js new file mode 100644 index 0000000..6ae6ad3 --- /dev/null +++ b/link/.hyper.js @@ -0,0 +1,162 @@ +// Future versions of Hyper may add additional config options, +// which will not automatically be merged into this file. +// See https://hyper.is#cfg for all currently supported options. + +module.exports = { + config: { + // choose either `'stable'` for receiving highly polished, + // or `'canary'` for less polished but more frequent updates + updateChannel: 'canary', + + // default font size in pixels for all tabs + fontSize: 12, + + // font family with optional fallbacks + fontFamily: "'Fira Code iScript', PragmataPro for Powerline Plus Nerd File Types, Menlo, Monaco, 'Courier New', monospace", + + // default font weight: 'normal' or 'bold' + fontWeight: 'normal', + + // font weight for bold characters: 'normal' or 'bold' + fontWeightBold: 'bold', + + // line height as a relative unit + lineHeight: 1, + + // letter spacing as a relative unit + letterSpacing: 0, + + // terminal cursor background color and opacity (hex, rgb, hsl, hsv, hwb or cmyk) + cursorColor: 'rgba(248,28,229,0.8)', + + // terminal text color under BLOCK cursor + cursorAccentColor: '#000', + + // `'BEAM'` for |, `'UNDERLINE'` for _, `'BLOCK'` for █ + cursorShape: 'BLOCK', + + // set to `true` (without backticks and without quotes) for blinking cursor + cursorBlink: false, + + // color of the text + foregroundColor: '#fff', + + // terminal background color + // opacity is only supported on macOS + backgroundColor: '#000', + + // terminal selection color + selectionColor: 'rgba(248,28,229,0.3)', + + // border color (window, tabs) + borderColor: '#333', + + // custom CSS to embed in the main window + css: '', + + // custom CSS to embed in the terminal window + termCSS: '', + + // if you're using a Linux setup which show native menus, set to false + // default: `true` on Linux, `true` on Windows, ignored on macOS + showHamburgerMenu: '', + + // set to `false` (without backticks and without quotes) if you want to hide the minimize, maximize and close buttons + // additionally, set to `'left'` if you want them on the left, like in Ubuntu + // default: `true` (without backticks and without quotes) on Windows and Linux, ignored on macOS + showWindowControls: '', + + // custom padding (CSS format, i.e.: `top right bottom left`) + padding: '12px 14px', + + // the full list. if you're going to provide the full color palette, + // including the 6 x 6 color cubes and the grayscale map, just provide + // an array here instead of a color map object + colors: { + black: '#000000', + red: '#C51E14', + green: '#1DC121', + yellow: '#C7C329', + blue: '#0A2FC4', + magenta: '#C839C5', + cyan: '#20C5C6', + white: '#C7C7C7', + lightBlack: '#686868', + lightRed: '#FD6F6B', + lightGreen: '#67F86F', + lightYellow: '#FFFA72', + lightBlue: '#6A76FB', + lightMagenta: '#FD7CFC', + lightCyan: '#68FDFE', + lightWhite: '#FFFFFF', + }, + + // the shell to run when spawning a new session (i.e. /usr/local/bin/fish) + // if left empty, your system's login shell will be used by default + // + // Windows + // - Make sure to use a full path if the binary name doesn't work + // - Remove `--login` in shellArgs + // + // Bash on Windows + // - Example: `C:\\Windows\\System32\\bash.exe` + // + // PowerShell on Windows + // - Example: `C:\\WINDOWS\\System32\\WindowsPowerShell\\v1.0\\powershell.exe` + shell: '', + + // for setting shell arguments (i.e. for using interactive shellArgs: `['-i']`) + // by default `['--login']` will be used + shellArgs: ['--login'], + + // for environment variables + env: {}, + + // set to `false` for no bell + bell: 'SOUND', + + // if `true` (without backticks and without quotes), selected text will automatically be copied to the clipboard + copyOnSelect: false, + + // if `true` (without backticks and without quotes), hyper will be set as the default protocol client for SSH + defaultSSHApp: true, + + // if `true` (without backticks and without quotes), on right click selected text will be copied or pasted if no + // selection is present (`true` by default on Windows and disables the context menu feature) + quickEdit: false, + + // choose either `'vertical'`, if you want the column mode when Option key is hold during selection (Default) + // or `'force'`, if you want to force selection regardless of whether the terminal is in mouse events mode + // (inside tmux or vim with mouse mode enabled for example). + macOptionSelectionMode: 'vertical', + + // URL to custom bell + // bellSoundURL: 'http://example.com/bell.mp3', + + // Whether to use the WebGL renderer. Set it to false to use canvas-based + // rendering (slower, but supports transparent backgrounds) + webGLRenderer: true, + + // for advanced config flags please refer to https://hyper.is/#cfg + }, + + // a list of plugins to fetch and install from npm + // format: [@org/]project[#version] + // examples: + // `hyperpower` + // `@company/project` + // `project#1.0.1` + plugins: [ + //"hyper-opacity" + ], + + // in development, you can create a directory under + // `~/.hyper_plugins/local/` and include it here + // to load it and avoid it being `npm install`ed + localPlugins: [], + + keymaps: { + // Example + // 'window:devtools': 'cmd+alt+o', + }, +}; diff --git a/link/.powconfig b/link/.powconfig deleted file mode 100644 index 5082a32..0000000 --- a/link/.powconfig +++ /dev/null @@ -1,2 +0,0 @@ -source /usr/local/opt/chruby/share/chruby/chruby.sh -chruby ruby-2.0 diff --git a/link/.ruby-version b/link/.ruby-version deleted file mode 100644 index bb576db..0000000 --- a/link/.ruby-version +++ /dev/null @@ -1 +0,0 @@ -2.3 diff --git a/link/.tmux b/link/.tmux new file mode 160000 index 0000000..2b0cb0b --- /dev/null +++ b/link/.tmux @@ -0,0 +1 @@ +Subproject commit 2b0cb0b43ce7b4d212d91415390db8faf1b421df diff --git a/link/.tmux.conf b/link/.tmux.conf deleted file mode 100644 index e09e532..0000000 --- a/link/.tmux.conf +++ /dev/null @@ -1,138 +0,0 @@ -set-option -g default-command "reattach-to-user-namespace -l zsh" - -# Reset the config -unbind-key -a -source-file ~/.tmux.reset.conf - -# Set prefix to something easy -unbind C-b -set -g prefix C-a -bind a send-prefix - -# Lose the delay -set -sg escape-time 1 - -# Change base index to 1 -set -g base-index 1 -setw -g pane-base-index 1 - -# Reload config with prefix-r -bind r source-file ~/.tmux.conf \; display "Config Reloaded" - -# Last window rocks -bind C-a last-window - -# Easy keys for splitting panes -bind | split-window -h -bind - split-window -v - -# Use multiple sessions -- it's da bomb, yo -bind C-s choose-session - -# Move between panes vim style -bind h select-pane -L -bind j select-pane -D -bind k select-pane -U -bind l select-pane -R - -# Resize panes in a vim-ish style -bind -r H resize-pane -L 5 -bind -r J resize-pane -D 5 -bind -r K resize-pane -U 5 -bind -r L resize-pane -R 5 - -# Move between windows in a vim-ish style -bind -r C-h select-window -t :- -bind -r C-l select-window -t :+ - -# Change ordering of windows -bind -r C-S-Left swap-window -t -1 -bind -r C-S-Right swap-window -t +1 - -# Mouse Stuff -set -g mouse on -bind -n WheelUpPane if-shell -F -t = "#{mouse_any_flag}" "send-keys -M" "if -Ft= '#{pane_in_mode}' 'send-keys -M' 'select-pane -t=; copy-mode -e; send-keys -M'" -bind -n WheelDownPane select-pane -t= \; send-keys -M - -# Make sure 256 color and utf-8 is enabled -set -g default-terminal "screen-256color" - -# Center the window list -set -g status-justify centre - -# Update the status bar every sixty seconds -set -g status-interval 60 - -# enable vi keys. -setw -g mode-keys vi -set-window-option -g xterm-keys on - -# Show changes in other windows -setw -g monitor-activity on -set -g visual-activity on - -# pane movement -bind-key C-j command-prompt -p "join pane from:" "join-pane -s '%%'" -bind-key s command-prompt -p "send pane to:" "join-pane -t '%%'" -bind-key C-b break-pane -t : - -# Copy/paste like vim -- Updated for 2.4 -bind-key -T copy-mode-vi v send-keys -X begin-selection -bind-key -T copy-mode-vi y send-keys -X copy-pipe-and-cancel "reattach-to-user-namespace pbcopy" -bind-key -T copy-mode-vi Escape send-keys -X cancel -bind-key -T copy-mode-vi V send-keys -X rectangle-toggle - -unbind -T copy-mode-vi Enter -bind-key -T copy-mode-vi Enter send-keys -X copy-pipe-and-cancel "reattach-to-user-namespace pbcopy" - -#### COLOUR - -# default statusbar colors -set-option -g status-bg colour235 #base02 -set-option -g status-fg colour136 #yellow -set-option -g status-attr default - -set-window-option -g window-status-activity-fg colour1 #red -set-window-option -g window-status-activity-bg colour235 -# set-window-option -g window-status-activity-attr bright - -# default window title colors -set-window-option -g window-status-fg colour166 #orange -set-window-option -g window-status-bg default -# set-window-option -g window-status-attr dim - -# active window title colors -set-window-option -g window-status-current-fg colour166 #orange -set-window-option -g window-status-current-bg default -#set-window-option -g window-status-current-attr bright - -# pane border -set-option -g pane-border-fg colour235 #base02 -set-option -g pane-active-border-fg colour240 #base01 - -# message text -set-option -g message-bg colour235 #base02 -set-option -g message-fg colour166 #orange - -# pane number display -set-option -g display-panes-active-colour colour33 #blue -set-option -g display-panes-colour colour166 #orange - -# clock -set-window-option -g clock-mode-colour colour64 #green - -# Renumber windows -set-option -g renumber-windows on - -#### Status Bar - -# Powerline symbols: ⮂ ⮃ ⮀ ⮁ ⭤ -set -g status-left-length 32 -set -g status-right-length 150 -set -g status-interval 5 - -set -g status-left '#[reverse] Session: #S #[noreverse]⮀ #I ⮁ #P' -set -g status-right '%R ⮃ %d %b ⮂#[reverse] #h ' - -set -g window-status-format ' #I #W ' -set -g window-status-current-format '⮂#[reverse] #I #W #[noreverse]⮀' diff --git a/link/.tmux.reset.conf b/link/.tmux.reset.conf deleted file mode 100644 index 3e12db7..0000000 --- a/link/.tmux.reset.conf +++ /dev/null @@ -1,73 +0,0 @@ -bind-key C-b send-prefix -bind-key C-o rotate-window -bind-key C-z suspend-client -bind-key Space next-layout -bind-key ! break-pane -bind-key '"' split-window -bind-key '#' list-buffers -bind-key '$' command-prompt -I '#S' "rename-session '%%'" -bind-key % split-window -h -bind-key & confirm-before -p "kill-window #W? (y/n)" kill-window -bind-key "'" command-prompt -p index "select-window -t ':%%'" -bind-key ( switch-client -p -bind-key ) switch-client -n -bind-key , command-prompt -I '#W' "rename-window '%%'" -bind-key - delete-buffer -bind-key . command-prompt "move-window -t '%%'" -bind-key 0 select-window -t :0 -bind-key 1 select-window -t :1 -bind-key 2 select-window -t :2 -bind-key 3 select-window -t :3 -bind-key 4 select-window -t :4 -bind-key 5 select-window -t :5 -bind-key 6 select-window -t :6 -bind-key 7 select-window -t :7 -bind-key 8 select-window -t :8 -bind-key 9 select-window -t :9 -bind-key : command-prompt -bind-key \; last-pane -bind-key = choose-buffer -bind-key ? list-keys -bind-key D choose-client -bind-key L switch-client -l -bind-key [ copy-mode -bind-key ] paste-buffer -bind-key c new-window -bind-key d detach-client -bind-key f command-prompt "find-window '%%'" -bind-key i display-message -bind-key l last-window -bind-key n next-window -bind-key o select-pane -t :.+ -bind-key p previous-window -bind-key q display-panes -bind-key r refresh-client -bind-key s choose-tree -bind-key t clock-mode -bind-key w choose-window -bind-key x confirm-before -p "kill-pane #P? (y/n)" kill-pane -bind-key z resize-pane -Z -bind-key { swap-pane -U -bind-key } swap-pane -D -bind-key '~' show-messages -bind-key PPage copy-mode -u -bind-key -r Up select-pane -U -bind-key -r Down select-pane -D -bind-key -r Left select-pane -L -bind-key -r Right select-pane -R -bind-key M-1 select-layout even-horizontal -bind-key M-2 select-layout even-vertical -bind-key M-3 select-layout main-horizontal -bind-key M-4 select-layout main-vertical -bind-key M-5 select-layout tiled -bind-key M-n next-window -a -bind-key M-o rotate-window -D -bind-key M-p previous-window -a -bind-key -r M-Up resize-pane -U 5 -bind-key -r M-Down resize-pane -D 5 -bind-key -r M-Left resize-pane -L 5 -bind-key -r M-Right resize-pane -R 5 -bind-key -r C-Up resize-pane -U -bind-key -r C-Down resize-pane -D -bind-key -r C-Left resize-pane -L -bind-key -r C-Right resize-pane -R diff --git a/link/.yarnrc b/link/.yarnrc new file mode 100644 index 0000000..30cb5cb --- /dev/null +++ b/link/.yarnrc @@ -0,0 +1,6 @@ +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. +# yarn lockfile v1 + + +registry "https://registry.npmjs.org" +lastUpdateCheck 1551185681156 diff --git a/link/.zgen-local-plugins b/link/.zgen-local-plugins index 2006132..f96e848 100644 --- a/link/.zgen-local-plugins +++ b/link/.zgen-local-plugins @@ -46,30 +46,30 @@ zgen load djui/alias-tips zgen load unixorn/git-extra-commands # Add my bitbucket git helpers plugin -zgen load unixorn/bitbucket-git-helpers.plugin.zsh +# zgen load unixorn/bitbucket-git-helpers.plugin.zsh # A collection of scripts that might be useful to sysadmins -zgen load skx/sysadmin-util +# zgen load skx/sysadmin-util # Adds aliases to open your current repo & branch on github. zgen load peterhurford/git-it-on.zsh # Tom Limoncelli's tooling for storing private information (keys, etc) # in a repository securely by encrypting them with gnupg -zgen load StackExchange/blackbox +# zgen load StackExchange/blackbox # Load some oh-my-zsh plugins zgen oh-my-zsh plugins/pip zgen oh-my-zsh plugins/sudo -zgen oh-my-zsh plugins/aws +# zgen oh-my-zsh plugins/aws zgen oh-my-zsh plugins/chruby zgen oh-my-zsh plugins/colored-man-pages zgen oh-my-zsh plugins/git zgen oh-my-zsh plugins/github zgen oh-my-zsh plugins/python -zgen oh-my-zsh plugins/rsync -zgen oh-my-zsh plugins/screen -zgen oh-my-zsh plugins/vagrant +# zgen oh-my-zsh plugins/rsync +# zgen oh-my-zsh plugins/screen +# zgen oh-my-zsh plugins/vagrant if [ $(uname -a | grep -ci Darwin) = 1 ]; then # Load OSX-specific plugins @@ -79,7 +79,7 @@ fi # A set of shell functions to make it easy to install small apps and # utilities distributed with pip. -zgen load sharat87/pip-app +# zgen load sharat87/pip-app zgen load chrissicool/zsh-256color @@ -95,14 +95,14 @@ GENCOMPL_FPATH=$HOME/.zsh/complete # Very cool plugin that generates zsh completion functions for commands # if they have getopt-style help text. It doesn't generate them on the fly, # you'll have to explicitly generate a completion, but it's still quite cool. -zgen load RobSis/zsh-completion-generator +# zgen load RobSis/zsh-completion-generator # Add Fish-like autosuggestions to your ZSH zgen load zsh-users/zsh-autosuggestions # k is a zsh script / plugin to make directory listings more readable, # adding a bit of color and some git status information on files and directories -zgen load rimraf/k +# zgen load rimraf/k # Bullet train prompt setup # zgen load caiogondim/bullet-train-oh-my-zsh-theme bullet-train diff --git a/link/zgen b/link/zgen index ffd3f50..0b669d2 160000 --- a/link/zgen +++ b/link/zgen @@ -1 +1 @@ -Subproject commit ffd3f50addf7a0106d9ea199025eb99efbb858f4 +Subproject commit 0b669d2d0dcf788b4c81a7a30b4fa41dfbf7d1a7 diff --git a/link/zsh-quickstart-kit b/link/zsh-quickstart-kit index ae41f7d..60fb717 160000 --- a/link/zsh-quickstart-kit +++ b/link/zsh-quickstart-kit @@ -1 +1 @@ -Subproject commit ae41f7d90132c6079962f631181eb807b1f74490 +Subproject commit 60fb717ad6f9c9eb92b5af1ecb8455317be4c66d diff --git a/post/docker-machine b/post/docker-machine deleted file mode 100644 index 63ce0fc..0000000 --- a/post/docker-machine +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -docker-machine create -d "virtualbox" --virtualbox-memory "3192" default diff --git a/post/install-fonts b/post/install-fonts new file mode 100644 index 0000000..c69ac9b --- /dev/null +++ b/post/install-fonts @@ -0,0 +1,8 @@ +#!/bin/bash + +DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" + +cd ../data +cp -v *.ttf /Library/Fonts +cd "Fira Code iScript" +cp -v *.ttf /Library/Fonts diff --git a/post/install-nvm-default b/post/install-nvm-default deleted file mode 100644 index 4fd3e39..0000000 --- a/post/install-nvm-default +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -export NVM_DIR="$HOME/.nvm" - -. $(brew --prefix nvm)/nvm.sh -nvm install node diff --git a/post/tmux-config b/post/tmux-config new file mode 100644 index 0000000..8c59646 --- /dev/null +++ b/post/tmux-config @@ -0,0 +1 @@ +ln -s .tmux/.tmux.conf ~/.tmux.conf