actually fixed chezmoi on phone

realFiles/topgrade/laptop/topgrade

@@ -0,0 +1,98 @@
+[misc]
+# Don't ask for confirmations
+#assume_yes = true
+
+# Disable specific steps - same options as the command line flag
+disable = ["tldr", "pip3", "node", "vim", "git_repos", "containers", "asdf", "distrobox", "helix", "composer", "yarn", "cargo", "remotes", "rustup", "vscode", "powershell", "dotnet", "flatpak", "shell",  "snap", "sheldon", "clam_av_db"]
+
+# Skip Notify
+skip_notify = true
+
+# Ignore failures for these steps
+#ignore_failures = ["powershell"]
+
+# Run specific steps - same options as the command line flag
+#only = ["system", "emacs"]
+
+# Do not ask to retry failed steps (default: false)
+#no_retry = true
+
+# Run inside tmux
+#run_in_tmux = true
+
+# List of remote machines with Topgrade installed on them
+remote_topgrades = ["pxm", "web", "kube"] # "infra",
+
+# Arguments to pass SSH when upgrading remote systems
+#ssh_arguments = "-o ConnectTimeout=2"
+
+# Path to Topgrade executable on remote machines
+remote_topgrade_path = ".local/bin/topgrade"
+
+# Arguments to pass tmux when pulling Repositories
+#tmux_arguments = "-S /var/tmux.sock"
+
+# Do not set the terminal title
+#set_title = false
+
+# Cleanup temporary or old files
+#cleanup = true
+
+[git]
+#max_concurrency = 5
+
+# Additional git repositories to pull
+#repos = [ "~/src/*/", "~/.config/something" ]
+
+# Don't pull the predefined git repos
+#predefined_repos = false
+
+# Arguments to pass Git when pulling Repositories
+#arguments = "--rebase --autostash"
+
+[composer]
+#self_update = true
+
+# Commands to run before anything
+[pre_commands]
+#"Emacs Snapshot" = "rm -rf ~/.emacs.d/elpa.bak && cp -rl ~/.emacs.d/elpa ~/.emacs.d/elpa.bak"
+
+# Custom commands
+[commands]
+#"Bedrock: Check Updates" = "sudo brl update"
+#"Bedrock: Check Strata" = "sudo pmm -Syyuu"
+#"Distrobox: Update all" = "distrobox upgrade --all"
+
+[brew]
+#greedy_cask = true
+
+[linux]
+# Arguments to pass yay when updating packages
+#yay_arguments = "--nodevel"
+#trizen_arguments = "--devel"
+#enable_tlmgr = true
+#emerge_sync_flags = "-q"
+#emerge_update_flags = "-uDNa --with-bdeps=y world"
+#redhat_distro_sync = false
+#rpm_ostree = false
+
+[windows]
+# Manually select Windows updates
+#accept_all_updates = false
+#open_remotes_in_new_terminal = true
+
+# Causes Topgrade to rename itself during the run to allow package managers to upgrade it.
+# Use this only if you installed Topgrade by using a package manager such as Scoop to Cargo
+#self_rename = true
+
+[npm]
+# Use sudo if the NPM directory isn't owned by the current user
+#use_sudo = true
+
+[firmware]
+# Offer to update firmware; if false just check for and display available updates
+#upgrade = true
+
+[flatpak]
+# Use sudo for updating the system-wide installation
+#use_sudo = true

realFiles/topgrade/other/pxm/topgrade

@@ -0,0 +1,98 @@
+[misc]
+# Don't ask for confirmations
+#assume_yes = true
+
+# Disable specific steps - same options as the command line flag
+disable = ["tldr", "pip3", "node", "vim", "git_repos", "containers", "asdf", "distrobox", "helix", "composer", "yarn", "cargo", "remotes", "rustup", "vscode", "powershell", "dotnet", "flatpak", "shell",  "snap", "firmware", "sheldon", "clam_av_db"]
+
+# Skip Notify
+skip_notify = true
+
+# Ignore failures for these steps
+#ignore_failures = ["powershell"]
+
+# Run specific steps - same options as the command line flag
+#only = ["system", "emacs"]
+
+# Do not ask to retry failed steps (default: false)
+#no_retry = true
+
+# Run inside tmux
+#run_in_tmux = true
+
+# List of remote machines with Topgrade installed on them
+remote_topgrades = ["kali", "mail"]
+
+# Arguments to pass SSH when upgrading remote systems
+#ssh_arguments = "-o ConnectTimeout=2"
+
+# Path to Topgrade executable on remote machines
+remote_topgrade_path = ".local/bin/topgrade"
+
+# Arguments to pass tmux when pulling Repositories
+#tmux_arguments = "-S /var/tmux.sock"
+
+# Do not set the terminal title
+#set_title = false
+
+# Cleanup temporary or old files
+#cleanup = true
+
+[git]
+#max_concurrency = 5
+
+# Additional git repositories to pull
+#repos = [ "~/src/*/", "~/.config/something" ]
+
+# Don't pull the predefined git repos
+#predefined_repos = false
+
+# Arguments to pass Git when pulling Repositories
+#arguments = "--rebase --autostash"
+
+[composer]
+#self_update = true
+
+# Commands to run before anything
+[pre_commands]
+#"Emacs Snapshot" = "rm -rf ~/.emacs.d/elpa.bak && cp -rl ~/.emacs.d/elpa ~/.emacs.d/elpa.bak"
+
+# Custom commands
+[commands]
+#"Bedrock: Check Updates" = "sudo brl update"
+#"Bedrock: Check Strata" = "sudo pmm -Syyuu"
+#"Distrobox: Update all" = "distrobox upgrade --all"
+
+[brew]
+#greedy_cask = true
+
+[linux]
+# Arguments to pass yay when updating packages
+#yay_arguments = "--nodevel"
+#trizen_arguments = "--devel"
+#enable_tlmgr = true
+#emerge_sync_flags = "-q"
+#emerge_update_flags = "-uDNa --with-bdeps=y world"
+#redhat_distro_sync = false
+#rpm_ostree = false
+
+[windows]
+# Manually select Windows updates
+#accept_all_updates = false
+#open_remotes_in_new_terminal = true
+
+# Causes Topgrade to rename itself during the run to allow package managers to upgrade it.
+# Use this only if you installed Topgrade by using a package manager such as Scoop to Cargo
+#self_rename = true
+
+[npm]
+# Use sudo if the NPM directory isn't owned by the current user
+#use_sudo = true
+
+[firmware]
+# Offer to update firmware; if false just check for and display available updates
+#upgrade = true
+
+[flatpak]
+# Use sudo for updating the system-wide installation
+#use_sudo = true

realFiles/topgrade/other/topgrade

@@ -0,0 +1,98 @@
+[misc]
+# Don't ask for confirmations
+#assume_yes = true
+
+# Disable specific steps - same options as the command line flag
+disable = ["tldr", "pip3", "node", "vim", "git_repos", "containers", "asdf", "distrobox", "helix", "composer", "yarn", "cargo", "remotes", "rustup", "vscode", "powershell", "dotnet", "flatpak", "shell",  "snap", "firmware", "sheldon", "clam_av_db"]
+
+# Skip Notify
+skip_notify = true
+
+# Ignore failures for these steps
+#ignore_failures = ["powershell"]
+
+# Run specific steps - same options as the command line flag
+#only = ["system", "emacs"]
+
+# Do not ask to retry failed steps (default: false)
+#no_retry = true
+
+# Run inside tmux
+#run_in_tmux = true
+
+# List of remote machines with Topgrade installed on them
+remote_topgrades = ["pxm", "web", "kube"] # "infra",
+
+# Arguments to pass SSH when upgrading remote systems
+#ssh_arguments = "-o ConnectTimeout=2"
+
+# Path to Topgrade executable on remote machines
+remote_topgrade_path = ".local/bin/topgrade"
+
+# Arguments to pass tmux when pulling Repositories
+#tmux_arguments = "-S /var/tmux.sock"
+
+# Do not set the terminal title
+#set_title = false
+
+# Cleanup temporary or old files
+#cleanup = true
+
+[git]
+#max_concurrency = 5
+
+# Additional git repositories to pull
+#repos = [ "~/src/*/", "~/.config/something" ]
+
+# Don't pull the predefined git repos
+#predefined_repos = false
+
+# Arguments to pass Git when pulling Repositories
+#arguments = "--rebase --autostash"
+
+[composer]
+#self_update = true
+
+# Commands to run before anything
+[pre_commands]
+#"Emacs Snapshot" = "rm -rf ~/.emacs.d/elpa.bak && cp -rl ~/.emacs.d/elpa ~/.emacs.d/elpa.bak"
+
+# Custom commands
+[commands]
+#"Bedrock: Check Updates" = "sudo brl update"
+#"Bedrock: Check Strata" = "sudo pmm -Syyuu"
+#"Distrobox: Update all" = "distrobox upgrade --all"
+
+[brew]
+#greedy_cask = true
+
+[linux]
+# Arguments to pass yay when updating packages
+#yay_arguments = "--nodevel"
+#trizen_arguments = "--devel"
+#enable_tlmgr = true
+#emerge_sync_flags = "-q"
+#emerge_update_flags = "-uDNa --with-bdeps=y world"
+#redhat_distro_sync = false
+#rpm_ostree = false
+
+[windows]
+# Manually select Windows updates
+#accept_all_updates = false
+#open_remotes_in_new_terminal = true
+
+# Causes Topgrade to rename itself during the run to allow package managers to upgrade it.
+# Use this only if you installed Topgrade by using a package manager such as Scoop to Cargo
+#self_rename = true
+
+[npm]
+# Use sudo if the NPM directory isn't owned by the current user
+#use_sudo = true
+
+[firmware]
+# Offer to update firmware; if false just check for and display available updates
+#upgrade = true
+
+[flatpak]
+# Use sudo for updating the system-wide installation
+#use_sudo = true

realFiles/zsh/laptop/zsh_plugins

@@ -0,0 +1,30 @@
+# ohmyzsh
+getantidote/use-omz
+ohmyzsh/ohmyzsh path:lib
+
+# omz plugins
+ohmyzsh/ohmyzsh path:plugins/systemd
+ohmyzsh/ohmyzsh path:plugins/command-not-found
+ohmyzsh/ohmyzsh path:plugins/fzf
+ohmyzsh/ohmyzsh path:plugins/ssh-agent
+
+# utility plugins
+trapd00r/LS_COLORS
+3v1n0/zsh-bash-completions-fallback
+QuarticCat/zsh-smartcache
+unixorn/warhol.plugin.zsh
+twopizza9621536/zsh-eza
+fdellwing/zsh-bat
+amyreese/zsh-titles
+Aloxaf/fzf-tab
+
+# other plugins
+urbainvaes/fzf-marks
+sobolevn/wakatime-zsh-plugin
+laggardkernel/zsh-thefuck
+MichaelAquilina/zsh-you-should-use
+
+# fish like (load last)
+zsh-users/zsh-completions path:src kind:fpath
+zsh-users/zsh-autosuggestions
+zdharma-continuum/fast-syntax-highlighting

realFiles/zsh/laptop/zshenv

@@ -0,0 +1,64 @@
+# xdg stuff
+export XDG_CACHE_HOME="$HOME"/.cache
+export XDG_CONFIG_HOME="$HOME"/.config
+export XDG_CONFIG_DIRS=/etc/xdg
+export XDG_DATA_HOME="$HOME"/.local/share
+export XDG_DATA_DIRS=/usr/local/share:/usr/share:/var/lib/flatpak/exports/share:"$XDG_DATA_HOME"/flatpak/exports/share
+export XDG_STATE_HOME="$HOME"/.local/state
+export XDG_DESKTOP_DIR="$HOME"/Desktop
+export XDG_DOCUMENTS_DIR="$HOME"/Documents
+export XDG_DOWNLOAD_DIR="$HOME"/Downloads
+export XDG_MUSIC_DIR="$HOME"/Music
+export XDG_PICTURES_DIR="$HOME"/Pictures
+export XDG_VIDEOS_DIR="$HOME"/Videos
+export XDG_PROJECTS_DIR="$XDG_DOCUMENTS_DIR"/projects
+
+# cache files
+export NUGET_PACKAGES="$XDG_CACHE_HOME"/NuGetPackages
+export ZSH_EVALCACHE_DIR="$XDG_CACHE_HOME"/evalcache
+
+# config files
+export NBRC_PATH="$XDG_CONFIG_HOME"/nbrc
+export FZF_MARKS_FILE="$XDG_CONFIG_HOME"/fzfmarks
+export DOCKER_CONFIG="$XDG_CONFIG_HOME"/docker
+export GTK2_RC_FILES="$XDG_CONFIG_HOME"/gtk-2.0/gtkrc
+export _JAVA_OPTIONS=-Djava.util.prefs.userRoot="$XDG_CONFIG_HOME"/java
+export GDBHISTFILE="$XDG_CONFIG_HOME"/gdb/history
+export NPM_CONFIG_USERCONFIG="$XDG_CONFIG_HOME"/npm/npmrc
+
+# data files
+export XCURSOR_PATH=/usr/share/icons:"$XDG_DATA_HOME"/icons
+export GOPATH="$XDG_DATA_HOME"/go
+export CARGO_HOME="$XDG_DATA_HOME"/cargo
+export ASDF_DATA_DIR="$XDG_DATA_HOME"/asdf
+export NB_DIR="$XDG_DATA_HOME"/nb
+export DSTASK_GIT_REPO="$XDG_DATA_HOME"/dstask
+export WAKATIME_HOME="$XDG_DATA_HOME"/wakatime
+export WINEPREFIX="$XDG_DATA_HOME"/wine
+export RUSTUP_HOME="$XDG_DATA_HOME"/rustup
+export GNUPGHOME="$XDG_DATA_HOME"/gnupg
+export W3M_DIR="$XDG_DATA_HOME"/w3m
+export GIBO_BOILERPLATES="$XDG_DATA_HOME"/giboboilerplates
+export REDISCLI_HISTFILE="$XDG_DATA_HOME"/redis/history
+export IPFS_PATH="$XDG_DATA_HOME"/ipfs
+
+# other programs
+export LESSHISTFILE="$XDG_STATE_HOME"/less/history
+export EDITOR=nvim
+export ZSH_WAKATIME_BIN=/usr/bin/wakatime
+export PYTHONSTARTUP=/etc/python/pythonrc
+
+# stuff
+export ZELLIJ_AUTO_ATTACH=true
+export ZELLIJ_AUTO_EXIT=true
+export MANROFFOPT="-c"
+export FZF_DEFAULT_OPTS='--color=fg:#f8f8f2,bg:#282a36,hl:#bd93f9 --color=fg+:#f8f8f2,bg+:#44475a,hl+:#bd93f9 --color=info:#ffb86c,prompt:#50fa7b,pointer:#ff79c6 --color=marker:#ff79c6,spinner:#ffb86c,header:#6272a4'
+
+# zsh specific
+export SAVEHIST=$(( 100 * 1000 ))
+export HISTSIZE=$(( 1.2 * SAVEHIST ))
+export ZSH_CACHE_DIR="$XDG_CACHE_HOME"/zsh
+export HISTFILE="$ZSH_CACHE_DIR"/history
+export GPG_TTY="$TTY"
+export DIFFPROG='meld'
+export EXA_COLORS="uu=36:gu=37:sn=32:sb=32:da=34:ur=34:uw=35:ux=36:ue=36:gr=34:gw=35:gx=36:tr=34:tw=35:tx=36"

realFiles/zsh/laptop/zshrc

