diff --git a/.gitignore b/.gitignore
index 8676393..f2da019 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@ config/fzf
config/cheat/cheatsheets/pure-bash-bible/*
config/cheat/cheatsheets/tldr/*
config/git/credentials
+config/npm/npmrc
config/zsh/.zcompdump
ssh/local.d/*
!ssh/local.d/.gitkeep
diff --git a/base/angular-config.json b/base/angular-config.json
deleted file mode 100644
index 20d8187..0000000
--- a/base/angular-config.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "version": 1,
- "cli": {
- "analytics": false
- }
-}
\ No newline at end of file
diff --git a/base/zshrc b/base/zshrc
index 1853795..24e8e14 100644
--- a/base/zshrc
+++ b/base/zshrc
@@ -1,13 +1,6 @@
# this is my zsh config. there are many like it, but this one is mine.
# shellcheck shell=bash
-# Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.zshrc.
-# Initialization code that may require console input (password prompts, [y/n]
-# confirmations, etc.) must go above this block; everything else may go below.
-if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then
- source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
-fi
-
# Defaults
export DOTFILES="$HOME/.dotfiles"
# shellcheck source=shared.sh
@@ -38,14 +31,13 @@ x-dc "$ZSH_CUSTOM_COMPLETION_PATH"
# Add completion scripts to zsh path
FPATH="$ZSH_CUSTOM_COMPLETION_PATH:$FPATH"
autoload -Uz compinit
-compinit -d "$XDG_CACHE_HOME"/zsh/zcompdump-"$ZSH_VERSION"
if type brew &>/dev/null
then
FPATH="$(brew --prefix)/share/zsh/site-functions:${FPATH}"
- compinit -d "$XDG_CACHE_HOME"/zsh/zcompdump-"$ZSH_VERSION"
fi
+compinit -d "$XDG_CACHE_HOME"/zsh/zcompdump-"$ZSH_VERSION"
# Import ssh keys in keychain
ssh-add -A 2>/dev/null;
@@ -67,8 +59,6 @@ have antigen && {
[ -f "${DOTFILES}/config/fzf/fzf.zsh" ] \
&& source "${DOTFILES}/config/fzf/fzf.zsh"
-export LESSHISTFILE="$XDG_CACHE_HOME"/less_history
-
# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
export P10K_LOCATION="$XDG_CONFIG_HOME/zsh/p10k.zsh"
[[ ! -f $P10K_LOCATION ]] || source $P10K_LOCATION
diff --git a/config/exports b/config/exports
index 9cf3c4c..cab3457 100755
--- a/config/exports
+++ b/config/exports
@@ -17,16 +17,11 @@ export XDG_BIN_HOME="$HOME/.local/bin"
export XDG_CACHE_HOME="$HOME/.cache"
export XDG_RUNTIME_DIR="$HOME/.local/run"
-eval "$(brew shellenv)"
-
-export HOMEBREW_PREFIX="$XDG_STATE_HOME/homebrew"
-
-export HOMEBREW_BIN="$HOMEBREW_PREFIX/bin"
-export HOMEBREW_PKG="$HOMEBREW_PREFIX/opt"
-export HOMEBREW_SBIN="$HOMEBREW_PREFIX/sbin"
+path_append "/opt/homebrew/bin"
+have brew && eval "$(brew shellenv)"
path_append "/usr/local/bin"
-path_prepend "$XDG_BIN_HOME"
+path_append "$XDG_BIN_HOME"
# brew, https://brew.sh
have brew && {
diff --git a/config/exports-apps b/config/exports-apps
index a1f26e1..f42485d 100755
--- a/config/exports-apps
+++ b/config/exports-apps
@@ -77,6 +77,8 @@ export NVM_DIR="$XDG_CONFIG_HOME/nvm"
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm
[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion
+export NPM_CONFIG_USERCONFIG="$XDG_CONFIG_HOME"/npm/npmrc
+
# Add npm packages to path
have node && {
NVM_NODE_BIN_DIR="$(dirname "$(which node)")"
@@ -115,7 +117,7 @@ have gem && path_append "$(gem environment gemdir)/bin"
have rbenv && eval "$(rbenv init - zsh)"
# Rust / cargo
-export CARGO_HOME="$XDG_STATE_HOME/cargo"
+export CARGO_HOME="$XDG_DATA_HOME/cargo"
path_append "$CARGO_HOME/bin"
# screen
diff --git a/config/homebrew/Brewfile b/config/homebrew/Brewfile
index 11c7281..173565d 100644
--- a/config/homebrew/Brewfile
+++ b/config/homebrew/Brewfile
@@ -62,6 +62,8 @@ brew "asdf"
brew "aspell"
# Official Amazon AWS command-line interface
brew "awscli"
+# Bourne-Again SHell, a UNIX command interpreter
+brew "bash"
# Clone of cat(1) with syntax highlighting and Git integration
brew "bat"
# Yet another cross-platform graphical process/system monitor
@@ -102,12 +104,6 @@ brew "dotenv-linter"
brew "editorconfig-checker"
# Useful examples at the command-line
brew "eg-examples"
-# C/C++ and Java libraries for Unicode and globalization
-brew "icu4c"
-# OpenType text shaping engine
-brew "harfbuzz"
-# Development kit for the Java programming language
-brew "openjdk"
# Run arbitrary commands when files change
brew "entr"
# Perl lib for reading and writing EXIF metadata
@@ -156,6 +152,10 @@ brew "gpgme"
brew "gpg-tui"
# Image manipulation
brew "netpbm"
+# C/C++ and Java libraries for Unicode and globalization
+brew "icu4c"
+# OpenType text shaping engine
+brew "harfbuzz"
# Framework for layout and rendering of i18n text
brew "pango"
# Library to render SVG files using Cairo
@@ -210,6 +210,8 @@ brew "nvm"
brew "openjdk@11"
# Generate clients, server & docs from an OpenAPI spec (v2, v3)
brew "openapi-generator"
+# Development kit for the Java programming language
+brew "openjdk"
# Swiss-army knife of markup format conversion
brew "pandoc"
# Highly capable, feature-rich programming language
diff --git a/config/iterm2/com.googlecode.iterm2.plist b/config/iterm2/com.googlecode.iterm2.plist
index ca2fc93..00cbf81 100644
--- a/config/iterm2/com.googlecode.iterm2.plist
+++ b/config/iterm2/com.googlecode.iterm2.plist
@@ -377,208 +377,208 @@
Alpha Component
1
Blue Component
- 0.35294117647058826
+ 0.11764705926179886
Color Space
sRGB
Green Component
- 0.27843137254901962
+ 0.098039217293262482
Red Component
- 0.27058823529411763
+ 0.078431375324726105
Ansi 1 Color
Alpha Component
1
Blue Component
- 0.6588235294117647
+ 0.16300037503242493
Color Space
sRGB
Green Component
- 0.54509803921568623
+ 0.23660069704055786
Red Component
- 0.95294117647058818
+ 0.7074432373046875
Ansi 10 Color
Alpha Component
1
Blue Component
- 0.63137254901960782
+ 0.56541937589645386
Color Space
sRGB
Green Component
- 0.8901960784313725
+ 0.9042816162109375
Red Component
- 0.65098039215686276
+ 0.3450070321559906
Ansi 11 Color
Alpha Component
1
Blue Component
- 0.68627450980392157
+ 0.0
Color Space
sRGB
Green Component
- 0.88627450980392153
+ 0.8833775520324707
Red Component
- 0.97647058823529409
+ 0.9259033203125
Ansi 12 Color
Alpha Component
1
Blue Component
- 0.98039215686274506
+ 0.9485321044921875
Color Space
sRGB
Green Component
- 0.70588235294117652
+ 0.67044717073440552
Red Component
- 0.53725490196078429
+ 0.65349078178405762
Ansi 13 Color
Alpha Component
1
Blue Component
- 0.90588235294117647
+ 0.8821563720703125
Color Space
sRGB
Green Component
- 0.76078431372549016
+ 0.4927266538143158
Red Component
- 0.96078431372549022
+ 0.8821563720703125
Ansi 14 Color
Alpha Component
1
Blue Component
- 0.83529411764705885
+ 1
Color Space
sRGB
Green Component
- 0.88627450980392153
+ 0.99263292551040649
Red Component
- 0.58039215686274515
+ 0.37597531080245972
Ansi 15 Color
Alpha Component
1
Blue Component
- 0.78431372549019607
+ 1
Color Space
sRGB
Green Component
- 0.67843137254901964
+ 1
Red Component
- 0.65098039215686276
+ 0.99999600648880005
Ansi 2 Color
Alpha Component
1
Blue Component
- 0.63137254901960782
+ 0.0
Color Space
sRGB
Green Component
- 0.8901960784313725
+ 0.7607843279838562
Red Component
- 0.65098039215686276
+ 0.0
Ansi 3 Color
Alpha Component
1
Blue Component
- 0.68627450980392157
+ 0.0
Color Space
sRGB
Green Component
- 0.88627450980392153
+ 0.76959484815597534
Red Component
- 0.97647058823529409
+ 0.78058648109436035
Ansi 4 Color
Alpha Component
1
Blue Component
- 0.98039215686274506
+ 0.78216177225112915
Color Space
sRGB
Green Component
- 0.70588235294117652
+ 0.26474356651306152
Red Component
- 0.53725490196078429
+ 0.15404300391674042
Ansi 5 Color
Alpha Component
1
Blue Component
- 0.90588235294117647
+ 0.74494361877441406
Color Space
sRGB
Green Component
- 0.76078431372549016
+ 0.24931684136390686
Red Component
- 0.96078431372549022
+ 0.752197265625
Ansi 6 Color
Alpha Component
1
Blue Component
- 0.83529411764705885
+ 0.78166204690933228
Color Space
sRGB
Green Component
- 0.88627450980392153
+ 0.77425903081893921
Red Component
- 0.58039215686274515
+ 0.0
Ansi 7 Color
Alpha Component
1
Blue Component
- 0.87058823529411766
+ 0.78104829788208008
Color Space
sRGB
Green Component
- 0.76078431372549016
+ 0.78105825185775757
Red Component
- 0.72941176470588232
+ 0.7810397744178772
Ansi 8 Color
Alpha Component
1
Blue Component
- 0.4392156862745098
+ 0.4078223705291748
Color Space
sRGB
Green Component
- 0.35686274509803922
+ 0.40782788395881653
Red Component
- 0.34509803921568627
+ 0.40781760215759277
Ansi 9 Color
Alpha Component
1
Blue Component
- 0.6588235294117647
+ 0.45833224058151245
Color Space
sRGB
Green Component
- 0.54509803921568623
+ 0.47524076700210571
Red Component
- 0.95294117647058818
+ 0.8659515380859375
BM Growl
@@ -587,13 +587,13 @@
Alpha Component
1
Blue Component
- 0.1803921568627451
+ 0.12103271484375
Color Space
sRGB
Green Component
- 0.11764705882352941
+ 0.099111050367355347
Red Component
- 0.11764705882352941
+ 0.0806884765625
Background Image Location
@@ -602,11 +602,11 @@
Alpha Component
0.5
Blue Component
- 0.0
+ 1
Color Space
sRGB
Green Component
- 0.14910030364990234
+ 1
Red Component
1
@@ -621,13 +621,13 @@
Alpha Component
1
Blue Component
- 0.95686274509803926
+ 1
Color Space
sRGB
Green Component
- 0.83921568627450982
+ 1
Red Component
- 0.80392156862745101
+ 0.99999600648880005
Character Encoding
4
@@ -642,40 +642,42 @@
Alpha Component
1
Blue Component
- 0.86274509803921573
+ 0.99998724460601807
Color Space
sRGB
Green Component
- 0.8784313725490196
+ 1
Red Component
- 0.96078431372549022
+ 0.99997633695602417
Cursor Guide Color
Alpha Component
- 0.070000000000000007
+ 0.25
Blue Component
- 0.95686274509803926
+ 1
Color Space
sRGB
Green Component
- 0.83921568627450982
+ 0.9268307089805603
Red Component
- 0.80392156862745101
+ 0.70213186740875244
Cursor Text Color
Alpha Component
1
Blue Component
- 0.95686274509803926
+ 0.0
Color Space
sRGB
Green Component
- 0.83921568627450982
+ 0.0
Red Component
- 0.80392156862745101
+ 0.0
+ Cursor Type
+ 1
Custom Command
No
Custom Directory
@@ -695,13 +697,13 @@
Alpha Component
1
Blue Component
- 0.95686274509803926
+ 0.86198854446411133
Color Space
sRGB
Green Component
- 0.83921568627450982
+ 0.86199951171875
Red Component
- 0.80392156862745101
+ 0.86197912693023682
Guid
B563F48B-314D-48CC-908E-ACA971D430BE
@@ -1004,13 +1006,13 @@
Alpha Component
1
Blue Component
- 0.92156862745098034
+ 0.9337158203125
Color Space
sRGB
Green Component
- 0.86274509803921573
+ 0.55789834260940552
Red Component
- 0.53725490196078429
+ 0.19802422821521759
Mouse Reporting
@@ -1035,7 +1037,7 @@
Right Option Key Sends
0
Rows
- 25
+ 40
Screen
-1
Scrollback Lines
@@ -1045,26 +1047,26 @@
Alpha Component
1
Blue Component
- 0.95686274509803926
+ 0.0
Color Space
sRGB
Green Component
- 0.83921568627450982
+ 0.0
Red Component
- 0.80392156862745101
+ 0.0
Selection Color
Alpha Component
1
Blue Component
- 0.4392156862745098
+ 1
Color Space
sRGB
Green Component
- 0.35686274509803922
+ 0.84313726425170898
Red Component
- 0.34509803921568627
+ 0.70196080207824707
Send Code When Idle