Compare commits

...

6 Commits

28 changed files with 232 additions and 163 deletions

16
.gitmodules vendored
View File

@@ -1,37 +1,37 @@
[submodule "dotbot"]
path = dotbot
url = git@github.com:anishathalye/dotbot.git
url = https://github.com/anishathalye/dotbot.git
ignore = dirty
[submodule "dotbot-plugins/dotbot-brew"]
path = dotbot-plugins/dotbot-brew
url = git@github.com:wren/dotbot-brew.git
url = https://github.com/wren/dotbot-brew.git
ignore = dirty
[submodule "dotbot-plugins/dotbot-if"]
path = dotbot-plugins/dotbot-if
url = git@github.com:wonderbeyond/dotbot-if.git
url = https://github.com/wonderbeyond/dotbot-if.git
ignore = dirty
[submodule "dotbot-plugins/dotbot-gh-extension"]
path = dotbot-plugins/dotbot-gh-extension
url = git@github.com:fundor333/dotbot-gh-extension.git
url = https://github.com/fundor333/dotbot-gh-extension.git
ignore = dirty
[submodule "dotbot-plugins/dotbot-golang"]
path = dotbot-plugins/dotbot-golang
url = git@github.com:delicb/dotbot-golang.git
url = https://github.com/delicb/dotbot-golang.git
ignore = dirty
[submodule "config/nvim"]
path = config/nvim
url = git@github.com:AstroNvim/AstroNvim.git
url = https://github.com/AstroNvim/AstroNvim.git
ignore = dirty
branch = nightly
branch = main
update = checkout
[submodule "config/astronvim/lua/user"]
path = config/astronvim/lua/user
url = git@github.com:ivuorinen/astronvim_config.git
url = https://github.com/ivuorinen/astronvim_config.git
update = rebase
branch = main

View File

@@ -13,29 +13,26 @@ fork or download the repo as a zip and go from there with your own configs.
### First time setup
1. Clone this repository to `$HOME/.dotfiles`
2. `bash $HOME/.dotfiles/scripts/settler.sh`
2. `./install`
3. ???
4. Profit
Note: there's a bit chicken/egg situation,
because settler assumes you don't have git,
and you need git to clone the repo. This will change soon™.
## Interesting files and locations
### Interesting folders
| Path | Description |
| ------------------ | --------------------------------------------------- |
| `.github` | GitHub Repository configuration files. |
| `host-{hostname}/` | Configurations that should apply to that host only. |
| `local/bin` | Helper scripts that I've collected or wrote. |
| `scripts` | Setup scripts. |
| Path | Description |
| ------------------- | -------------------------------------------- |
| `.github` | GitHub Repository configuration files. |
| `hosts/{hostname}/` | Configs that should apply to that host only. |
| `local/bin` | Helper scripts that I've collected or wrote. |
| `scripts` | Setup scripts. |
### dotfile folders
| Repo | Destination | Description |
| --------- | ----------- | ------------------------------------------- |
| `base/` | `.*` | `$HOME` level files. |
| `config/` | `.config/` | Configurations for applications. |
| `local/` | `.local/` | XDG Base folder: `bin`, `share` and `state` |
| `ssh/` | `.ssh/` | SSH Configurations. |
@@ -44,13 +41,6 @@ and you need git to clone the repo. This will change soon™.
`.local/bin/dfm` is a shell script that has some tools that help with dotfiles management.
### `scripts/install-dotfiles.sh` - dotfiles linker
The `scripts/install-dotfiles.sh` is a `rcm` generated shell script
that does all the necessary linking.
To refresh the file, you can run `dfm dotfiles update`
## Configuration
The folder structure follows [XDG Base Directory Specification][xdg] where possible.
@@ -59,11 +49,12 @@ The folder structure follows [XDG Base Directory Specification][xdg] where possi
| Var | Default |
| ------------------ | -------------------- |
| Executables | `$HOME/.local/bin` |
| `$XDG_DATA_HOME` | `$HOME/.local/share` |
| `$XDG_STATE_HOME` | `$HOME/.local/state` |
| `$XDG_CONFIG_HOME` | `$HOME/.config` |
| `$XDG_BIN_HOME` | `$HOME/.local/bin` |
- `$XDG_BIN_HOME` is a custom `env` for `.local/bin` folder.
- `$XDG_DATA_HOME` defines the base directory relative to which user-specific data
files should be stored. If `$XDG_DATA_HOME` is either not set or empty,
a default equal to `$HOME/.local/share` should be used.
@@ -95,9 +86,9 @@ The folder structure follows [XDG Base Directory Specification][xdg] where possi
### Interesting dotfiles repos
- [https://dotfiles.github.io/inspiration/](dotfiles.github.io/inspiration)
- [https://github.com/frdmn/dotfiles](github.com/frdmn/dotfiles) - Ansible-based
- [dotfiles.github.io/inspiration/](https://dotfiles.github.io/inspiration)
- [frdmn/dotfiles](https://github.com/github.com/frdmn/dotfiles) - Ansible-based
dotfile setup for macOS
- [https://github.com/mvdan/dotfiles](mvdan/dotfiles) - Here be dragons
- [https://github.com/vsouza/dotfiles](vsouza/dotfiles) - 🏡 My dotfiles
- [https://github.com/freekmurze/dotfiles](freekmurze/dotfiles) - My personal dotfiles
- [mvdan/dotfiles](https://github.com/mvdan/dotfiles) - Here be dragons
- [vsouza/dotfiles](https://github.com/vsouza/dotfiles) - 🏡 My dotfiles
- [freekmurze/dotfiles](https://github.com/freekmurze/dotfiles) - My personal dotfiles

113
base/bashrc Normal file
View File

@@ -0,0 +1,113 @@
# shellcheck shell=bash
# Defaults
export DOTFILES="$HOME/.dotfiles"
# Explicitly set XDG folders
# https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html
export XDG_DATA_HOME="$HOME/.local/share"
export XDG_CONFIG_HOME="$HOME/.config"
export XDG_STATE_HOME="$HOME/.local/state"
export XDG_BIN_HOME="$HOME/.local/bin" # this one is custom
# Homebrew configuration
export HOMEBREW="/opt/homebrew"
export HOMEBREW_BIN="$HOMEBREW/bin"
export HOMEBREW_SBIN="$HOMEBREW/sbin"
export HOMEBREW_PKG="$HOMEBREW/opt"
export HOMEBREW_NO_ENV_HINTS=1
export PATH="$XDG_BIN_HOME:$HOMEBREW_BIN:$HOMEBREW_SBIN:/usr/local/sbin:$PATH"
# brew, https://brew.sh
if command -v brew &> /dev/null; then
BREW_BIN=$(brew --prefix)/bin
BREW_SBIN=$(brew --prefix)/sbin
BREW_PYTHON=$(brew --prefix python@3.8)/bin
GNUBIN_DIR=$(brew --prefix coreutils)/libexec/gnubin
BREW_RUBY=$(brew --prefix ruby)/bin
BREW_GEMS=$(gem environment gemdir)/bin
export PATH="$BREW_PYTHON:$GNUBIN_DIR:$BREW_GEMS:$BREW_RUBY:$BREW_BIN:$BREW_SBIN:$PATH"
fi
# nvm, the node version manager
export NVM_LAZY_LOAD=true
export NVM_COMPLETION=true
export NVM_AUTO_USE=true
export NVM_DIR="$([ -z "${XDG_CONFIG_HOME-}" ] && printf %s "${HOME}/.nvm" || printf %s "${XDG_CONFIG_HOME}/nvm")"
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm
# If we have go packages, include them to the PATH
if command -v go &> /dev/null; then
export GOPATH=$(go env GOPATH);
if [ -d "$GOPATH/bin" ]; then
export PATH="$GOPATH/bin:$PATH"
fi
fi
if command -v nvim &> /dev/null; then
export EDITOR="nvim"
fi
# z, https://github.com/rupa/z
export _Z_DATA="$XDG_STATE_HOME/z"
# composer, https://getcomposer.org/
if command -v composer &> /dev/null; then
export COMPOSER_HOME="$XDG_STATE_HOME/composer"
export COMPOSER_BIN="$COMPOSER_HOME/vendor/bin"
export PATH="$COMPOSER_BIN:$PATH"
fi
# gem, rubygems
if command -v gem &>/dev/null; then
export GEM_HOME="$XDG_STATE_HOME/gem"
export GEM_PATH="$XDG_STATE_HOME/gem"
fi
# wakatime, https://github.com/wakatime/wakatime-cli
export WAKATIME_HOME="$XDG_STATE_HOME/wakatime"
# Run x-load-configs in your terminal to reload the files.
function x-load-configs()
{
# Load the shell dotfiles, and then some:
for file in $DOTFILES/config/{exports,alias,functions}; do
[ -r "$file" ] && [ -f "$file" ] && source "$file"
[ -r "$file-secret" ] && [ -f "$file-secret" ] && source "$file-secret"
[ -r "$file-$HOSTNAME" ] && [ -f "$file-$HOSTNAME" ] && source "$file-$HOSTNAME"
[ -r "$file-$HOSTNAME-secret" ] && [ -f "$file-$HOSTNAME-secret" ] && source "$file-$HOSTNAME-secret"
done
}
x-load-configs
# Import ssh keys in keychain
ssh-add -A 2>/dev/null;
# op (1Password cli) is present
if hash op 2>/dev/null; then
export OP_CACHE="$XDG_STATE_HOME/1password"
mkdir -p "$OP_CACHE";
eval "$(op completion zsh)"; compdef _op op
fi
# Ansible configuration
# https://docs.ansible.com/ansible/latest/reference_appendices/config.html
if hash ansible 2>/dev/null; then
export ANSIBLE_HOME="$XDG_STATE_HOME/ansible"
mkdir -p "$ANSIBLE_HOME"
fi
# gcloud is present
#if hash gcloud 2>/dev/null; then
# GCLOUD_LOC=$(gcloud info --format="value(installation.sdk_root)" --quiet)
# [[ -f "$GCLOUD_LOC/path.zsh.inc" ]] && builtin source "$GCLOUD_LOC/path.zsh.inc"
# [[ -f "$GCLOUD_LOC/completion.zsh.inc" ]] && builtin source "$GCLOUD_LOC/completion.zsh.inc"
#fi
# Load iterm2 shell integration
# https://iterm2.com/documentation-shell-integration.html
[[ -f "$XDG_BIN_HOME/iterm2_shell_integration.zsh" ]] && source "$XDG_BIN_HOME/iterm2_shell_integration.zsh"

View File

View File

View File

View File

21
bashrc
View File

@@ -1,21 +0,0 @@
# shellcheck shell=bash
# Fig pre block. Keep at the top of this file.
[[ -f "$HOME/.fig/shell/bashrc.pre.bash" ]] && builtin source "$HOME/.fig/shell/bashrc.pre.bash"
if command -v brew &> /dev/null; then
PHP_PATH=$(brew --prefix php)/bin
export PATH="$PHP_PATH:$HOME/.composer/vendor/bin/:/usr/local/sbin:$PATH"
fi
if command -v nvm &> /dev/null; then
export NVM_DIR="$HOME/.nvm"
[ -s "/usr/local/opt/nvm/nvm.sh" ] && . "/usr/local/opt/nvm/nvm.sh" # This loads nvm
[ -s "/usr/local/opt/nvm/etc/bash_completion.d/nvm" ] && . "/usr/local/opt/nvm/etc/bash_completion.d/nvm" # This loads nvm bash_completion
fi
# Fig post block. Keep at the bottom of this file.
[[ -f "$HOME/.fig/shell/bashrc.post.bash" ]] && builtin source "$HOME/.fig/shell/bashrc.post.bash"
[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion

View File

@@ -55,7 +55,7 @@
recurse = true
[credential "https://github.com"]
helper =
helper = !/usr/bin/gh auth git-credential
helper = !/opt/homebrew/bin/gh auth git-credential
[credential "https://gist.github.com"]
helper =
helper = !/usr/bin/gh auth git-credential
helper = !/opt/homebrew/bin/gh auth git-credential

View File

@@ -1,3 +1,3 @@
# .dotfiles/host-air
# .dotfiles/hosts/air
This is my home computer.

View File

@@ -1,3 +1,3 @@
# .dotfiles/host-v
# .dotfiles/hosts/v
This is my work computer.

View File

@@ -18,5 +18,6 @@ git submodule update --init --recursive
--plugin-dir=dotbot-plugins/dotbot-gh-extension \
--plugin-dir=dotbot-plugins/dotbot-golang \
--plugin-dir=dotbot-plugins/dotbot-if \
-p dotbot-plugins/dotbot-if/if.py \
-c "${CONFIG}" \
"${@}"

View File

@@ -1,13 +1,13 @@
---
- defaults:
brew:
stderr: false
stderr: true
stdout: true
brewfile:
stderr: true
stdout: true
link:
create: true
relative: true
relink: true
- clean:
@@ -27,72 +27,92 @@
~/Code:
- link:
~/.bashrc:
~/.ecrc:
~/.git_profiles:
~/.huskyrc:
~/.plan:
~/.shellcheckrc:
~/.vuerc:
~/.config/:
path: config/
glob: true
path: config/**
~/.local/bin/:
path: local/bin/
glob: true
path: local/bin/**
~/.ssh/:
force: true
glob: true
mode: 600
path: ssh/**
~/.zshrc:
~/:
force: true
path: zshrc
glob: true
path: base/**
prefix: '.'
- shell:
- [git submodule update --init --recursive --force]
- [bash scripts/set-macos-defaults.sh]
- [bash scripts/install-npm-packages.sh]
- brewfile:
- Brewfile
- go:
- github.com/skx/sysbox@latest
# hosts: air
- if:
- cond: "[ $(uname) = Darwin ]"
- cond: '[[ $(hostname) = air ]]'
met:
- brewfile:
- Brewfile
- cond: "[[ $(hostname) = v ]]"
met:
- link:
~/.config/*:
force: true
glob: true
path: host-v/config/**
- go:
- github.com/delicb/cliware
- github.com/skx/sysbox@latest
- cond: "[[ $(hostname) = lakka ]]"
# hosts: v
- if:
- cond: '[[ $(hostname) = v ]]'
met:
- link:
~/.config/:
glob: true
force: true
path: hosts/v/config/**
- go:
- github.com/skx/sysbox@latest
# hosts: lakka
- if:
- cond: '[[ $(hostname) = lakka ]]'
met:
- link:
~/.irssi/*:
force: true
glob: true
path: host-lakka/irssi/**
path: hosts/lakka/irssi/**
~/.zshrc*:
force: true
path: host-lakka/zshrc
- cond: "command -v npm"
met:
- shell:
- bash "$HOME/.dotfiles/scripts/install-npm-packages.sh"
path: hosts/lakka/zshrc
# GitHub CLI Extensions
- ghe:
# GitHub CLI extension for generating a report on repository dependencies.
- andyfeller/gh-dependency-report
# GitHub CLI extension to generate montage from GitHub user avatars
- andyfeller/gh-montage
# An opinionated GitHub Cli extension for creating
# changelogs that adhere to the keep a changelog specification.
- chelnak/gh-changelog
# Safely deletes local branches with no upstream and no un-pushed commits
- davidraviv/gh-clean-branches
# A beautiful CLI dashboard for GitHub 🚀
- dlvhdr/gh-dash
# GitHub CLI extension for reviewing Dependabot PRs.
- einride/gh-dependabot
- heaths/gh-label
# A GitHub CLI extension that provides summary pull request metrics.
- hectcastro/gh-metrics
# A github-cli extension script to clone all repositories
# in an organization, optionally filtering by topic.
- matt-bartel/gh-clone-org
# being an extension to view the overall health of an organization's use of actions
- rsese/gh-actions-status
- samcoe/gh-triage
# Generate account/organization/enterprise reports
- stoe/gh-report
# Organisation specific extension for gh cli to retrieve different statistics
- VildMedPap/gh-orgstats
- vilmibm/gh-screensaver
- vilmibm/gh-user-status
- shell: [git submodule update --init --recursive]

View File

@@ -11,6 +11,7 @@
: "${DOTFILES:=$HOME/.dotfiles}"
: "${INSTALL_SCRIPT:=$DOTFILES/scripts/install-dotfiles.sh}"
: "${BREWFILE:=$DOTFILES/Brewfile}"
: "${HOSTFILES:=$DOTFILES/hosts}"
SCRIPT=$(basename "$0")
@@ -26,7 +27,7 @@ function section_install
$0 install antigen
$0 install starship
$0 install macos
$0 install ext_npm
$0 install npm
;;
antigen)
curl -L git.io/antigen > "$DOTFILES/local/bin/antigen.zsh" && msg_done "🎉 New antigen installed!"
@@ -37,18 +38,18 @@ function section_install
macos)
bash "$DOTFILES/scripts/set-macos-defaults.sh" && msg_done "🎉 Brewfile defined apps has been installed!"
;;
ext_npm)
npm)
bash "$DOTFILES/scripts/install-npm-packages.sh" && msg_done "NPM Packages have been installed!"
;;
settler)
bash "$DOTFILES/scripts/settler.sh" && msg_done "🎉 Settler has been run!"
;;
*)
menu_section "$USAGE_PREFIX" "all | antigen | starship | ext_npm | macos | settler"
menu_section "$USAGE_PREFIX" "all | antigen | starship | npm | macos | settler"
menu_item "all" "Installs antigen, macos, brew and ext_gh"
menu_item "antigen" "Updates the antigen.zsh file"
menu_item "starship" "Install starship.rs"
menu_item "ext_npm" "Install NPM Packages"
menu_item "npm" "Install NPM Packages"
menu_item "macos" "Setup nice macOS defaults"
menu_item "settler" "Runs the WIP settler.sh"
;;
@@ -112,7 +113,7 @@ function section_dotfiles
ln -s ~/.dotfiles/config/astronvim ~/.config/astronvim
ln -s ~/.dotfiles/config/nvim ~/.config/nvim
msg_ok "Linked nvim and astronvim"
hash npm 2>/dev/null && $0 install ext_npm
hash npm 2>/dev/null && $0 install npm
msg_ok "Installed packages"
msg_done "...and we are done!"
;;
@@ -132,6 +133,29 @@ function section_dotfiles
esac
}
function section_check
{
USAGE_PREFIX="$SCRIPT check"
X_HOSTNAME=$(hostname)
X_ARCH=$(uname)
case "$1" in
a|arch)
[[ "$2" = "" ]] && echo "$X_ARCH" && exit 0
[[ $X_ARCH = "$2" ]] && exit 0 || exit 1
;;
h|host|hostname)
[[ "$2" = "" ]] && echo "$X_HOSTNAME" && exit 0
[[ $X_HOSTNAME = "$2" ]] && exit 0 || exit 1
;;
*)
menu_section "$USAGE_PREFIX" "arch | host"
menu_item "arch <arch>" "Empty returns current. Exit code 0 when match, 1 when not."
menu_item "host <host>" "Empty returns current. Exit code 0 when match, 1 when not."
;;
esac
}
# Secret menu for visual tests
function section_tests
{
@@ -160,13 +184,15 @@ function section_tests
function usage
{
echo ""
menu_section "Usage: $SCRIPT" "install | reset | brew | dotfiles"
menu_section "Usage: $SCRIPT" "install | reset | brew | check | dotfiles"
echo $" All commands have their own subcommands."
echo ""
section_install
echo ""
section_brew
echo ""
section_check
echo ""
section_dotfiles
}
@@ -174,6 +200,7 @@ function usage
case "$1" in
install) section_install "$2" ;;
brew) section_brew "$2" ;;
check) section_check "$2" ;;
dotfiles) section_dotfiles "$2" ;;
tests) section_tests "$2" ;;
*) usage && exit 0 ;;

View File

@@ -1,53 +0,0 @@
#!/usr/bin/env bash
# Install GitHub CLI extensions
#
# shellcheck source="shared.sh"
source "$HOME/.dotfiles/scripts/shared.sh"
if ! command -v gh &> /dev/null; then
msg_run "gh (GitHub Client) could not be found, please install it first"
else
extensions=(
# GitHub CLI extension for reviewing Dependabot PRs.
einride/gh-dependabot
# A GitHub CLI extension that provides summary pull request metrics.
hectcastro/gh-metrics
# being an extension to view the overall health of an organization's use of actions
rsese/gh-actions-status
# GitHub CLI extension for label management
heaths/gh-label
# An opinionated GitHub Cli extension for creating
# changelogs that adhere to the keep a changelog specification.
chelnak/gh-changelog
# Safely deletes local branches with no upstream and no un-pushed commits
davidraviv/gh-clean-branches
# A beautiful CLI dashboard for GitHub 🚀
dlvhdr/gh-dash
# A github-cli extension script to clone all repositories
# in an organization, optionally filtering by topic.
matt-bartel/gh-clone-org
# GitHub CLI extension to generate montage from GitHub user avatars
andyfeller/gh-montage
# Organisation specific extension for gh cli to retrieve different statistics
VildMedPap/gh-orgstats
# GitHub CLI extension for generating a report on repository dependencies.
andyfeller/gh-dependency-report
# gh cli extension to generate account/organization/enterprise reports
stoe/gh-report
)
msg "Starting to install GitHub CLI extensions..."
for ext in "${extensions[@]}"; do
# Trim spaces
ext=${ext// /}
# Skip comments
if [[ ${ext:0:1} == "#" ]]; then continue; fi
msg_run "Installing $ext"
gh extensions install "$ext"
echo ""
done
msg_ok "Done"
fi

View File

@@ -1,6 +1,6 @@
#!/usr/bin/env bash
#
# Settler - my macOS setup automator
# Install XCode CLI Tools with osascript magic.
# Ismo Vuorinen <https://github.com/ivuorinen> 2018
#

View File

@@ -1,16 +1,7 @@
Host github.com
User git
HostName github.com
IdentityFile ~/.ssh/id_rsa
Host bitbucket.com
Hostname bitbucket.com
IdentityFile ~/.ssh/id_rsa
Host gitlab.com
Hostname gitlab.com
IdentityFile ~/.ssh/id_rsa
User git
Host *
IdentityAgent "~/Library/Group Containers/2BUA8C4S2C.com.1password/t/agent.sock"
# IdentityAgent "~/Library/Group Containers/2BUA8C4S2C.com.1password/t/agent.sock"
IdentityFile ~/.ssh/id_rsa