mirror of
https://github.com/ivuorinen/dotfiles.git
synced 2026-02-07 14:50:37 +00:00
Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1dc430850d | ||
|
|
209b54e15b | ||
|
|
b15f412107 |
@@ -4,7 +4,7 @@
|
|||||||
|
|
||||||
## Other stuff
|
## Other stuff
|
||||||
|
|
||||||
Update `Brewfile``
|
Update `Brewfile`
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
brew bundle dump --force --file=~/.dotfiles/Brewfile
|
brew bundle dump --force --file=~/.dotfiles/Brewfile
|
||||||
|
|||||||
39
config/git/config
Normal file
39
config/git/config
Normal file
@@ -0,0 +1,39 @@
|
|||||||
|
[user]
|
||||||
|
name = Ismo Vuorinen
|
||||||
|
email = ismo.vuorinen@vincit.fi
|
||||||
|
[core]
|
||||||
|
excludesfile = ~/.config/git/gitignore
|
||||||
|
[alias]
|
||||||
|
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
|
||||||
|
smudge = git-lfs smudge -- %f
|
||||||
|
process = git-lfs filter-process
|
||||||
|
required = true
|
||||||
|
[init]
|
||||||
|
defaultBranch = master
|
||||||
|
[pull]
|
||||||
|
rebase = false
|
||||||
|
|
||||||
|
[color]
|
||||||
|
ui = true
|
||||||
|
diff = auto
|
||||||
|
branch = auto
|
||||||
|
status = auto
|
||||||
|
|
||||||
|
[color "status"]
|
||||||
|
added = green bold
|
||||||
|
changed = yellow
|
||||||
|
deleted = red bold strike
|
||||||
|
untracked = cyan
|
||||||
|
branch = yellow black bold ul
|
||||||
41
gitconfig
41
gitconfig
@@ -1,41 +0,0 @@
|
|||||||
[user]
|
|
||||||
name = Ismo Vuorinen
|
|
||||||
email = ismo.vuorinen@vincit.fi
|
|
||||||
[core]
|
|
||||||
excludesfile = ~/.gitignore_global
|
|
||||||
[commit]
|
|
||||||
template = ~/.stCommitMsg
|
|
||||||
[alias]
|
|
||||||
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
|
|
||||||
smudge = git-lfs smudge -- %f
|
|
||||||
process = git-lfs filter-process
|
|
||||||
required = true
|
|
||||||
[init]
|
|
||||||
defaultBranch = master
|
|
||||||
[pull]
|
|
||||||
rebase = false
|
|
||||||
|
|
||||||
[color]
|
|
||||||
ui = true
|
|
||||||
diff = auto
|
|
||||||
branch = auto
|
|
||||||
status = auto
|
|
||||||
|
|
||||||
[color "status"]
|
|
||||||
added = green bold
|
|
||||||
changed = yellow
|
|
||||||
deleted = red bold strike
|
|
||||||
untracked = cyan
|
|
||||||
branch = yellow black bold ul
|
|
||||||
@@ -69,8 +69,9 @@ handle_file_ln "/Users/ivuorinen/.dotfiles/bash_profile" "/Users/ivuorinen/.bash
|
|||||||
handle_file_ln "/Users/ivuorinen/.dotfiles/bashrc" "/Users/ivuorinen/.bashrc"
|
handle_file_ln "/Users/ivuorinen/.dotfiles/bashrc" "/Users/ivuorinen/.bashrc"
|
||||||
handle_file_ln "/Users/ivuorinen/.dotfiles/config/antigen.zsh" "/Users/ivuorinen/.config/antigen.zsh"
|
handle_file_ln "/Users/ivuorinen/.dotfiles/config/antigen.zsh" "/Users/ivuorinen/.config/antigen.zsh"
|
||||||
handle_file_ln "/Users/ivuorinen/.dotfiles/config/gh/config.yml" "/Users/ivuorinen/.config/gh/config.yml"
|
handle_file_ln "/Users/ivuorinen/.dotfiles/config/gh/config.yml" "/Users/ivuorinen/.config/gh/config.yml"
|
||||||
handle_file_ln "/Users/ivuorinen/.dotfiles/gitconfig" "/Users/ivuorinen/.gitconfig"
|
handle_file_ln "/Users/ivuorinen/.dotfiles/config/git/config" "/Users/ivuorinen/.config/git/config"
|
||||||
handle_file_ln "/Users/ivuorinen/.dotfiles/gitignore_global" "/Users/ivuorinen/.gitignore_global"
|
handle_file_ln "/Users/ivuorinen/.dotfiles/config/git/gitignore" "/Users/ivuorinen/.config/git/gitignore"
|
||||||
|
handle_file_ln "/Users/ivuorinen/.dotfiles/git_profiles" "/Users/ivuorinen/.git_profiles"
|
||||||
handle_file_ln "/Users/ivuorinen/.dotfiles/huskyrc" "/Users/ivuorinen/.huskyrc"
|
handle_file_ln "/Users/ivuorinen/.dotfiles/huskyrc" "/Users/ivuorinen/.huskyrc"
|
||||||
handle_file_ln "/Users/ivuorinen/.dotfiles/install.sh" "/Users/ivuorinen/.install.sh"
|
handle_file_ln "/Users/ivuorinen/.dotfiles/install.sh" "/Users/ivuorinen/.install.sh"
|
||||||
handle_file_ln "/Users/ivuorinen/.dotfiles/local/bin/x-open-ports" "/Users/ivuorinen/.local/bin/x-open-ports"
|
handle_file_ln "/Users/ivuorinen/.dotfiles/local/bin/x-open-ports" "/Users/ivuorinen/.local/bin/x-open-ports"
|
||||||
|
|||||||
3
zshrc
3
zshrc
@@ -14,9 +14,10 @@ COMPOSER_DIR="$HOME/.composer/vendor/bin"
|
|||||||
BREW_PYTHON=$(brew --prefix python@3.8)/bin
|
BREW_PYTHON=$(brew --prefix python@3.8)/bin
|
||||||
GNUBIN_DIR=$(brew --prefix coreutils)/libexec/gnubin
|
GNUBIN_DIR=$(brew --prefix coreutils)/libexec/gnubin
|
||||||
BREW_RUBY=$(brew --prefix ruby)/bin
|
BREW_RUBY=$(brew --prefix ruby)/bin
|
||||||
|
BREW_GEMS=$(gem environment gemdir)/bin
|
||||||
USR_SBIN=/usr/local/sbin
|
USR_SBIN=/usr/local/sbin
|
||||||
|
|
||||||
export PATH="$LOCAL_BIN:$PYTHON_38:$COMPOSER_DIR:$BREW_PYTHON:$GNUBIN_DIR:$BREW_RUBY:$USR_SBIN:$PATH"
|
export PATH="$LOCAL_BIN:$PYTHON_38:$COMPOSER_DIR:$BREW_PYTHON:$GNUBIN_DIR:$BREW_GEMS:$BREW_RUBY:$USR_SBIN:$PATH"
|
||||||
source "$HOME/.config/antigen.zsh"
|
source "$HOME/.config/antigen.zsh"
|
||||||
|
|
||||||
export NVM_DIR="$HOME/.nvm"
|
export NVM_DIR="$HOME/.nvm"
|
||||||
|
|||||||
Reference in New Issue
Block a user