Merge branch 'main' into git

.chezmoiexternal.toml

@@ -1,3 +1,7 @@
+[".local/share/alacritty/alacritty-theme"]
+type = "git-repo"
+url = "https://github.com/alacritty/alacritty-theme"
+
 [".local/share/nushell/default_env.nu"]
 type = "file"
 url = "https://raw.githubusercontent.com/nushell/nushell/0.86.0/crates/nu-utils/src/sample_config/default_env.nu"

.chezmoiignore

@@ -1,7 +1,7 @@
 .git
 .tea
+.pkgx
 .local
-.chezmoi
 .hyperfine.js
 bin
 docker-compose.yaml
@@ -12,6 +12,7 @@ entrypoint.sh
 README.md
 
 # Cache
+.cache
 .dccache
 .cs_cache
 .pnpm-state
@@ -31,7 +32,9 @@ README.md
 .config/zsh/.zcompdump*
 
 # SSH
-.ssh/known_hosts
+.ssh/id_rsa
+.ssh/id_rsa.pub
+.ssh/known_hosts*
 .ssh/environment-
 .ssh/codespaces.auto
 .ssh/codespaces.auto.pub
@@ -49,6 +52,7 @@ README.md
 .config/zsh/.zsh_sessions
 .zsh_sessions
 .config/nushell/history.txt
+.config/nushell/history.sqlite*
 
 # VIM
 .vim
@@ -100,7 +104,6 @@ Public
 Support
 
 # Extra files
-.config/chezmoi
 .config/coc
 .config/containers
 .config/docker
@@ -115,6 +118,7 @@ Support
 # Cache in config
 .config/todoist
 .config/tmux/plugins
+.config/chezmoi/chezmoistate.boltdb
 
 # Unmanaged
 .actrc
@@ -138,5 +142,6 @@ Support
 
 **/.DS_Store
 
+Code
 GitHub
 OrbStack

dot_config/alacritty/alacritty.yml

@@ -1,3 +1,8 @@
 window:
   option_as_alt: Both
 
+font:
+  normal:
+    family: Hack
+
+live_config_reload: true

dot_config/chezmoi/chezmoi.toml

@@ -0,0 +1,4 @@
+[git]
+    autoCommit = true
+    autoPush = true
+

dot_config/git/config

@@ -34,6 +34,10 @@
     clean = git-lfs clean -- %f
     smudge = git-lfs smudge -- %f
 
+[user]
+	name = Jason Morganson
+	email = [email protected]
+
 [credential "https://github.com"]
 	helper =
 	helper = !gh auth git-credential

dot_config/nushell/config.nu

@@ -7,7 +7,9 @@ $env.config = (
   | upsert history.isolation true
 )
 
+
 use xdg.nu
+use theme.nu
 use ls_colors.nu
 overlay use git.nu
 overlay use aliases.nu

dot_config/nushell/env.nu

@@ -1,10 +1,11 @@
 source ~/.local/share/nushell/default_env.nu
 
-$env.NU_LIB_DIRS = ($env.NU_LIB_DIRS | default [] | append ($env.HOME | path join ".config" "nushell" "scripts"))
+bash -c $"source ($env.HOME)/.profile && env"
+    | lines
+    | parse "{name}={value}"
+    | filter { |var| (not $var.name in $env) or $var.value != ($env | get $var.name) }
+    | where not name in ["_", "LAST_EXIT_CODE", "DIRS_POSITION"]
+    | transpose --header-row
+    | into record
+    | load-env
 
-$env.PATH = (
-  $env.PATH
-  | split row (char esep)
-  | prepend "/usr/local/bin"
-  | prepend ($env.HOME | path join '.local' 'bin')
-)

dot_config/nushell/scripts/aliases.nu

@@ -1,3 +1,6 @@
+# https://www.nushell.sh/book/aliases.html#piping-in-aliases
+def lsg [] { ls | sort-by type name -i | grid -c | str trim }
+
 export alias l = ls
 export alias ls = ls
 export alias la = ls -a
