diff --git a/.config/yadm/bootstrap##template b/.config/yadm/bootstrap##template index 462ac49..a9c3a0c 100755 --- a/.config/yadm/bootstrap##template +++ b/.config/yadm/bootstrap##template @@ -17,6 +17,54 @@ brew bundle --global fi {% endif %} +{% if yadm.os == "Linux" %} +echo "installing git" +sudo apt-get install -y git +packages=() +packages+=( + "bat" + "boxes" + "catimg" + "duf" + "editorconfig" + "fdfind" + "figlet" + "fzf" + "gh" + #"git-delta" # this is a special case that will be handled seperately + "gnupg" + "gron" + #"gum" # this is a special case that will be handled seperately + "highlight" + # "hr" # may not be available + "htop" + "jq" + "lolcat" + "lsd" + "neovim" + #"nodejs" Using alternate install method + #"nvm" # will use install script + #"ots" # not available for debian? + "peco" + #"pngpaste" # no deb package + "pwgen" + "shellcheck" + #"slackcat" # no deb package + #"slackdump" # no deb package + #"tag" # no deb package + "thefuck" + "tldr" + "tmux" + "vim" + #"watch" # standard in debian + "wget" + "yadm" + "zoxide" + "zsh-autosuggestions" + "zsh-syntax-highlighting" +) +{% endif %} + # Directory to look for bootstrap executables in BOOTSTRAP_D="${BASH_SOURCE[0]}.d" @@ -51,4 +99,4 @@ if (command -v "$YARN" >/dev/null 2>&1); then echo "Successfully installed yalc" fi fi -{% endif %} \ No newline at end of file +{% endif %} diff --git a/.config/zsh/aliases.local##class.Dreamhost b/.config/zsh/aliases.local##class.Dreamhost new file mode 100644 index 0000000..e69de29 diff --git a/.fzf.zsh b/.fzf.zsh index be24395..b13a99e 100644 --- a/.fzf.zsh +++ b/.fzf.zsh @@ -10,4 +10,6 @@ fi # Key bindings # ------------ -source "/opt/homebrew/opt/fzf/shell/key-bindings.zsh" +# source "/opt/homebrew/opt/fzf/shell/key-bindings.zsh" + +source "$HOME/.fzf.zsh.local" diff --git a/.fzf.zsh.local##class.Dreamhost b/.fzf.zsh.local##class.Dreamhost new file mode 100644 index 0000000..6bdc652 --- /dev/null +++ b/.fzf.zsh.local##class.Dreamhost @@ -0,0 +1,3 @@ +# Key bindings +# ------------ +source "/usr/share/doc/fzf/examples/key-bindings.zsh" diff --git a/.fzf.zsh.local##class.Home b/.fzf.zsh.local##class.Home new file mode 100644 index 0000000..0150059 --- /dev/null +++ b/.fzf.zsh.local##class.Home @@ -0,0 +1,3 @@ +# Key bindings +# ------------ +source "/opt/homebrew/opt/fzf/shell/key-bindings.zsh" diff --git a/.fzf.zsh.local##class.Work b/.fzf.zsh.local##class.Work new file mode 100644 index 0000000..0150059 --- /dev/null +++ b/.fzf.zsh.local##class.Work @@ -0,0 +1,3 @@ +# Key bindings +# ------------ +source "/opt/homebrew/opt/fzf/shell/key-bindings.zsh" diff --git a/.gitconfig b/.gitconfig index fb9566b..7991046 100644 --- a/.gitconfig +++ b/.gitconfig @@ -1,12 +1,11 @@ [user] name = Joe Lillibridge +#email = joe@lillibridge.email +#signingkey = ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILoyiVVnKMnTDgtals13aXoBarPzwyRlKMhVugOj15ap [gpg] format = ssh -[gpg "ssh"] -program = "/Applications/1Password.app/Contents/MacOS/op-ssh-sign" - [commit] gpgsign = true diff --git a/.gitconfig.local##class.Dreamhost b/.gitconfig.local##class.Dreamhost new file mode 100644 index 0000000..5567e2b --- /dev/null +++ b/.gitconfig.local##class.Dreamhost @@ -0,0 +1,3 @@ +[user] +email = joe@lillibridge.email +signingkey = B5206C5695CD6665 diff --git a/.gitconfig.local##class.Home b/.gitconfig.local##class.Home index 7897733..0777634 100644 --- a/.gitconfig.local##class.Home +++ b/.gitconfig.local##class.Home @@ -1,3 +1,6 @@ [user] - email = fwonkas@gmail.com - signingkey = ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCrHALfY0jja0KmFCcnuh+7KdVphB57ECJRrMJcLzuzsxXypl6yVLTqXkVxkXooJYj3Fx3bUk7JOZjriSvbo7X6J1y9FA8ilsAyCnpKar93qdtenmVQXhPDiArSGdKMgaOFF7IpVfcWYzm8MWYUMoAKlOoK6BER7H0XM9MkucvxhiudWHC0gGd6L4/RDUshfDqy4jWAXMZkfDEgpLyG780ASVMo9p87/Fms5HXq7XFm8NyxexDAzelYUF5ao5gm4oIIP41fvZobKc8iNkJvL0xBm4V910KkctAvegt4P7P9Uj+bxc5tP0psGaDbyNZi/FYq3vbPfHBfQJOAIAv2DkxMNRAophSyFyyW4HfZ2R9ok49n0hUF1NjQnLMESopMCYxjUrURYrYbEyThkxMti1IjL2BAsNo+/leGmFfG3QjAm+Hxv7v05mGfTOTdkYocOpTJVbpMhkZiz6EXjqGBusEfuJ5D09BK+dyMmBKL6+Rw4X+weV54WBXdjoGXarXh4fE= +email = fwonkas@gmail.com +signingkey = ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCrHALfY0jja0KmFCcnuh+7KdVphB57ECJRrMJcLzuzsxXypl6yVLTqXkVxkXooJYj3Fx3bUk7JOZjriSvbo7X6J1y9FA8ilsAyCnpKar93qdtenmVQXhPDiArSGdKMgaOFF7IpVfcWYzm8MWYUMoAKlOoK6BER7H0XM9MkucvxhiudWHC0gGd6L4/RDUshfDqy4jWAXMZkfDEgpLyG780ASVMo9p87/Fms5HXq7XFm8NyxexDAzelYUF5ao5gm4oIIP41fvZobKc8iNkJvL0xBm4V910KkctAvegt4P7P9Uj+bxc5tP0psGaDbyNZi/FYq3vbPfHBfQJOAIAv2DkxMNRAophSyFyyW4HfZ2R9ok49n0hUF1NjQnLMESopMCYxjUrURYrYbEyThkxMti1IjL2BAsNo+/leGmFfG3QjAm+Hxv7v05mGfTOTdkYocOpTJVbpMhkZiz6EXjqGBusEfuJ5D09BK+dyMmBKL6+Rw4X+weV54WBXdjoGXarXh4fE= + +[gpg "ssh"] +program = "/Applications/1Password.app/Contents/MacOS/op-ssh-sign" diff --git a/.gitconfig.local##class.Work b/.gitconfig.local##class.Work index f7dcbea..5fc7270 100644 --- a/.gitconfig.local##class.Work +++ b/.gitconfig.local##class.Work @@ -1,4 +1,7 @@ [user] - email = joseph.lillibridge@target.com - # signingkey = 0C8E0B58274250F2 - signingkey = ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJHsJHCNNsHnVmDwoZB0OpGoXJ7oyY0cwN4w5CvWCxqB +email = joseph.lillibridge@target.com +# signingkey = 0C8E0B58274250F2 +signingkey = ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJHsJHCNNsHnVmDwoZB0OpGoXJ7oyY0cwN4w5CvWCxqB + +[gpg "ssh"] +program = "/Applications/1Password.app/Contents/MacOS/op-ssh-sign" diff --git a/.zshrc b/.zshrc index 08e076d..10c07c5 100644 --- a/.zshrc +++ b/.zshrc @@ -104,3 +104,4 @@ fi eval "$(zoxide init --cmd j zsh)" [[ "$(command -v thefuck)" ]] && eval $(thefuck --alias) +[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion