Dotfiles 2022-08-24

This commit is contained in:
Ismo Vuorinen
2022-08-24 14:23:30 +03:00
parent 68567c34eb
commit 2da3ccf0b1
3 changed files with 32 additions and 7 deletions

View File

@@ -16,6 +16,13 @@
reset-origin = !git fetch origin && git reset --hard origin/master && git clean -f -d
reset-upstream = !git fetch upstream && git reset --hard upstream/master && git clean -f -d
nah = !git reset --hard && git clean -df
undo-commit = reset HEAD~ --soft
llog = log --pretty=fuller
logs = log --graph --pretty=format:'%C(magenta)%h%Creset -%C(red)%d%Creset %s %C(dim green)(%cr) %C(cyan)<%an>%Creset' --abbrev-commit
rl = reflog --format='%C(auto)%h %<|(20)%gd %C(blue)%cr%C(reset) %gs (%s)'
tagdate = log --date-order --graph --tags --simplify-by-decoration --pretty=format:\"%ai %h %d\"
branchbydate = for-each-ref --count=30 --sort=-committerdate refs/heads/ --format='%(refname:short)'
branchcolor = "!for ref in $(git for-each-ref --sort=-committerdate --format=\"%(refname)\" refs/heads/ refs/remotes ); do git log -n1 $ref --pretty=format:\"%Cgreen%cr%Creset %C(yellow)%d%Creset %C(bold blue)<%an>%Creset%n\" | cat ; done | awk '! a[$0]++'"
[filter "lfs"]
clean = git-lfs clean -- %f

7
huskyrc Normal file
View File

@@ -0,0 +1,7 @@
#!/bin/env bash
export NVM_DIR="$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
alias php="php -d error_reporting=22527"

25
zshrc
View File

@@ -1,9 +1,18 @@
# shellcheck shell=bash
LOCAL_BIN="$HOME/.local/bin"
OPT_FOLDER="/usr/local/opt"
PHP_74=$(brew --prefix php@7.4)/bin
PHP_80=$(brew --prefix php@8.0)/bin
PHP_CUR=$(brew --prefix php)/bin
export PATH="$HOME/.local/bin:$PHP_74:$PHP_CUR:$HOME/Library/Python/3.8/bin:$HOME/.composer/vendor/bin:$OPT_FOLDER/python@3.8/bin:$OPT_FOLDER/coreutils/libexec/gnubin:$OPT_FOLDER/ruby/bin:/usr/local/sbin:$PATH"
PYTHON_38="$HOME/Library/Python/3.8/bin"
COMPOSER_DIR="$HOME/.composer/vendor/bin"
BREW_PYTHON=$(brew --prefix python@3.8)/bin
GNUBIN_DIR=$(brew --prefix coreutils)/libexec/gnubin
BREW_RUBY=$(brew --prefix ruby)/bin
USR_SBIN=/usr/local/sbin
export PATH="$LOCAL_BIN:$PHP_74:$PHP_80:$PHP_CUR:$PYTHON_38:$COMPOSER_DIR:$BREW_PYTHON:$GNUBIN_DIR:$BREW_RUBY:$USR_SBIN:$PATH"
source "$HOME/.config/antigen.zsh"
export NVM_DIR="$HOME/.nvm"
@@ -15,10 +24,10 @@ antigen use oh-my-zsh
antigen bundle php
antigen bundle nvm
antigen bundle ruby
# antigen bundle ruby
antigen bundle docker
antigen bundle ssh-agent
antigen bundle git-auto-fetch
# antigen bundle git-auto-fetch
antigen bundle colored-man-pages
antigen bundle jreese/zsh-titles
@@ -29,7 +38,7 @@ antigen bundle Sparragus/zsh-auto-nvm-use
antigen bundle reegnz/jq-zsh-plugin
antigen bundle MichaelAquilina/zsh-you-should-use
antigen bundle sroze/docker-compose-zsh-plugin
antigen bundle voronkovich/phpcs.plugin.zsh
# antigen bundle voronkovich/phpcs.plugin.zsh
antigen bundle unixorn/autoupdate-antigen.zshplugin
antigen theme oskarkrawczyk/honukai-iterm-zsh honukai
@@ -50,6 +59,8 @@ export HIST_STAMPS="yyyy-mm-dd"
source "$HOME/.alias"
source "/usr/local/Caskroom/google-cloud-sdk/latest/google-cloud-sdk/path.zsh.inc"
source "/usr/local/Caskroom/google-cloud-sdk/latest/google-cloud-sdk/completion.zsh.inc"
source "/usr/local/etc/profile.d/z.sh"
GCLOUD_INSTALL_LOCATION=$(gcloud info --format="value(installation.sdk_root)" --quiet)
source "$GCLOUD_INSTALL_LOCATION/path.zsh.inc"
source "$GCLOUD_INSTALL_LOCATION/completion.zsh.inc"
source "$(brew --prefix z)/etc/profile.d/z.sh"