@@ -43,6 +46,8 @@ export alias unpushed = git log --branches --not --remotes --no-walk --decorate
 export alias stashes = git stash list
 export alias untracked = git status --untracked
 
+export def unclean [] { gfold -d json ~/Code | from json | where status != Clean }
+
 export def undone [] {
   untracked
   unpushed

dot_config/nushell/scripts/theme.nu

@@ -0,0 +1,9 @@
+module theme {
+  export def dark [] {
+    $env.config.color_config = $dark_theme
+  }
+
+  export def light [] {
+    $env.config.color_config = $light_theme
+  }
+}

dot_config/topgrade/topgrade.toml

@@ -0,0 +1,22 @@
+[git]
+
+# Git repositories that you want to pull and push
+repos = [
+    "~/Code/*/**",
+    "~/.local/share/chezmoi"
+]
+
+# Arguments to pass Git when pulling repositories
+pull_arguments = "--rebase --autostash"
+
+# Arguments to pass Git when pushing repositories
+push_arguments = "--all"
+
+[misc]
+
+# Skip sending a notification at the end of a run (default: false)
+skip_notify = true
+
+# Commands to run after anything
+[post_commands]
+"Update brew bundle" = "/opt/homebrew/bin/brew bundle dump --force --file /Users/jasonmorganson/Library/Mobile Documents/com~apple~CloudDocs/Homebrew/Brewfile"

dot_config/zellij/config.kdl

@@ -0,0 +1,2 @@
+simplified_ui true
+

dot_profile

@@ -15,3 +15,9 @@ export XDG_PUBLICSHARE_DIR="$HOME/Public"
 export XDG_TEMPLATES_DIR="$HOME/Templates"
 export XDG_VIDEOS_DIR="$HOME/Videos"
 
+# PATH
+export PATH="$HOME/.local/bin:/opt/homebrew/bin:/usr/local/bin:/usr/bin:/usr/sbin:/bin:/sbin"
+
+# Homebrew
+export HOMEBREW_BUNDLE_FILE="~/Library/Mobile Documents/com~apple~CloudDocs/Homebrew/Brewfile"
+

dot_ssh/config

@@ -4,3 +4,29 @@ Host *
     AddKeysToAgent yes
     SetEnv TERM=xterm-256color
 
+Host jason-testing-prod-1
+    HostName jason-testing-prod-1
+    User ubuntu
+    IdentityFile ./LightsailDefaultKey-us-east-1.pem 
+    RequestTTY force
+    RemoteCommand tmux attach
+
+Host bucephalus-platform-dev-2
+    HostName bucephalus-platform-dev-2
+    User ubuntu
+    IdentityFile ./LightsailDefaultKey-us-east-1.pem 
+    RequestTTY force
+    RemoteCommand tmux attach
+
+Host bucephalus-platform-prod
+    HostName bucephalus-platform-prod
+    User ubuntu
+    IdentityFile ./LightsailDefaultKey-us-east-1.pem 
+    RequestTTY force
+    RemoteCommand tmux attach
+
+Host imapsync
+    HostName imapsync
+    User jasonmorganson
+    RequestTTY force
+    RemoteCommand zellij attach --create

private_Library/LaunchAgents/io.github.topgrade-rs.topgrade.plist

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>Label</key>
+    <string>io.github.topgrade-rs.topgrade</string>
+
+    <key>ProgramArguments</key>
+    <array>
+        <string>/opt/homebrew/bin/topgrade</string>
+    </array>
+
+    <key>StartInterval</key>
+    <integer>10800</integer> <!-- Number of seconds in 3 hours -->
+
+    <key>RunAtLoad</key>
+    <true/>
+
+    <key>StandardErrorPath</key>
+    <string>/tmp/io.github.topgrade-rs.topgrade/err</string>
+
+    <key>StandardOutPath</key>
+    <string>/tmp/io.github.topgrade-rs.topgrade/out</string>
+</dict>
+</plist>

private_Library/private_Application Support/symlink_nushell.tmpl

@@ -0,0 +1 @@
+{{ env "HOME" }}/.config/nushell