@@ -0,0 +1,37 @@
+test -v DISTROBOX_HOST_HOME && { unset ZDOTDIR; exec zsh }
+test -v SSH_CONNECTION && eval "$(zellij setup --generate-auto-start zsh)"
+
+# options
+setopt NO_CLOBBER
+unsetopt FLOW_CONTROL
+
+# deduplicate path
+typeset -U path PATH
+path+=("$XDG_DATA_HOME"/JetBrains/Toolbox/scripts) # jetbrains toolbox
+path+=("$XDG_DATA_HOME/mise/shims") # mise
+path+=("$HOME"/.local/bin) # local bin
+
+# startup banner
+potentialBanner=('joke bofh' 'joke dad' 'fastfetch')
+eval "$potentialBanner[$RANDOM%$#potentialBanner+1]"
+
+# antidote
+source '/usr/share/zsh-antidote/antidote.zsh'
+zstyle ':antidote:bundle' use-friendly-names 'yes'
+antidote load
+
+# load programs
+smartcache eval zoxide init --cmd cd zsh
+smartcache eval atuin init zsh
+smartcache eval direnv hook zsh
+smartcache eval mise activate zsh
+
+# source files
+source "$ZDOTDIR"/files/aliases.zsh
+source "$ZDOTDIR"/files/sshcomp.zsh
+
+# local overrides
+for sourced in "$XDG_DATA_HOME"/zsh/files/*; do source $sourced; done
+
+# theme
+eval "$(oh-my-posh init zsh --config="$XDG_CACHE_HOME/oh-my-posh/themes/emodipt-extend.omp.json")"

realFiles/zsh/other/zsh_plugins

@@ -0,0 +1,29 @@
+# ohmyzsh
+getantidote/use-omz
+ohmyzsh/ohmyzsh path:lib
+
+# omz plugins
+ohmyzsh/ohmyzsh path:plugins/systemd
+ohmyzsh/ohmyzsh path:plugins/command-not-found
+ohmyzsh/ohmyzsh path:plugins/fzf
+ohmyzsh/ohmyzsh path:plugins/ssh-agent
+
+# utility plugins
+trapd00r/LS_COLORS
+3v1n0/zsh-bash-completions-fallback
+QuarticCat/zsh-smartcache
+unixorn/warhol.plugin.zsh
+twopizza9621536/zsh-eza
+fdellwing/zsh-bat
+amyreese/zsh-titles
+Aloxaf/fzf-tab
+
+# other plugins
+urbainvaes/fzf-marks
+laggardkernel/zsh-thefuck
+MichaelAquilina/zsh-you-should-use
+
+# fish like (load last)
+zsh-users/zsh-completions path:src kind:fpath
+zsh-users/zsh-autosuggestions
+zdharma-continuum/fast-syntax-highlighting

realFiles/zsh/other/zshenv

@@ -0,0 +1,63 @@
+# xdg stuff
+export XDG_CACHE_HOME="$HOME"/.cache
+export XDG_CONFIG_HOME="$HOME"/.config
+export XDG_CONFIG_DIRS=/etc/xdg
+export XDG_DATA_HOME="$HOME"/.local/share
+export XDG_DATA_DIRS=/usr/local/share:/usr/share:/var/lib/flatpak/exports/share:"$XDG_DATA_HOME"/flatpak/exports/share
+export XDG_STATE_HOME="$HOME"/.local/state
+export XDG_DESKTOP_DIR="$HOME"/Desktop
+export XDG_DOCUMENTS_DIR="$HOME"/Documents
+export XDG_DOWNLOAD_DIR="$HOME"/Downloads
+export XDG_MUSIC_DIR="$HOME"/Music
+export XDG_PICTURES_DIR="$HOME"/Pictures
+export XDG_VIDEOS_DIR="$HOME"/Videos
+export XDG_PROJECTS_DIR="$XDG_DOCUMENTS_DIR"/projects
+
+# cache files
+export NUGET_PACKAGES="$XDG_CACHE_HOME"/NuGetPackages
+export ZSH_EVALCACHE_DIR="$XDG_CACHE_HOME"/evalcache
+
+# config files
+export NBRC_PATH="$XDG_CONFIG_HOME"/nbrc
+export FZF_MARKS_FILE="$XDG_CONFIG_HOME"/fzfmarks
+export DOCKER_CONFIG="$XDG_CONFIG_HOME"/docker
+export GTK2_RC_FILES="$XDG_CONFIG_HOME"/gtk-2.0/gtkrc
+export _JAVA_OPTIONS=-Djava.util.prefs.userRoot="$XDG_CONFIG_HOME"/java
+export GDBHISTFILE="$XDG_CONFIG_HOME"/gdb/history
+export NPM_CONFIG_USERCONFIG="$XDG_CONFIG_HOME"/npm/npmrc
+
+# data files
+export XCURSOR_PATH=/usr/share/icons:"$XDG_DATA_HOME"/icons
+export GOPATH="$XDG_DATA_HOME"/go
+export CARGO_HOME="$XDG_DATA_HOME"/cargo
+export ASDF_DATA_DIR="$XDG_DATA_HOME"/asdf
+export NB_DIR="$XDG_DATA_HOME"/nb
+export DSTASK_GIT_REPO="$XDG_DATA_HOME"/dstask
+export WAKATIME_HOME="$XDG_DATA_HOME"/wakatime
+export WINEPREFIX="$XDG_DATA_HOME"/wine
+export RUSTUP_HOME="$XDG_DATA_HOME"/rustup
+export GNUPGHOME="$XDG_DATA_HOME"/gnupg
+export W3M_DIR="$XDG_DATA_HOME"/w3m
+export GIBO_BOILERPLATES="$XDG_DATA_HOME"/giboboilerplates
+export REDISCLI_HISTFILE="$XDG_DATA_HOME"/redis/history
+export IPFS_PATH="$XDG_DATA_HOME"/ipfs
+
+# other programs
+export LESSHISTFILE="$XDG_STATE_HOME"/less/history
+export EDITOR=nano
+export ZSH_WAKATIME_BIN=/usr/bin/wakatime
+export PYTHONSTARTUP=/etc/python/pythonrc
+
+# stuff
+export ZELLIJ_AUTO_ATTACH=true
+export ZELLIJ_AUTO_EXIT=true
+export MANROFFOPT="-c"
+export FZF_DEFAULT_OPTS='--color=fg:#f8f8f2,bg:#282a36,hl:#bd93f9 --color=fg+:#f8f8f2,bg+:#44475a,hl+:#bd93f9 --color=info:#ffb86c,prompt:#50fa7b,pointer:#ff79c6 --color=marker:#ff79c6,spinner:#ffb86c,header:#6272a4'
+
+# zsh specific
+export SAVEHIST=$(( 100 * 1000 ))
+export HISTSIZE=$(( 1.2 * SAVEHIST ))
+export ZSH_CACHE_DIR="$XDG_CACHE_HOME"/zsh
+export HISTFILE="$ZSH_CACHE_DIR"/history
+export GPG_TTY="$TTY"
+export EXA_COLORS="uu=36:gu=37:sn=32:sb=32:da=34:ur=34:uw=35:ux=36:ue=36:gr=34:gw=35:gx=36:tr=34:tw=35:tx=36"

realFiles/zsh/other/zshrc

@@ -0,0 +1,32 @@
+# options
+setopt NO_CLOBBER
+unsetopt FLOW_CONTROL
+
+# deduplicate path
+typeset -U path PATH
+path+=("$HOME"/.local/bin) # local bin
+
+# startup banner
+potentialBanner=('joke bofh' 'joke dad' 'fastfetch')
+eval "$potentialBanner[$RANDOM%$#potentialBanner+1]"
+
+# antidote
+test -r "$XDG_DATA_HOME"/antidote/antidote.zsh || git clone https://github.com/mattmc3/antidote.git "$XDG_DATA_HOME"/antidote
+source "$XDG_DATA_HOME"/antidote/antidote.zsh
+zstyle ':antidote:bundle' use-friendly-names 'yes'
+antidote load
+
+# load programs
+smartcache eval zoxide init --cmd cd zsh
+smartcache eval atuin init zsh
+smartcache eval direnv hook zsh
+
+# source files
+source "$ZDOTDIR"/files/aliases.zsh
+source "$ZDOTDIR"/files/sshcomp.zsh
+
+# local overrides
+for sourced in "$XDG_DATA_HOME"/zsh/files/*; do source $sourced; done
+
+# theme
+eval "$(oh-my-posh init zsh --config="$XDG_CACHE_HOME/oh-my-posh/themes/emodipt-extend.omp.json")"