🔧 sync static configs with nix
This commit is contained in:
parent
82cbe6a16b
commit
c328c8962c
@ -1,45 +1,64 @@
|
|||||||
# ~/.Brewfile
|
# ~/.Brewfile
|
||||||
|
|
||||||
# taps
|
# taps
|
||||||
tap 'homebrew/cask-drivers'
|
tap 'homebrew/cask'
|
||||||
tap 'homebrew/cask-fonts'
|
tap 'homebrew/cask-fonts'
|
||||||
|
tap 'homebrew/cask-versions'
|
||||||
|
tap 'homebrew/services'
|
||||||
|
tap '1password/tap'
|
||||||
|
|
||||||
# brews
|
# brews
|
||||||
|
brew 'bat'
|
||||||
brew 'coreutils'
|
brew 'coreutils'
|
||||||
|
brew 'direnv'
|
||||||
|
brew 'eza'
|
||||||
|
brew 'fzf'
|
||||||
brew 'mas'
|
brew 'mas'
|
||||||
|
brew 'zsh-autosuggestions'
|
||||||
|
|
||||||
# casks
|
# casks
|
||||||
cask '1password'
|
cask '1password'
|
||||||
cask 'alfred'
|
cask '1password-cli'
|
||||||
|
cask 'android-studio'
|
||||||
|
cask 'beeper'
|
||||||
cask 'brave-browser'
|
cask 'brave-browser'
|
||||||
cask 'dash'
|
cask 'bunch'
|
||||||
|
cask 'calibre'
|
||||||
cask 'discord'
|
cask 'discord'
|
||||||
cask 'docker'
|
cask 'docker'
|
||||||
|
cask 'element'
|
||||||
cask 'fantastical'
|
cask 'fantastical'
|
||||||
cask 'figma'
|
cask 'figma'
|
||||||
cask 'firefox'
|
cask 'firefox@developer-edition'
|
||||||
cask 'font-jetbrains-mono'
|
cask 'font-jetbrains-mono'
|
||||||
|
cask 'font-jetbrains-mono-nerd-font'
|
||||||
cask 'google-chrome'
|
cask 'google-chrome'
|
||||||
cask 'hazel'
|
cask 'hazel'
|
||||||
cask 'iterm2'
|
cask 'iterm2'
|
||||||
cask 'keybase'
|
cask 'logi-options-plus'
|
||||||
|
cask 'logitech-camera-settings'
|
||||||
cask 'microsoft-edge'
|
cask 'microsoft-edge'
|
||||||
|
cask 'microsoft-office'
|
||||||
|
cask 'minecraft'
|
||||||
|
cask 'obsidian'
|
||||||
|
cask 'opal-composer'
|
||||||
|
cask 'plexamp'
|
||||||
|
cask 'raycast'
|
||||||
cask 'slack'
|
cask 'slack'
|
||||||
cask 'sonos'
|
cask 'sonos'
|
||||||
cask 'spotify'
|
cask 'spotify'
|
||||||
cask 'stats'
|
cask 'stats'
|
||||||
cask 'syncthing'
|
cask 'steam'
|
||||||
cask 'synology-drive'
|
cask 'synology-drive'
|
||||||
|
cask 'todoist'
|
||||||
cask 'visual-studio-code'
|
cask 'visual-studio-code'
|
||||||
cask 'zoomus'
|
cask 'zoom'
|
||||||
|
|
||||||
# mac app store
|
# mac app store
|
||||||
mas 'Bumpr', id: 1166066070
|
mas 'OnePasswordSafari', id: 1569813296;
|
||||||
mas 'Day One', id: 1055511498
|
mas 'Bumpr', id: 1166066070;
|
||||||
mas 'Drafts', id: 1435957248
|
mas 'DayOne', id: 1055511498;
|
||||||
mas 'Magnet', id: 441258766
|
mas 'Drafts', id: 1435957248;
|
||||||
mas 'Parcel', id: 639968404
|
mas 'HomeAssistant', id: 1099568401;
|
||||||
mas 'Reeder', id: 1529448980
|
mas 'Tailscale', id: 1475387142;
|
||||||
mas 'Todoist', id: 585829637
|
|
||||||
mas 'UlyssesMac', id: 1225570693
|
|
||||||
mas 'Xcode', id: 497799835
|
mas 'Xcode', id: 497799835
|
||||||
|
@ -7,11 +7,14 @@ fish_style_pwd_dir_length = 1
|
|||||||
truncation_length = 1
|
truncation_length = 1
|
||||||
|
|
||||||
[gcloud]
|
[gcloud]
|
||||||
disabled=true
|
disabled = true
|
||||||
|
|
||||||
[hostname]
|
[hostname]
|
||||||
ssh_only = false
|
ssh_only = false
|
||||||
format = "[$hostname]($style):"
|
format = "[$hostname]($style):"
|
||||||
|
|
||||||
|
[kubernetes]
|
||||||
|
disabled = false
|
||||||
|
|
||||||
[username]
|
[username]
|
||||||
format = "[$user]($style)@"
|
format = "[$user]($style)@"
|
||||||
|
@ -1,31 +1,41 @@
|
|||||||
[user]
|
|
||||||
name = James Walker
|
|
||||||
email = walkah@walkah.net
|
|
||||||
signingkey = 4D47A81C
|
|
||||||
[color]
|
|
||||||
diff = auto
|
|
||||||
status = auto
|
|
||||||
branch = auto
|
|
||||||
ui = auto
|
|
||||||
[alias]
|
[alias]
|
||||||
lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
|
lg = "log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit"
|
||||||
st = status -s
|
st = "status -s"
|
||||||
smu = submodule update --init --recursive
|
undo = "reset HEAD~1 --mixed"
|
||||||
|
smu = "submodule update --init --recursive"
|
||||||
ignore = "!gi() { curl -L -s https://www.gitignore.io/api/$@ ;}; gi"
|
ignore = "!gi() { curl -L -s https://www.gitignore.io/api/$@ ;}; gi"
|
||||||
up = pull --rebase --autostash
|
up = "pull --rebase --autostash"
|
||||||
cleanup = "!git branch --merged | grep -v '\\*\\|master\\|develop' | xargs -n 1 git branch -d"
|
cleanup = "!git branch --merged | grep -v '\\*\\|master\\|develop' | xargs -n 1 git branch -d"
|
||||||
[github]
|
|
||||||
user = walkah
|
|
||||||
[git-up "bundler"]
|
|
||||||
check = true
|
|
||||||
autoinstall = true
|
|
||||||
[filter "lfs"]
|
|
||||||
clean = git lfs clean %f
|
|
||||||
smudge = git lfs smudge %f
|
|
||||||
required = true
|
|
||||||
[commit]
|
[commit]
|
||||||
gpgsign = true
|
gpgsign = true
|
||||||
[pull]
|
|
||||||
rebase = false
|
[credential "https://gist.github.com"]
|
||||||
|
helper = "/nix/store/isgmpcikb92pmj3ckpvjpbf45yk2n8y3-gh-2.53.0/bin/gh auth git-credential"
|
||||||
|
|
||||||
|
[credential "https://github.com"]
|
||||||
|
helper = "/nix/store/isgmpcikb92pmj3ckpvjpbf45yk2n8y3-gh-2.53.0/bin/gh auth git-credential"
|
||||||
|
|
||||||
|
[github]
|
||||||
|
user = "walkah"
|
||||||
|
|
||||||
|
[gpg]
|
||||||
|
format = "ssh"
|
||||||
|
|
||||||
|
[gpg "ssh"]
|
||||||
|
allowedSignersFile = "~/.ssh/allowed_signers"
|
||||||
|
|
||||||
[init]
|
[init]
|
||||||
defaultBranch = main
|
defaultBranch = "main"
|
||||||
|
|
||||||
|
[pull]
|
||||||
|
rebase = true
|
||||||
|
|
||||||
|
[rebase]
|
||||||
|
autoStash = true
|
||||||
|
|
||||||
|
[user]
|
||||||
|
email = "walkah@walkah.net"
|
||||||
|
name = "James Walker"
|
||||||
|
signingkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOxgkaPcUYkMjk7SEBFrYpJ2mGK+8iPgLYwV+XpNp5Nl"
|
||||||
|
@ -19,29 +19,7 @@ export ZSH_CUSTOM=$HOME/.zsh/custom
|
|||||||
|
|
||||||
# Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
|
# Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
|
||||||
# Example format: plugins=(rails git textmate ruby lighthouse)
|
# Example format: plugins=(rails git textmate ruby lighthouse)
|
||||||
plugins=(asdf direnv aws gcloud extract command-not-found tmux git github ssh-agent docker docker-compose mix)
|
plugins=(1password bundler direnv docker docker-compose git golang mix rails tmux)
|
||||||
|
|
||||||
# ruby
|
|
||||||
if [ -x ruby ]; then
|
|
||||||
plugins=($plugins ruby gem rails bundler heroku)
|
|
||||||
fi
|
|
||||||
|
|
||||||
# node
|
|
||||||
plugins=($plugins npm yarn react-native)
|
|
||||||
|
|
||||||
# python
|
|
||||||
plugins=($plugins pip pipenv)
|
|
||||||
|
|
||||||
# Platform specific settings
|
|
||||||
case "$OSTYPE" in
|
|
||||||
darwin*)
|
|
||||||
plugins=($plugins osx)
|
|
||||||
;;
|
|
||||||
linux*)
|
|
||||||
plugins=($plugins debian)
|
|
||||||
export PATH=/snap/bin:$PATH
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
# OH MY ZSH!
|
# OH MY ZSH!
|
||||||
source $ZSH/oh-my-zsh.sh
|
source $ZSH/oh-my-zsh.sh
|
||||||
@ -64,6 +42,14 @@ if [ $TERM = "screen" ]; then
|
|||||||
export DISABLE_AUTO_TITLE="true"
|
export DISABLE_AUTO_TITLE="true"
|
||||||
fi
|
fi
|
||||||
export EDITOR="vim"
|
export EDITOR="vim"
|
||||||
export LSCOLORS="ExGxFxdxCxDxDxhbadExEx"
|
|
||||||
|
|
||||||
eval "$(starship init zsh)"
|
eval "$(starship init zsh)"
|
||||||
|
|
||||||
|
# Aliases
|
||||||
|
alias -- 'cat'='bat'
|
||||||
|
alias -- 'eza'='eza '\''--git'\'' '\''--header'\'''
|
||||||
|
alias -- 'la'='eza -a'
|
||||||
|
alias -- 'll'='eza -l'
|
||||||
|
alias -- 'lla'='eza -la'
|
||||||
|
alias -- 'ls'='eza'
|
||||||
|
alias -- 'lt'='eza --tree'
|
@ -6,15 +6,8 @@ function install_latest() {
|
|||||||
asdf global $1 $version
|
asdf global $1 $version
|
||||||
}
|
}
|
||||||
|
|
||||||
echo "* Updating homesick..."
|
|
||||||
homesick pull
|
|
||||||
homesick symlink
|
|
||||||
|
|
||||||
case "$OSTYPE" in
|
case "$OSTYPE" in
|
||||||
darwin*)
|
darwin*)
|
||||||
echo "* Restoring mackup..."
|
|
||||||
mackup restore
|
|
||||||
|
|
||||||
echo "* Homebrew updates..."
|
echo "* Homebrew updates..."
|
||||||
brew bundle --global --no-lock
|
brew bundle --global --no-lock
|
||||||
brew upgrade
|
brew upgrade
|
||||||
@ -23,9 +16,7 @@ case "$OSTYPE" in
|
|||||||
mas upgrade
|
mas upgrade
|
||||||
;;
|
;;
|
||||||
linux*)
|
linux*)
|
||||||
sudo apt update && sudo apt upgrade
|
sudo apt update && sudo apt upgrade
|
||||||
sudo snap refresh
|
|
||||||
|
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
@ -40,7 +31,7 @@ asdf install
|
|||||||
for plugin in $(cat ~/.tool-versions | awk '{print $1}'); do install_latest $plugin; done
|
for plugin in $(cat ~/.tool-versions | awk '{print $1}'); do install_latest $plugin; done
|
||||||
|
|
||||||
echo "* Syncing repositories..."
|
echo "* Syncing repositories..."
|
||||||
mr -j 5 update
|
mr -j 8 update
|
||||||
|
|
||||||
echo "* Upgrading oh-my-zsh..."
|
echo "* Upgrading oh-my-zsh..."
|
||||||
cd ~/.oh-my-zsh
|
cd ~/.oh-my-zsh
|
||||||
|
@ -1,8 +1,5 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
echo "* Shutdown vagrant..."
|
|
||||||
for box in $(vagrant global-status|grep running|awk '{ print $1 }'); do vagrant halt $box; done
|
|
||||||
|
|
||||||
echo "* Shutdown docker..."
|
echo "* Shutdown docker..."
|
||||||
# for machine in $(docker-machine ls -q); do docker-machine stop $machine; done
|
# for machine in $(docker-machine ls -q); do docker-machine stop $machine; done
|
||||||
for container in $(docker ps -a -q); do docker stop $container; done
|
for container in $(docker ps -a -q); do docker stop $container; done
|
||||||
@ -11,11 +8,6 @@ docker system prune -f
|
|||||||
echo "* Stop running services..."
|
echo "* Stop running services..."
|
||||||
brew services stop --all
|
brew services stop --all
|
||||||
|
|
||||||
echo "* Kill tmux sessions..."
|
|
||||||
tmux kill-server
|
|
||||||
|
|
||||||
echo "* Uncommitted projects..."
|
echo "* Uncommitted projects..."
|
||||||
mr -m status
|
mr -m status
|
||||||
|
|
||||||
echo "* Homesick status..."
|
|
||||||
homesick status
|
|
||||||
|
12
flake.lock
generated
12
flake.lock
generated
@ -62,11 +62,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1721534365,
|
"lastModified": 1722203588,
|
||||||
"narHash": "sha256-XpZOkaSJKdOsz1wU6JfO59Rx2fqtcarQ0y6ndIOKNpI=",
|
"narHash": "sha256-91V5FMSQ4z9bkhTCf0f86Zjw0bh367daSf0mzCIW0vU=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "635563f245309ef5320f80c7ebcb89b2398d2949",
|
"rev": "792757f643cedc13f02098d8ed506d82e19ec1da",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -77,11 +77,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1721559948,
|
"lastModified": 1722141560,
|
||||||
"narHash": "sha256-cFgdjyK/VBM3hB1RfFHXcI/VOCBVAv813s1upHKX7bI=",
|
"narHash": "sha256-Ul3rIdesWaiW56PS/Ak3UlJdkwBrD4UcagCmXZR9Z7Y=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "c19d62ad2265b16e2199c5feb4650fe459ca1c46",
|
"rev": "038fb464fcfa79b4f08131b07f2d8c9a6bcc4160",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -18,8 +18,9 @@ _:
|
|||||||
userEmail = "walkah@walkah.net";
|
userEmail = "walkah@walkah.net";
|
||||||
|
|
||||||
aliases = {
|
aliases = {
|
||||||
lg =
|
ignore = "!gi() { curl -L -s https://www.gitignore.io/api/$@ ;}; gi";
|
||||||
"log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit";
|
lg = "log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit";
|
||||||
|
smu = "submodule update --init --recursive";
|
||||||
st = "status -s";
|
st = "status -s";
|
||||||
undo = "reset HEAD~1 --mixed";
|
undo = "reset HEAD~1 --mixed";
|
||||||
};
|
};
|
||||||
|
Loading…
x
Reference in New Issue
Block a user