walkah/dotfiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

🔧 sync static configs with nix

Browse Source
This commit is contained in:
James Walker
2024-07-29 11:48:49 -04:00
parent 82cbe6a16b
commit c328c8962c
8 changed files with 94 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
config/.Brewfile
View File

@@ -1,45 +1,64 @@
# ~/.Brewfile
# taps
tap 'homebrew/cask-drivers'
tap 'homebrew/cask'
tap 'homebrew/cask-fonts'
tap 'homebrew/cask-versions'
tap 'homebrew/services'
tap '1password/tap'
# brews
brew 'bat'
brew 'coreutils'
brew 'direnv'
brew 'eza'
brew 'fzf'
brew 'mas'
brew 'zsh-autosuggestions'
# casks
cask '1password'
cask 'alfred'
cask '1password-cli'
cask 'android-studio'
cask 'beeper'
cask 'brave-browser'
cask 'dash'
cask 'bunch'
cask 'calibre'
cask 'discord'
cask 'docker'
cask 'element'
cask 'fantastical'
cask 'figma'
cask 'firefox'
cask 'firefox@developer-edition'
cask 'font-jetbrains-mono'
cask 'font-jetbrains-mono-nerd-font'
cask 'google-chrome'
cask 'hazel'
cask 'iterm2'
cask 'keybase'
cask 'logi-options-plus'
cask 'logitech-camera-settings'
cask 'microsoft-edge'
cask 'microsoft-office'
cask 'minecraft'
cask 'obsidian'
cask 'opal-composer'
cask 'plexamp'
cask 'raycast'
cask 'slack'
cask 'sonos'
cask 'spotify'
cask 'stats'
cask 'syncthing'
cask 'steam'
cask 'synology-drive'
cask 'todoist'
cask 'visual-studio-code'
cask 'zoomus'
cask 'zoom'
# mac app store
mas 'Bumpr', id: 1166066070
mas 'Day One', id: 1055511498
mas 'Drafts', id: 1435957248
mas 'Magnet', id: 441258766
mas 'Parcel', id: 639968404
mas 'Reeder', id: 1529448980
mas 'Todoist', id: 585829637
mas 'UlyssesMac', id: 1225570693
mas 'OnePasswordSafari', id: 1569813296;
mas 'Bumpr', id: 1166066070;
mas 'DayOne', id: 1055511498;
mas 'Drafts', id: 1435957248;
mas 'HomeAssistant', id: 1099568401;
mas 'Tailscale', id: 1475387142;
mas 'Xcode', id: 497799835

5
config/.config/starship.toml
View File

@@ -7,11 +7,14 @@ fish_style_pwd_dir_length = 1
truncation_length = 1
[gcloud]
disabled=true
disabled = true
[hostname]
ssh_only = false
format = "[$hostname]($style):"
[kubernetes]
disabled = false
[username]
format = "[$user]($style)@"

60
config/.gitconfig
View File

@@ -1,31 +1,41 @@
[user]
name = James Walker
email = walkah@walkah.net
signingkey = 4D47A81C
[color]
diff = auto
status = auto
branch = auto
ui = auto
[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
st = status -s
smu = submodule update --init --recursive
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"
undo = "reset HEAD~1 --mixed"
smu = "submodule update --init --recursive"
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"
[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]
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]
defaultBranch = main
defaultBranch = "main"
[pull]
rebase = true
[rebase]
autoStash = true
[user]
email = "walkah@walkah.net"
name = "James Walker"
signingkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOxgkaPcUYkMjk7SEBFrYpJ2mGK+8iPgLYwV+XpNp5Nl"

34
config/.zshrc
View File

@@ -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/*)
# 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)
# 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
plugins=(1password bundler direnv docker docker-compose git golang mix rails tmux)
# OH MY ZSH!
source $ZSH/oh-my-zsh.sh
@@ -64,6 +42,14 @@ if [ $TERM = "screen" ]; then
export DISABLE_AUTO_TITLE="true"
fi
export EDITOR="vim"
export LSCOLORS="ExGxFxdxCxDxDxhbadExEx"
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'

11
config/bin/goodmorning.sh
View File

@@ -6,15 +6,8 @@ function install_latest() {
asdf global $1 $version
}
echo "* Updating homesick..."
homesick pull
homesick symlink
case "$OSTYPE" in
darwin*)
echo "* Restoring mackup..."
mackup restore
echo "* Homebrew updates..."
brew bundle --global --no-lock
brew upgrade
@@ -24,8 +17,6 @@ case "$OSTYPE" in
;;
linux*)
sudo apt update && sudo apt upgrade
sudo snap refresh
;;
esac
@@ -40,7 +31,7 @@ asdf install
for plugin in $(cat ~/.tool-versions | awk '{print $1}'); do install_latest $plugin; done
echo "* Syncing repositories..."
mr -j 5 update
mr -j 8 update
echo "* Upgrading oh-my-zsh..."
cd ~/.oh-my-zsh

8
config/bin/goodnight.sh
View File

@@ -1,8 +1,5 @@
#!/bin/sh
echo "* Shutdown vagrant..."
for box in $(vagrant global-status|grep running|awk '{ print $1 }'); do vagrant halt $box; done
echo "* Shutdown docker..."
# 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
@@ -11,11 +8,6 @@ docker system prune -f
echo "* Stop running services..."
brew services stop --all
echo "* Kill tmux sessions..."
tmux kill-server
echo "* Uncommitted projects..."
mr -m status
echo "* Homesick status..."
homesick status

12
flake.lock generated
View File

@@ -62,11 +62,11 @@
]
},
"locked": {
"lastModified": 1721534365,
"narHash": "sha256-XpZOkaSJKdOsz1wU6JfO59Rx2fqtcarQ0y6ndIOKNpI=",
"lastModified": 1722203588,
"narHash": "sha256-91V5FMSQ4z9bkhTCf0f86Zjw0bh367daSf0mzCIW0vU=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "635563f245309ef5320f80c7ebcb89b2398d2949",
"rev": "792757f643cedc13f02098d8ed506d82e19ec1da",
"type": "github"
},
"original": {
@@ -77,11 +77,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1721559948,
"narHash": "sha256-cFgdjyK/VBM3hB1RfFHXcI/VOCBVAv813s1upHKX7bI=",
"lastModified": 1722141560,
"narHash": "sha256-Ul3rIdesWaiW56PS/Ak3UlJdkwBrD4UcagCmXZR9Z7Y=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "c19d62ad2265b16e2199c5feb4650fe459ca1c46",
"rev": "038fb464fcfa79b4f08131b07f2d8c9a6bcc4160",
"type": "github"
},
"original": {

5
modules/git.nix
View File

@@ -18,8 +18,9 @@ _:
userEmail = "walkah@walkah.net";
aliases = {
lg =
"log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit";
ignore = "!gi() { curl -L -s https://www.gitignore.io/api/$@ ;}; gi";
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";
undo = "reset HEAD~1 --mixed";
};