newest version of dotfiles
This commit is contained in:
Nikolas Weger
parent
4e44332045
commit
1f9d47b42c
11 changed files with 87 additions and 62 deletions
|
|
@ -23,7 +23,6 @@ zpm-zsh/ssh
|
|||
sobolevn/wakatime-zsh-plugin
|
||||
amyreese/zsh-titles
|
||||
laggardkernel/zsh-thefuck
|
||||
alexdesousa/oath
|
||||
twopizza9621536/zsh-eza
|
||||
fdellwing/zsh-bat
|
||||
MichaelAquilina/zsh-you-should-use
|
||||
|
|
|
|||
|
|
@ -1,13 +1,9 @@
|
|||
# deduplicate path and add local bin to path
|
||||
typeset -U path PATH
|
||||
export PATH="$HOME"/.local/bin:"$PATH"
|
||||
|
||||
# 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
|
||||
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
|
||||
|
|
@ -39,7 +35,8 @@ 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 GNUPGHOME="$XDG_DATA_HOME"/gnupg
|
||||
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
|
||||
|
||||
|
|
@ -53,7 +50,8 @@ export PYTHONSTARTUP=/etc/python/pythonrc
|
|||
# stuff
|
||||
export ZELLIJ_AUTO_ATTACH=true
|
||||
export ZELLIJ_AUTO_EXIT=true
|
||||
export TERMINALNAME=$(fastfetch --pipe 2>/dev/null | grep Terminal: | awk '{print $2}')
|
||||
export TERMINALNAME=$(fastfetch --pipe -s Terminal 2>/dev/null | awk '{print $2}')
|
||||
export MANROFFOPT="-c"
|
||||
|
||||
# zsh specific
|
||||
export SAVEHIST=$(( 100 * 1000 ))
|
||||
|
|
@ -61,7 +59,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 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"
|
||||
|
||||
unsetopt global_rcs
|
||||
|
|
|
|||
|
|
@ -1,6 +1,11 @@
|
|||
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
|
||||
|
||||
# deduplicate path
|
||||
typeset -U path PATH
|
||||
path+=("$XDG_DATA_HOME"/JetBrains/Toolbox/scripts) # jetbrains toolbox
|
||||
path+=("$HOME"/.local/bin) # local bin
|
||||
|
||||
# startup banner
|
||||
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]"
|
||||
|
|
@ -8,9 +13,6 @@ eval "$potentialBanner[$RANDOM%$#potentialBanner+1]"
|
|||
# disable flowcontrol
|
||||
stty -ixon
|
||||
|
||||
# local env exports
|
||||
source "$XDG_DATA_HOME"/zsh/config/env.zsh
|
||||
|
||||
# initialize completion system
|
||||
source "$ZDOTDIR"/files/compinit.zsh
|
||||
|
||||
|
|
@ -20,17 +22,20 @@ source "$XDG_DATA_HOME"/antidote/antidote.zsh
|
|||
zstyle ':antidote:bundle' use-friendly-names 'yes'
|
||||
antidote load
|
||||
|
||||
# eval stuff
|
||||
# source files
|
||||
source "$ZDOTDIR"/files/evalstuff.zsh
|
||||
source "$ZDOTDIR"/files/aliases.zsh
|
||||
source "$ZDOTDIR"/files/functions.zsh
|
||||
source "$ZDOTDIR"/files/options.zsh
|
||||
source "$ZDOTDIR"/files/distroicon.zsh
|
||||
|
||||
# completion stuff
|
||||
# completion files
|
||||
source "$ZDOTDIR"/files/bashcomps.zsh
|
||||
source "$ZDOTDIR"/files/sshcomp.zsh
|
||||
|
||||
# local overrides
|
||||
for sourced in "$XDG_DATA_HOME"/zsh/files/*; do source $sourced; done
|
||||
|
||||
# theme
|
||||
potentialTheme=('atomic.omp.json' 'emodipt-extend.omp.json' 'kali.omp.json' 'lambda.omp.json' 'nordtron.omp.json')
|
||||
export POSH_THEME="$XDG_DATA_HOME/omp/themes/$potentialTheme[$RANDOM%$#potentialTheme+1]"
|
||||
eval "$(oh-my-posh init zsh)"
|
||||
eval "$(oh-my-posh init zsh --config="$XDG_CACHE_HOME/oh-my-posh/themes/$potentialTheme[$RANDOM%$#potentialTheme+1]")"
|
||||
|
|
|
|||
5
dot_config/zsh/files/options.zsh
Normal file
5
dot_config/zsh/files/options.zsh
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
setopt NO_CLOBBER
|
||||
setopt INTERACTIVE_COMMENTS
|
||||
setopt HASH_EXECUTABLES_ONLY
|
||||
setopt NUMERIC_GLOB_SORT
|
||||
unsetopt FLOW_CONTROL
|
||||
|
|
@ -9,20 +9,16 @@ zstyle ':completion:*:(ssh|mosh):*' group-order users hosts-domain hosts-host us
|
|||
zstyle ':completion:*:(ssh|scp|sshfs|mosh|rsync):*:users' ignored-patterns '*'
|
||||
zstyle ':completion:*:(ssh|scp|sshfs|mosh|rsync):*:hosts-host' ignored-patterns '*(.|:)*' loopback localhost broadcasthost 'ip6-*' 'hbz*'
|
||||
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::*'
|
||||
zstyle ':completion:*:(ssh|scp|sshfs|mosh|rsync):*:hosts-ipaddr' ignored-patterns '^(<->.<->.<->.<->|(|::)([[:xdigit:].]##:(#c,2))##(|%*))' '127.*' '255.255.255.255' '::1' 'fe80::*' 'ff02::*'
|
||||
|
||||
[ -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=()
|
||||
[ -r /etc/hosts_network ] && : ${(A)_etc_hosts_network:=${(s: :)${(ps:\t:)${${(f)~~"$(</etc/hosts_network)"}%%\#*}##[:blank:]#[^[:blank:]]#}}} || _etc_hosts_network=()
|
||||
hosts=(
|
||||
# "$_ssh_config[@]"
|
||||
# "$_global_ssh_hosts[@]"
|
||||
# "$_ssh_hosts[@]"
|
||||
# "$_etc_hosts[@]"
|
||||
"$_global_ssh_hosts[@]"
|
||||
"$_ssh_hosts[@]"
|
||||
"$_etc_hosts[@]"
|
||||
)
|
||||
|
||||
[ -r /etc/hosts_network ] && hosts+=("$_etc_hosts_network[@]")
|
||||
|
||||
zstyle ':completion:*:hosts' hosts $hosts
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue