From 36bb6c8e29fc0591c5356e397e68f0cac9c9ff59 Mon Sep 17 00:00:00 2001 From: eeleater Date: Mon, 25 Nov 2024 01:49:10 +0100 Subject: [PATCH] revert b0910ee44c582738f33e2fe3e88da922aa594b6b revert actually fixed chezmoi on phone --- dot_config/kitty/themes/embark.conf | 53 +++++++++++ dot_config/kitty/themes/penumbra.conf | 91 +++++++++++++++++++ dot_config/sheldon/plugins.toml | 72 +++++++++++++++ dot_config/topgrade.toml.tmpl | 113 ++++++++++++++++++++++-- dot_config/zsh/dot_zsh_plugins.txt.tmpl | 37 ++++++-- dot_config/zsh/dot_zshenv.tmpl | 77 ++++++++++++++-- dot_config/zsh/dot_zshrc.tmpl | 53 +++++++++-- realFiles/topgrade/laptop/topgrade | 98 -------------------- realFiles/topgrade/other/pxm/topgrade | 98 -------------------- realFiles/topgrade/other/topgrade | 98 -------------------- realFiles/zsh/laptop/zsh_plugins | 30 ------- realFiles/zsh/laptop/zshenv | 64 -------------- realFiles/zsh/laptop/zshrc | 37 -------- realFiles/zsh/other/zsh_plugins | 29 ------ realFiles/zsh/other/zshenv | 63 ------------- realFiles/zsh/other/zshrc | 32 ------- 16 files changed, 474 insertions(+), 571 deletions(-) create mode 100644 dot_config/kitty/themes/embark.conf create mode 100644 dot_config/kitty/themes/penumbra.conf create mode 100644 dot_config/sheldon/plugins.toml delete mode 100644 realFiles/topgrade/laptop/topgrade delete mode 100644 realFiles/topgrade/other/pxm/topgrade delete mode 100644 realFiles/topgrade/other/topgrade delete mode 100644 realFiles/zsh/laptop/zsh_plugins delete mode 100644 realFiles/zsh/laptop/zshenv delete mode 100644 realFiles/zsh/laptop/zshrc delete mode 100644 realFiles/zsh/other/zsh_plugins delete mode 100644 realFiles/zsh/other/zshenv delete mode 100644 realFiles/zsh/other/zshrc diff --git a/dot_config/kitty/themes/embark.conf b/dot_config/kitty/themes/embark.conf new file mode 100644 index 0000000..aa45826 --- /dev/null +++ b/dot_config/kitty/themes/embark.conf @@ -0,0 +1,53 @@ +background #1E1C31 +foreground #CBE3E7 + +cursor #A1EFD3 + +selection_background #3E3859 +selection_foreground #CBE3E7 + +# black +color0 #1E1C31 +color8 #585273 + +# red +color1 #F48FB1 +color9 #F02E6E + +# green +color2 #A1EFD3 +color10 #7FE9C3 + +# yellow +color3 #FFE6B3 +color11 #F2B482 + +# blue +color4 #91DDFF +color12 #78A8FF + +# magenta +color5 #D4BFFF +color13 #7676FF + +# cyan +color6 #ABF8F7 +color14 #63F2F1 + +# white +color7 #CBE3E7 +color15 #8A889D + +active_border_color #A1EFD3 +inactive_border_color #585273 +bell_border_color #F56574 + +active_tab_foreground #2D2B40 +active_tab_background #63F2F1 +active_tab_font_style bold + +inactive_tab_foreground #CBE3E7 +inactive_tab_background #585273 +inactive_tab_font_style normal + +url_color #D4BFFF diff --git a/dot_config/kitty/themes/penumbra.conf b/dot_config/kitty/themes/penumbra.conf new file mode 100644 index 0000000..81e91cd --- /dev/null +++ b/dot_config/kitty/themes/penumbra.conf @@ -0,0 +1,91 @@ +# vim:ft=kitty + +## name: Penumbra +### license: MIT License +## blurb: Kitty terminal port of the dark Penumbra color theme +## by Neal McKee. https://github.com/nealmckee/penumbra +## This theme uses the balanced 7 colors plus sun and shade +## as well as the the contrast++ for the 16 color palette + +# Place this theme in your `~/.config/kitty/themes` directory +# and select it using `kitty +kitten themes` in the User menu + +#: The basic colors +#:sky +foreground #8F8F8F +#:shade +background #303338 +#:shade +selection_foreground #303338 +#:sun +selection_background #FFF7ED + +#: Cursor colors +#:sun +cursor #FFF7ED +#:shade +cursor_text_color #303338 + +#: URL underline color when hovering with mouse +#:blue +url_color #6E8DD5 + +#: The basic 16 colors +#: black +#: shade- balanced +color0 #24272B +#: shade- contrast++ +color8 #0D0F13 + +#: red +#: red balanced +color1 #CA736C +#: red contrast++ +color9 #F18AA1 + +#: green +#: green balanced +color2 #3EA57B +#: green contrast++ +color10 #58C792 + +#: yellow +#: yellow balanced +color3 #92963A +#: yellow contrast++ +color11 #B4B44A + +#: blue +#: blue balanced +color4 #6E8DD5 +#: blue contrast++ +color12 #83ADFF + +#: magenta (we replace with orange) +#: orange balanced +color5 #C27D40 +#: orange contrast++ +color13 #EA9856 + +#: cyan +#: cyan balanced +color6 #00A0BA +#: cyan contrast++ +color14 #16C3DD + +#: white +#: sun +color7 #FFF7ED +#: sun+ +color15 #FFFDFB + +# colors used by lsd +color187 #F2E6D4 +color230 #FFF7ED +color245 #636363 +color229 #8D9741 +color216 #BA823A +color172 #CA736C +color40 #54C794 +color42 #50B584 +color36 #47A477 diff --git a/dot_config/sheldon/plugins.toml b/dot_config/sheldon/plugins.toml new file mode 100644 index 0000000..72c9e62 --- /dev/null +++ b/dot_config/sheldon/plugins.toml @@ -0,0 +1,72 @@ +shell = "zsh" + +# own files +[plugins.compinit] +local = "~/.config/zsh/files/" +use = ["compinit.zsh"] + +# completions +[plugins.completions] +github = "zsh-users/zsh-completions" + +# lscolors +[plugins.lscolors] +github = "trapd00r/LS_COLORS" + +# plugins +[plugins.omzlib] +github = "ohmyzsh/ohmyzsh" +dir = "lib" +use = ["{completion,key-bindings,history,directories}.zsh"] + +[plugins.omzplugins] +github = "ohmyzsh/ohmyzsh" +dir = "plugins" +use = ["{systemd,command-not-found,ssh-agent}/*.plugin.zsh"] + +[plugins.fzftab] +github = "Aloxaf/fzf-tab" + +[plugins.fzfmarks] +github = "urbainvaes/fzf-marks" + +[plugins.evalcache] +github = "mroth/evalcache" + +[plugins.colorize] +github = "zpm-zsh/colorize" + +[plugins.wakatime] +github = "sobolevn/wakatime-zsh-plugin" + +[plugins.titles] +github = "amyreese/zsh-titles" + +[plugins.thefuck] +github = "laggardkernel/zsh-thefuck" + +[plugins.eza] +github = "twopizza9621536/zsh-eza" + +[plugins.bat] +github = "fdellwing/zsh-bat" + +[plugins.youshoulduse] +github = "MichaelAquilina/zsh-you-should-use" + +[plugins.asdf] +github = "asdf-vm/asdf" + +[plugins.abbr] +github = "olets/zsh-abbr" +use = ["zsh-abbr.zsh"] + +[plugins.autosuggestions] +github = "zsh-users/zsh-autosuggestions" + +[plugins.syntaxhighlighting] +github = "zsh-users/zsh-syntax-highlighting" + +[plugins.ownconfigs] +local = "~/.config/zsh/files/" +use = ["{bashcomps,evalstuff,options,sshcomp,aliases,functions,distroicon}.zsh"] diff --git a/dot_config/topgrade.toml.tmpl b/dot_config/topgrade.toml.tmpl index 3fa10c5..8d2f714 100644 --- a/dot_config/topgrade.toml.tmpl +++ b/dot_config/topgrade.toml.tmpl @@ -1,7 +1,106 @@ -{{- if eq .chezmoi.os "android" -}} -{{- include "realFiles/topgrade/other/topgrade" -}} -{{- else if eq .chezmoi.os "linux" -}} -{{- include "realFiles/topgrade/laptop/topgrade" -}} -{{- else if eq .chezmoi.hostname "pxm" -}} -{{- include "realFiles/topgrade/other/pxm/topgrade" -}} -{{- end -}} +[misc] +# Don't ask for confirmations +#assume_yes = true + +# Disable specific steps - same options as the command line flag +{{- if (and (eq .chezmoi.os "linux") (eq .chezmoi.osRelease.id "endeavouros")) }} +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"] +{{- else }} +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"] +{{- end }} + +# 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 +{{- if eq .chezmoi.hostname "pxm" }} +remote_topgrades = ["kali", "mail"] +{{- else }} +remote_topgrades = ["pxm", "web", "kube"] # "infra", +{{- end }} + +# 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 diff --git a/dot_config/zsh/dot_zsh_plugins.txt.tmpl b/dot_config/zsh/dot_zsh_plugins.txt.tmpl index 5635336..7792877 100644 --- a/dot_config/zsh/dot_zsh_plugins.txt.tmpl +++ b/dot_config/zsh/dot_zsh_plugins.txt.tmpl @@ -1,5 +1,32 @@ -{{- if (or (eq .chezmoi.hostname "himiko") (eq .chezmoi.hostname "wegerpc")) -}} -{{- include "realFiles/zsh/laptop/zsh_plugins" -}} -{{- else -}} -{{- include "realFiles/zsh/other/zsh_plugins" -}} -{{- end -}} +# 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 +{{- if (and (eq .chezmoi.os "linux") (eq .chezmoi.osRelease.id "endeavouros")) }} +sobolevn/wakatime-zsh-plugin +{{- end }} +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 diff --git a/dot_config/zsh/dot_zshenv.tmpl b/dot_config/zsh/dot_zshenv.tmpl index 7b5b0ff..5073114 100644 --- a/dot_config/zsh/dot_zshenv.tmpl +++ b/dot_config/zsh/dot_zshenv.tmpl @@ -1,5 +1,72 @@ -{{- if (or (eq .chezmoi.hostname "himiko") (eq .chezmoi.hostname "wegerpc")) -}} -{{- include "realFiles/zsh/laptop/zshenv" -}} -{{- else -}} -{{- include "realFiles/zsh/other/zshenv" -}} -{{- end -}} +# 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 +{{- if eq .chezmoi.osRelease.id "endeavouros" }} +export EDITOR=nvim +{{- else }} +export EDITOR=vim +{{- end }} +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" +unset FZF_MARKS_JUMP +{{- if (and (eq .chezmoi.os "linux") (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.tmpl b/dot_config/zsh/dot_zshrc.tmpl index 8f09f20..20f9585 100644 --- a/dot_config/zsh/dot_zshrc.tmpl +++ b/dot_config/zsh/dot_zshrc.tmpl @@ -1,5 +1,48 @@ -{{- if (or (eq .chezmoi.hostname "himiko") (eq .chezmoi.hostname "wegerpc")) -}} -{{- include "realFiles/zsh/laptop/zshrc" -}} -{{- else -}} -{{- include "realFiles/zsh/other/zshrc" -}} -{{- end -}} +{{- if eq .chezmoi.osRelease.id "endeavouros" }} +test -v DISTROBOX_HOST_HOME && { unset ZDOTDIR; exec zsh } +test -v SSH_CONNECTION && eval "$(zellij setup --generate-auto-start zsh)" + +{{- end }} +# options +setopt NO_CLOBBER +unsetopt FLOW_CONTROL + +# deduplicate path +typeset -U path PATH +{{- if (and (eq .chezmoi.os "linux") (eq .chezmoi.osRelease.id "endeavouros")) }} +path+=("$XDG_DATA_HOME"/JetBrains/Toolbox/scripts) # jetbrains toolbox +path+=("$XDG_DATA_HOME/mise/shims") # mise +{{- end }} +path+=("$HOME"/.local/bin) # local bin + +# startup banner +potentialBanner=('joke bofh' 'joke dad' 'fastfetch') +eval "$potentialBanner[$RANDOM%$#potentialBanner+1]" + +# antidote +{{- if (and (eq .chezmoi.os "linux") (eq .chezmoi.osRelease.id "endeavouros")) }} +source '/usr/share/zsh-antidote/antidote.zsh' +{{- else }} +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 +{{- end }} +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 +{{- if (and (eq .chezmoi.os "linux") (eq .chezmoi.osRelease.id "endeavouros")) }} +smartcache eval mise activate zsh +{{- end }} + +# 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")" diff --git a/realFiles/topgrade/laptop/topgrade b/realFiles/topgrade/laptop/topgrade deleted file mode 100644 index 649ef6b..0000000 --- a/realFiles/topgrade/laptop/topgrade +++ /dev/null @@ -1,98 +0,0 @@ -[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 diff --git a/realFiles/topgrade/other/pxm/topgrade b/realFiles/topgrade/other/pxm/topgrade deleted file mode 100644 index 093bb0e..0000000 --- a/realFiles/topgrade/other/pxm/topgrade +++ /dev/null @@ -1,98 +0,0 @@ -[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 diff --git a/realFiles/topgrade/other/topgrade b/realFiles/topgrade/other/topgrade deleted file mode 100644 index 437ba7f..0000000 --- a/realFiles/topgrade/other/topgrade +++ /dev/null @@ -1,98 +0,0 @@ -[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 diff --git a/realFiles/zsh/laptop/zsh_plugins b/realFiles/zsh/laptop/zsh_plugins deleted file mode 100644 index f7b6da3..0000000 --- a/realFiles/zsh/laptop/zsh_plugins +++ /dev/null @@ -1,30 +0,0 @@ -# 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 diff --git a/realFiles/zsh/laptop/zshenv b/realFiles/zsh/laptop/zshenv deleted file mode 100644 index 6fd0c74..0000000 --- a/realFiles/zsh/laptop/zshenv +++ /dev/null @@ -1,64 +0,0 @@ -# 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" diff --git a/realFiles/zsh/laptop/zshrc b/realFiles/zsh/laptop/zshrc deleted file mode 100644 index 2ab83e6..0000000 --- a/realFiles/zsh/laptop/zshrc +++ /dev/null @@ -1,37 +0,0 @@ -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")" diff --git a/realFiles/zsh/other/zsh_plugins b/realFiles/zsh/other/zsh_plugins deleted file mode 100644 index 18c7017..0000000 --- a/realFiles/zsh/other/zsh_plugins +++ /dev/null @@ -1,29 +0,0 @@ -# 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 diff --git a/realFiles/zsh/other/zshenv b/realFiles/zsh/other/zshenv deleted file mode 100644 index ab286e6..0000000 --- a/realFiles/zsh/other/zshenv +++ /dev/null @@ -1,63 +0,0 @@ -# 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" diff --git a/realFiles/zsh/other/zshrc b/realFiles/zsh/other/zshrc deleted file mode 100644 index bf99106..0000000 --- a/realFiles/zsh/other/zshrc +++ /dev/null @@ -1,32 +0,0 @@ -# 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")"