From 1f5a43ca196cabba5ee3653e1687e5b80e349a9e Mon Sep 17 00:00:00 2001 From: eeleater Date: Mon, 12 Aug 2024 18:55:50 +0200 Subject: [PATCH] updated sheldon --- dot_config/{topgrade.toml => topgrade.toml.tmpl} | 6 +++++- dot_config/zsh/{dot_zshenv => dot_zshenv.tmpl} | 2 ++ dot_config/zsh/dot_zshrc | 3 +++ 3 files changed, 10 insertions(+), 1 deletion(-) rename dot_config/{topgrade.toml => topgrade.toml.tmpl} (92%) rename dot_config/zsh/{dot_zshenv => dot_zshenv.tmpl} (97%) diff --git a/dot_config/topgrade.toml b/dot_config/topgrade.toml.tmpl similarity index 92% rename from dot_config/topgrade.toml rename to dot_config/topgrade.toml.tmpl index 8b93b8c..f293b35 100644 --- a/dot_config/topgrade.toml +++ b/dot_config/topgrade.toml.tmpl @@ -3,7 +3,7 @@ #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", "clam_av_db"] +disable = ["tldr", "pip3", "node", "vim", "git_repos", "containers", "asdf", "distrobox", "helix", "composer", "yarn", "cargo", "remotes", "rustup", "vscode", "powershell", "dotnet", "flatpak", "shell", "snap", "firmware", "clam_av_db"] # Skip Notify skip_notify = true @@ -21,7 +21,11 @@ skip_notify = true #run_in_tmux = true # List of remote machines with Topgrade installed on them +{{ if eq .chezmoi.hostname "pxm" }} +remote_topgrades = ["docker", "kali", "mail"] +{{ else }} remote_topgrades = ["pxm", "web", "infra"] +{{ end }} # Arguments to pass SSH when upgrading remote systems #ssh_arguments = "-o ConnectTimeout=2" diff --git a/dot_config/zsh/dot_zshenv b/dot_config/zsh/dot_zshenv.tmpl similarity index 97% rename from dot_config/zsh/dot_zshenv rename to dot_config/zsh/dot_zshenv.tmpl index ad78257..c409fc4 100644 --- a/dot_config/zsh/dot_zshenv +++ b/dot_config/zsh/dot_zshenv.tmpl @@ -60,6 +60,8 @@ export HISTSIZE=$(( 1.2 * SAVEHIST )) export ZSH_CACHE_DIR="$XDG_CACHE_HOME"/zsh export HISTFILE="$ZSH_CACHE_DIR"/history export GPG_TTY="$TTY" +{{ if eq .chezmoi.osRelease.id "endeavouros" }} export DIFFPROG='meld' +{{ end }} export AUTO_NTFY_DONE_IGNORE="ntfy emacs htop info less mail man meld most mutt nano screen ssh tail tmux top vi vim watch bat cat kate topgrade" 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" diff --git a/dot_config/zsh/dot_zshrc b/dot_config/zsh/dot_zshrc index 5f3757a..8927d24 100644 --- a/dot_config/zsh/dot_zshrc +++ b/dot_config/zsh/dot_zshrc @@ -10,6 +10,9 @@ path+=("$HOME"/.local/bin) # local bin potentialBanner=('joke bofh' 'joke dad' 'fastfetch') # 'colorscript random' 'joke hq dijkstra' 'joke hq knuth' 'joke hq perlis' 'joke hq mimsc' eval "$potentialBanner[$RANDOM%$#potentialBanner+1]" +# disable flowcontrol +stty -ixon + # source plugins eval "$(sheldon source)"