updated antidote to newest state
This commit is contained in:
Nikolas Weger
parent
6d40f3fa63
commit
f7cb8e5949
20 changed files with 343 additions and 269 deletions
|
|
@ -1,21 +0,0 @@
|
|||
background #241200
|
||||
foreground #ddc165
|
||||
cursor #e5591c
|
||||
selection_background #e5591c
|
||||
color0 #000000
|
||||
color8 #7e6954
|
||||
color1 #d5252b
|
||||
color9 #e4591b
|
||||
color2 #909b00
|
||||
color10 #bfc659
|
||||
color3 #bd8a13
|
||||
color11 #ffca1b
|
||||
color4 #4698a2
|
||||
color12 #7cc9ce
|
||||
color5 #8c4231
|
||||
color13 #d16349
|
||||
color6 #d98112
|
||||
color14 #e6a96b
|
||||
color7 #ddc165
|
||||
color15 #ffe9a3
|
||||
selection_foreground #241200
|
||||
|
|
@ -9,5 +9,7 @@ shell_integration enabled
|
|||
# Fonts
|
||||
font_family FiraCode Nerd Font
|
||||
|
||||
# Penumbra Theme
|
||||
include themes/embark.conf
|
||||
# BEGIN_KITTY_THEME
|
||||
# Rosé Pine Moon
|
||||
include current-theme.conf
|
||||
# END_KITTY_THEME
|
||||
|
|
|
|||
|
|
@ -1,12 +1,11 @@
|
|||
shell = "zsh"
|
||||
|
||||
[templates]
|
||||
defer = """{% for file in files %} zsh-defer source "{{ file }}" {% endfor %}"""
|
||||
defer-more = """{% for file in files %} zsh-defer -t 0.5 source "{{ file }}" {% endfor %}"""
|
||||
|
||||
# own files
|
||||
[plugins.disableflow]
|
||||
inline = 'stty -ixon'
|
||||
|
||||
[plugins.localenv]
|
||||
local = "~/.local/share/zsh/"
|
||||
local = "~/.local/share/zsh/config"
|
||||
use = ["env.zsh"]
|
||||
|
||||
[plugins.p10kconfig]
|
||||
|
|
@ -26,9 +25,6 @@ github = "zsh-users/zsh-completions"
|
|||
github = "trapd00r/LS_COLORS"
|
||||
|
||||
# plugins
|
||||
[plugins.zshdefer]
|
||||
github = "romkatv/zsh-defer"
|
||||
|
||||
[plugins.omzlib]
|
||||
github = "ohmyzsh/ohmyzsh"
|
||||
dir = "lib"
|
||||
|
|
@ -64,7 +60,7 @@ github = "laggardkernel/zsh-thefuck"
|
|||
github = "alexdesousa/oath"
|
||||
|
||||
[plugins.exa]
|
||||
github = "TwoPizza9621536/zsh-exa"
|
||||
github = "twopizza9621536/zsh-eza"
|
||||
|
||||
[plugins.bat]
|
||||
github = "fdellwing/zsh-bat"
|
||||
|
|
@ -75,9 +71,6 @@ github = "MichaelAquilina/zsh-you-should-use"
|
|||
[plugins.autosuggestions]
|
||||
github = "zsh-users/zsh-autosuggestions"
|
||||
|
||||
[plugins.emoji-cli]
|
||||
github = "b4b4r07/emoji-cli"
|
||||
|
||||
#[plugins.autocomplete]
|
||||
#github = "marlonrichert/zsh-autocomplete"
|
||||
|
||||
|
|
@ -87,9 +80,6 @@ github = "zsh-users/zsh-syntax-highlighting"
|
|||
[plugins.asdf]
|
||||
github = "asdf-vm/asdf"
|
||||
|
||||
[plugins.hoco]
|
||||
github = "Felixoid/zsh-hoco"
|
||||
|
||||
[plugins.abbr]
|
||||
github = "olets/zsh-abbr"
|
||||
use = ["zsh-abbr.zsh"]
|
||||
|
|
|
|||
98
dot_config/topgrade.toml
Normal file
98
dot_config/topgrade.toml
Normal file
|
|
@ -0,0 +1,98 @@
|
|||
[misc]
|
||||
# Don't ask for confirmations
|
||||
#assume_yes = true
|
||||
|
||||
# Disable specific steps - same options as the command line flag
|
||||
disable = ["firmware", "tldr", "pip3", "node", "vim", "git_repos", "containers", "asdf", "distrobox", "helix", "composer", "yarn", "cargo", "remotes", "flatpak", "shell", "rustup"]
|
||||
|
||||
# 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 = ["chat", "db", "git", "java", "kali", "mail", "misc", "mon"]
|
||||
|
||||
# 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
|
||||
|
|
@ -1,8 +1,14 @@
|
|||
# oh my zsh
|
||||
ohmyzsh/ohmyzsh path:lib/history.zsh
|
||||
# completions
|
||||
zsh-users/zsh-completions
|
||||
|
||||
# lscolors
|
||||
trapd00r/LS_COLORS
|
||||
|
||||
# ohmyzsh
|
||||
ohmyzsh/ohmyzsh path:lib/completion.zsh
|
||||
ohmyzsh/ohmyzsh path:lib/directories.zsh
|
||||
ohmyzsh/ohmyzsh path:lib/key-bindings.zsh
|
||||
ohmyzsh/ohmyzsh path:lib/history.zsh
|
||||
ohmyzsh/ohmyzsh path:lib/directories.zsh
|
||||
ohmyzsh/ohmyzsh path:plugins/systemd
|
||||
ohmyzsh/ohmyzsh path:plugins/fzf
|
||||
ohmyzsh/ohmyzsh path:plugins/command-not-found
|
||||
|
|
@ -17,20 +23,15 @@ zpm-zsh/ssh
|
|||
sobolevn/wakatime-zsh-plugin
|
||||
amyreese/zsh-titles
|
||||
laggardkernel/zsh-thefuck
|
||||
MichaelAquilina/zsh-you-should-use
|
||||
alexdesousa/oath
|
||||
TwoPizza9621536/zsh-exa
|
||||
twopizza9621536/zsh-eza
|
||||
fdellwing/zsh-bat
|
||||
MichaelAquilina/zsh-you-should-use
|
||||
asdf-vm/asdf
|
||||
#Felixoid/zsh-hoco
|
||||
olets/zsh-abbr
|
||||
trapd00r/LS_COLORS
|
||||
|
||||
# theme
|
||||
romkatv/powerlevel10k
|
||||
|
||||
# stuff
|
||||
zsh-users/zsh-completions
|
||||
#romkatv/powerlevel10k
|
||||
|
||||
# fish like
|
||||
zsh-users/zsh-autosuggestions
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
# path
|
||||
# deduplicate path and add local bin to path
|
||||
typeset -U path PATH
|
||||
export PATH="$HOME"/.local/bin:"$PATH"
|
||||
|
||||
# xdg stuff
|
||||
|
|
@ -27,6 +28,7 @@ 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
|
||||
|
|
@ -43,10 +45,9 @@ export GIBO_BOILERPLATES="$XDG_DATA_HOME"/giboboilerplates
|
|||
|
||||
# other programs
|
||||
export LESSHISTFILE="$XDG_STATE_HOME"/less/history
|
||||
export EDITOR=vim
|
||||
export EDITOR=nvim
|
||||
#export VISUAL=kate
|
||||
export ZSH_WAKATIME_BIN=/usr/bin/wakatime
|
||||
export WAKATIME_DO_NOT_TRACK=1
|
||||
export PYTHONSTARTUP=/etc/python/pythonrc
|
||||
|
||||
# stuff
|
||||
|
|
@ -60,4 +61,5 @@ 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 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"
|
||||
|
|
|
|||
|
|
@ -1,16 +1,14 @@
|
|||
if test -v DISTROBOX_HOST_HOME; then unset ZDOTDIR; exec zsh; fi # fix distrobox
|
||||
if test "x$TERMINALNAME" = "xalacritty"; then eval "$(zellij setup --generate-auto-start zsh)"; fi # autostart zellij only in alacritty
|
||||
test -v DISTROBOX_HOST_HOME && { unset ZDOTDIR; exec zsh } # fix distrobox
|
||||
test "x$TERMINALNAME" = "xalacritty" && eval "$(zellij setup --generate-auto-start zsh)" # autostart zellij only in alacritty
|
||||
|
||||
# startup banner
|
||||
potentialBanner=('bofh; echo " - BOFH"' 'hackerquotes' 'fastfetch')#'colorscript random')
|
||||
potentialBanner=('joke bofh' 'joke dad' 'joke hq dijkstra' 'joke hq knuth' 'joke hq perlis' 'joke hq torvalds' 'joke hq misc' 'colorscript random' 'fastfetch')
|
||||
eval "$potentialBanner[$RANDOM%$#potentialBanner+1]"
|
||||
|
||||
function source () { test -r "$1" && builtin source "$1" }
|
||||
|
||||
source "$XDG_CACHE_HOME"/p10k-instant-prompt-"$USERNAME".zsh
|
||||
|
||||
# local env exports
|
||||
source "$XDG_DATA_HOME"/zsh/env.zsh
|
||||
source "$XDG_DATA_HOME"/zsh/config/env.zsh
|
||||
|
||||
# completion stuff
|
||||
source "$ZDOTDIR"/files/compinit.zsh
|
||||
|
|
@ -31,6 +29,3 @@ source "$ZDOTDIR"/files/distroicon.zsh
|
|||
|
||||
# ssh ignored patterns
|
||||
source "$ZDOTDIR"/files/sshcomp.zsh
|
||||
|
||||
# To customize prompt, run `p10k configure` or edit $ZDOTDIR/.p10k.zsh.
|
||||
source "$ZDOTDIR"/.p10k.zsh
|
||||
|
|
|
|||
|
|
@ -2,13 +2,20 @@
|
|||
#_evalcache starship init zsh --print-full-init
|
||||
|
||||
# ohmyposh
|
||||
#potentialTheme=('atomic.omp.json' 'emodipt-extend.omp.json' 'kali.omp.json' 'lambda.omp.json' 'nordtron.omp.json' 'pure.omp.json' 'uew.omp.json')
|
||||
#export POSH_THEME="/usr/share/oh-my-posh/themes/$potentialTheme[$RANDOM%$#potentialTheme+1]"
|
||||
#eval "$(ohmyposh init zsh)"
|
||||
potentialTheme=('atomic.omp.json' 'emodipt-extend.omp.json' 'kali.omp.json' 'lambda.omp.json' 'nordtron.omp.json' 'pure.omp.json' 'uew.omp.json')
|
||||
if (( ${+commands[brew]} )); then
|
||||
export POSH_THEME="$(brew --prefix oh-my-posh)/themes/$potentialTheme[$RANDOM%$#potentialTheme+1]"
|
||||
elif test "$(cat /etc/os-release | grep '^ID=' | cut -d'=' -f2)" = "nixos"; then
|
||||
export POSH_THEME="/run/current-system/sw/share/oh-my-posh/themes/$potentialTheme[$RANDOM%$#potentialTheme+1]"
|
||||
else
|
||||
export POSH_THEME="/usr/share/oh-my-posh/themes/$potentialTheme[$RANDOM%$#potentialTheme+1]"
|
||||
fi
|
||||
eval "$(oh-my-posh init zsh)"
|
||||
|
||||
# evalstuff
|
||||
_evalcache zoxide init --cmd cd zsh
|
||||
_evalcache atuin init zsh
|
||||
#_evalcache navi widget zsh
|
||||
#_evalcache direnv hook zsh
|
||||
#eval "$(keychain --dir "$XDG_CACHE_HOME"/keychain --eval --quiet id_rsa)"
|
||||
_evalcache navi widget zsh
|
||||
_evalcache direnv hook zsh
|
||||
#_evalcache ntfy shell-integration
|
||||
eval "$(keychain --dir "$XDG_CACHE_HOME"/keychain --eval --quiet id_rsa)"
|
||||
|
|
|
|||
|
|
@ -6,6 +6,11 @@ pet_select () {
|
|||
zle -N pet_select
|
||||
bindkey '^l' pet_select
|
||||
|
||||
pet_add_prev () {
|
||||
PREV=$(fc -lrn | head -n 1)
|
||||
sh -c "pet new $(printf %q "$PREV")"
|
||||
}
|
||||
|
||||
run_ranger () {
|
||||
echo
|
||||
ranger < $TTY
|
||||
|
|
|
|||
|
|
@ -11,5 +11,14 @@ zstyle ':completion:*:(ssh|scp|sshfs|mosh|rsync):*:hosts-host' ignored-patterns
|
|||
zstyle ':completion:*:(ssh|scp|sshfs|mosh|rsync):*:hosts-domain' ignored-patterns '<->.<->.<->.<->' '^[-[:alnum:]]##(.[-[:alnum:]]##)##' '*@*' '*.eeleater.org' '*.hbz-nrw.de'
|
||||
zstyle ':completion:*:(ssh|scp|sshfs|mosh|rsync):*:hosts-ipaddr' ignored-patterns '^(<->.<->.<->.<->|(|::)([[:xdigit:].]##:(#c,2))##(|%*))' '127.0.*' '255.255.255.255' '::1' 'fe80::*' 'ff02::*'
|
||||
|
||||
#function knownhosts () { cat "$HOME"/.ssh/known_hosts | grep ',' | cut -d',' -f1 }
|
||||
#HOCO_FUNCTIONS=(knownhosts)
|
||||
[ -r ~/.ssh/config ] && _ssh_config=($(cat ~/.ssh/config | sed -ne 's/Host[=\t ]//p')) || _ssh_config=()
|
||||
[ -r /etc/ssh/ssh_known_hosts ] && _global_ssh_hosts=(${${${${(f)"$(</etc/ssh/ssh_known_hosts)"}:#[\|]*}%%\ *}%%,*}) || _global_ssh_hosts=()
|
||||
[ -r ~/.ssh/known_hosts ] && _ssh_hosts=(${${${${(f)"$(<$HOME/.ssh/known_hosts)"}:#[\|]*}%%\ *}%%,*}) || _ssh_hosts=()
|
||||
[ -r /etc/hosts ] && : ${(A)_etc_hosts:=${(s: :)${(ps:\t:)${${(f)~~"$(</etc/hosts)"}%%\#*}##[:blank:]#[^[:blank:]]#}}} || _etc_hosts=()
|
||||
hosts=(
|
||||
# "$_ssh_config[@]"
|
||||
"$_global_ssh_hosts[@]"
|
||||
"$_ssh_hosts[@]"
|
||||
"$_etc_hosts[@]"
|
||||
)
|
||||
zstyle ':completion:*:hosts' hosts $hosts
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue