michael/dotfiles
1
0
Fork 0
mirror of https://github.com/m-housh/dotfiles.git synced 2026-02-13 22:02:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged develop

Browse Source
This commit is contained in:
Michael Housh
2021-12-12 15:37:49 -05:00
parent 27d87fa506
commit 1aebb07c8f
13 changed files with 174 additions and 2299 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.gitignore vendored
View File

@@ -1,2 +1,8 @@
**/.DS_Store
**/Brewfile.lock.json
**/plugins
**/.zcompdump*
**/.zcompdump
**/.zcompcache
zsh/.config/zsh/history
**/.zsh_history

1
Makefile
View File

@@ -1,6 +1,7 @@
bootstrap-homebrew:
xcode-select --install | true
/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
chmod -R go-w $(brew --prefix)/share
bootsrap-brews:
@brew bundle \

171
macOS/.config/iterm/profile.json
View File

@@ -1,46 +1,58 @@
{
"Ansi 7 Color" : {
"Green Component" : 0.73333334922790527,
"Red Component" : 0.73333334922790527,
"Blue Component" : 0.73333334922790527
"Ansi 6 Color" : {
"Green Component" : "0.5960785",
"Blue Component" : "0.6039215999999999",
"Red Component" : "0.02352941"
},
"Tags" : [
],
"Ansi 12 Color" : {
"Green Component" : 0.3333333432674408,
"Red Component" : 0.3333333432674408,
"Blue Component" : 1
"Green Component" : "0.6235294",
"Blue Component" : "0.8117647",
"Red Component" : "0.4470588"
},
"Ansi 7 Color" : {
"Green Component" : "0.8431373",
"Blue Component" : "0.8117647",
"Red Component" : "0.827451"
},
"Ansi 8 Color" : {
"Green Component" : 0.3333333432674408,
"Red Component" : 0.3333333432674408,
"Blue Component" : 0.3333333432674408
},
"Ansi 9 Color" : {
"Green Component" : 0.3333333432674408,
"Red Component" : 1,
"Blue Component" : 0.3333333432674408
"Green Component" : "0.3411765",
"Blue Component" : "0.3254902",
"Red Component" : "0.3333333"
},
"Bold Color" : {
"Green Component" : 1,
"Red Component" : 1,
"Blue Component" : 1
"Green Component" : "1",
"Blue Component" : "1",
"Red Component" : "1"
},
"Ansi 9 Color" : {
"Green Component" : "0.1607843",
"Blue Component" : "0.1607843",
"Red Component" : "0.9372549"
},
"Ansi 5 Color" : {
"Green Component" : 0,
"Red Component" : 0.73333334922790527,
"Blue Component" : 0.73333334922790527
"Green Component" : "0.3137255",
"Blue Component" : "0.4823529",
"Red Component" : "0.4588235"
},
"Use Non-ASCII Font" : false,
"Rows" : 40,
"Default Bookmark" : "No",
"Cursor Guide Color" : {
"Red Component" : 0.70214027166366577,
"Color Space" : "sRGB",
"Blue Component" : 1,
"Alpha Component" : 0.25,
"Green Component" : 0.92681378126144409
},
"Non-ASCII Anti Aliased" : true,
"Use Bright Bold" : true,
"Ansi 10 Color" : {
"Green Component" : 1,
"Red Component" : 0.3333333432674408,
"Blue Component" : 0.3333333432674408
"Green Component" : "0.8862745",
"Blue Component" : "0.2039216",
"Red Component" : "0.5411764999999999"
},
"Ambiguous Double Width" : false,
"Jobs to Ignore" : [
@@ -50,14 +62,14 @@
"telnet"
],
"Ansi 15 Color" : {
"Green Component" : 1,
"Red Component" : 1,
"Blue Component" : 1
"Green Component" : "0.9333333",
"Blue Component" : "0.9254902",
"Red Component" : "0.9333333"
},
"Foreground Color" : {
"Green Component" : 0.73333334922790527,
"Red Component" : 0.73333334922790527,
"Blue Component" : 0.73333334922790527
"Green Component" : "1",
"Blue Component" : "1",
"Red Component" : "1"
},
"Bound Hosts" : [
@@ -73,16 +85,16 @@
"Mouse Reporting" : true,
"Screen" : -1,
"Selection Color" : {
"Green Component" : 0.8353000283241272,
"Red Component" : 0.70980000495910645,
"Blue Component" : 1
"Green Component" : "0.8353",
"Blue Component" : "1",
"Red Component" : "0.7098"
},
"Columns" : 120,
"Idle Code" : 0,
"Ansi 13 Color" : {
"Green Component" : 0.3333333432674408,
"Red Component" : 1,
"Blue Component" : 1
"Green Component" : "0.4980392",
"Blue Component" : "0.6588235",
"Red Component" : "0.6784314"
},
"Custom Command" : "No",
"ASCII Anti Aliased" : true,
@@ -91,20 +103,20 @@
"Use Bold Font" : true,
"Option Key Sends" : 0,
"Selected Text Color" : {
"Green Component" : 0,
"Red Component" : 0,
"Blue Component" : 0
"Green Component" : "0",
"Blue Component" : "0",
"Red Component" : "0"
},
"Background Color" : {
"Green Component" : 0,
"Red Component" : 0,
"Blue Component" : 0
"Green Component" : "0",
"Blue Component" : "0",
"Red Component" : "0"
},
"Character Encoding" : 4,
"Ansi 11 Color" : {
"Green Component" : 1,
"Red Component" : 1,
"Blue Component" : 0.3333333432674408
"Green Component" : "0.9137255",
"Blue Component" : "0.3098039",
"Red Component" : "0.9882353"
},
"Use Italic Font" : true,
"Unlimited Scrollback" : false,
@@ -273,6 +285,13 @@
"Window Type" : 0,
"Background Image Location" : "",
"Blur" : false,
"Badge Color" : {
"Red Component" : 1,
"Color Space" : "sRGB",
"Blue Component" : 0,
"Alpha Component" : 0.5,
"Green Component" : 0.14910027384757996
},
"Scrollback Lines" : 1000,
"Send Code When Idle" : false,
"Close Sessions On End" : true,
@@ -281,56 +300,58 @@
"Flashing Bell" : false,
"Silence Bell" : false,
"Ansi 14 Color" : {
"Green Component" : 1,
"Red Component" : 0.3333333432674408,
"Blue Component" : 1
"Green Component" : "0.8862745",
"Blue Component" : "0.8862745",
"Red Component" : "0.2039216"
},
"Name" : "mhoush",
"Cursor Text Color" : {
"Green Component" : 1,
"Red Component" : 1,
"Blue Component" : 1
"Green Component" : "0",
"Blue Component" : "0",
"Red Component" : "0"
},
"Shortcut" : "",
"Cursor Color" : {
"Green Component" : 0.73333334922790527,
"Red Component" : 0.73333334922790527,
"Blue Component" : 0.73333334922790527
"Green Component" : "1",
"Blue Component" : "1",
"Red Component" : "1"
},
"Transparency" : 0.14805401741190161,
"Ansi 1 Color" : {
"Green Component" : 0,
"Red Component" : 0.73333334922790527,
"Blue Component" : 0
"Green Component" : "0",
"Blue Component" : "0",
"Red Component" : "0.8"
},
"Horizontal Spacing" : 1,
"Custom Directory" : "No",
"Ansi 4 Color" : {
"Green Component" : 0,
"Green Component" : "0.3960784",
"Blue Component" : "0.6431373",
"Red Component" : "0.2039216"
},
"Link Color" : {
"Red Component" : 0,
"Blue Component" : 0.73333334922790527
"Color Space" : "sRGB",
"Blue Component" : 0.73422712087631226,
"Alpha Component" : 1,
"Green Component" : 0.35915297269821167
},
"Ansi 0 Color" : {
"Green Component" : 0,
"Red Component" : 0,
"Blue Component" : 0
"Green Component" : "0",
"Blue Component" : "0",
"Red Component" : "0"
},
"Guid" : "3B878A03-0EF2-4A8C-B1FD-7DEF4A0ABF6F",
"Normal Font" : "InconsolataNerdFontCompleteM-Regular 16",
"Ansi 3 Color" : {
"Green Component" : 0.73333334922790527,
"Red Component" : 0.73333334922790527,
"Blue Component" : 0
"Green Component" : "0.627451",
"Blue Component" : "0",
"Red Component" : "0.7686275"
},
"Normal Font" : "InconsolataNerdFontCompleteM-Regular 14",
"Ansi 2 Color" : {
"Green Component" : 0.73333334922790527,
"Red Component" : 0,
"Blue Component" : 0
"Green Component" : "0.6039215999999999",
"Blue Component" : "0.02352941",
"Red Component" : "0.3058824"
},
"Right Option Key Sends" : 0,
"Ansi 6 Color" : {
"Green Component" : 0.73333334922790527,
"Red Component" : 0,
"Blue Component" : 0.73333334922790527
}
"Right Option Key Sends" : 0
}

1
macOS/.config/macOS/Brewfile
View File

@@ -15,6 +15,7 @@ brew "ripgrep"
brew "stow"
brew "swift-format"
brew "zsh"
brew "zsh-completions"
# casks
cask "docker"

4
zsh/.config/zsh/.zcompcache/brew_all_commands
View File

@@ -1,4 +0,0 @@
list=( ${(Q)"${(z)$(<<\EO:list
'aspell-dictionaries' 'determine-rebottle-runners' 'postgresql-upgrade-database' 'services'
EO:list
)}"} )

2176
zsh/.config/zsh/.zcompdump
View File

File diff suppressed because it is too large Load Diff

30
zsh/.config/zsh/.zshrc
View File

@@ -1,23 +1,41 @@
# configure keeping history of commands
HISTSIZE=200
# TODO: move to $ZDOTDIR/.zsh_history
HISTFILE=~/.zsh_history
setopt appendhistory
setopt sharehistory
setopt incappendhistory
# Allow useful scripts in ~/.bin to be in the search path.
export PATH=~/.bin:$PATH
autoload -Uz compinit
zstyle ':completion:*' menu select
zmodload zsh/complist
# compinit
_comp_options+=(globdots) # Include hidden files.
autoload -U up-line-or-beginning-search
autoload -U down-line-or-beginning-search
zle -N up-line-or-beginning-search
zle -N down-line-or-beginning-search
# Colors
autoload -Uz colors && colors
# Load Useful Functions
source "$ZDOTDIR/zsh-functions"
zsh_add_file "zsh-aliases"
zsh_add_file "zsh-zinit"
zsh_add_file "zsh-exports"
export EDITOR="nvim"
# Plugins
zsh_add_plugin "zsh-users/zsh-autosuggestions"
zsh_add_plugin "zsh-users/zsh-syntax-highlighting"
zsh_add_plugin "sindresorhus/pure"
# Prompt
fpath+="$ZDOTDIR/plugins/pure"
autoload -U promptinit; promptinit
prompt pure
cat < "$ZDOTDIR/banner"

1
zsh/.config/zsh/zsh-aliases
View File

@@ -2,6 +2,7 @@
#alias zshconfig="$ZDOTDIR"
alias zdots() { nvim "$ZDOTDIR" }
alias dots() { nvim ~/.dotfiles }
alias reload() { source "$ZDOTDIR/.zshrc" }
alias mkcd() { mkdir $1 && cd $1 }
alias l() { ls -lah "$@" }

17
zsh/.config/zsh/zsh-exports Normal file
View File

@@ -0,0 +1,17 @@
#!/bin/sh
HISTSIZE=200
HISTFILE=$ZDOTDIR/history
# Allow useful scripts in ~/.bin to be in the search path.
export PATH=~/.bin:$PATH
# zsh-completions installed by homebrew
if type brew &>/dev/null; then
FPATH=$(brew --prefix)/share/zsh-completions:$FPATH
autoload -Uz compinit
compinit
fi
export EDITOR="nvim"

27
zsh/.config/zsh/zsh-functions
View File

@@ -2,3 +2,30 @@
function zsh_add_file() {
[ -f "$ZDOTDIR/$1" ] && source "$ZDOTDIR/$1"
}
function zsh_add_plugin() {
PLUGIN_NAME=$(echo $1 | cut -d "/" -f 2)
if [ -d "$ZDOTDIR/plugins/$PLUGIN_NAME" ]; then
# For plugins
zsh_add_file "plugins/$PLUGIN_NAME/$PLUGIN_NAME.plugin.zsh" || \
zsh_add_file "plugins/$PLUGIN_NAME/$PLUGIN_NAME.zsh"
else
git clone "https://github.com/$1.git" "$ZDOTDIR/plugins/$PLUGIN_NAME"
fi
}
function zsh_add_completion() {
PLUGIN_NAME=$(echo $1 | cut -d "/" -f 2)
if [ -d "$ZDOTDIR/plugins/$PLUGIN_NAME" ]; then
# For completions
completion_file_path=$(ls $ZDOTDIR/plugins/$PLUGIN_NAME/_*)
fpath+="$(dirname "${completion_file_path}")"
zsh_add_file "plugins/$PLUGIN_NAME/$PLUGIN_NAME.plugin.zsh"
else
git clone "https://github.com/$1.git" "$ZDOTDIR/plugins/$PLUGIN_NAME"
fpath+=$(ls $ZDOTDIR/plugins/$PLUGIN_NAME/_*)
[ -f $ZDOTDIR/.zccompdump ] && $ZDOTDIR/.zccompdump
fi
completion_file="$(basename "${completion_file_path}")"
if [ "$2" = true ] && compinit "${completion_file:1}"
}

36
zsh/.config/zsh/zsh-zinit
View File

@@ -1,36 +0,0 @@
### Added by Zinit's installer
if [[ ! -f $HOME/.zinit/bin/zinit.zsh ]]; then
print -P "%F{33}▓▒░ %F{220}Installing %F{33}DHARMA%F{220} Initiative Plugin Manager (%F{33}zdharma/zinit%F{220})…%f"
command mkdir -p "$HOME/.zinit" && command chmod g-rwX "$HOME/.zinit"
command git clone https://github.com/zdharma/zinit "$HOME/.zinit/bin" && \
print -P "%F{33}▓▒░ %F{34}Installation successful.%f%b" || \
print -P "%F{160}▓▒░ The clone has failed.%f%b"
fi
source "$HOME/.zinit/bin/zinit.zsh"
autoload -Uz _zinit
(( ${+_comps} )) && _comps[zinit]=_zinit
# Load a few important annexes, without Turbo
# (this is currently required for annexes)
zinit light-mode for \
zinit-zsh/z-a-rust \
zinit-zsh/z-a-as-monitor \
zinit-zsh/z-a-patch-dl \
zinit-zsh/z-a-bin-gem-node
### End of Zinit's installer chunk
# configure pure-prompt
zinit ice compile '(pure|async).zsh' pick'async.zsh' src'pure.zsh'
zinit light sindresorhus/pure
zinit wait lucid for \
atinit"ZINIT[COMPINIT_OPTS]=-C; zicompinit; zicdreplay" \
zdharma/fast-syntax-highlighting \
blockf \
zsh-users/zsh-completions \
atload"!_zsh_autosuggest_start" \
zsh-users/zsh-autosuggestions

1
zsh/.zshenv Normal file
View File

@@ -0,0 +1 @@
export ZDOTDIR="$HOME/.config/zsh"

2
zsh/.zshrc
View File

@@ -1,2 +0,0 @@
export ZDOTDIR=$HOME/.config/zsh
source "$HOME/.config/zsh/.zshrc"