From ba8cf2c09f35706ab99e53d23cf3682796a4ef2e Mon Sep 17 00:00:00 2001 From: eeleater Date: Sun, 30 Apr 2023 23:09:06 +0200 Subject: [PATCH 01/97] updated antidote config somewhat --- dot_config/kitty/current-theme.conf | 53 ++++------ dot_config/kitty/kitty.conf | 6 +- dot_config/kitty/themes/embark.conf | 53 ++++++++++ dot_config/kitty/themes/penumbra.conf | 91 +++++++++++++++++ dot_config/sheldon/plugins.toml | 98 +++++++++++++------ .../zsh-abbr/private_user-abbreviations | 8 ++ dot_config/zsh/dot_zprofile | 1 + .../{zsh_plugins.txt => dot_zsh_plugins.txt} | 8 ++ dot_config/zsh/{env.zsh => dot_zshenv} | 39 ++++---- dot_config/zsh/dot_zshrc | 31 ++++++ dot_config/zsh/{ => files}/aliases.zsh | 1 - dot_config/zsh/files/bashcomps.zsh | 11 +++ dot_config/zsh/files/compinit.zsh | 4 + dot_config/zsh/{ => files}/distroicon.zsh | 0 dot_config/zsh/files/evalstuff.zsh | 14 +++ dot_config/zsh/files/functions.zsh | 15 +++ dot_config/zsh/files/sshcomp.zsh | 12 +++ dot_config/zsh/keybinds.zsh | 7 -- dot_config/zsh/rc.zsh | 50 ---------- dot_config/zsh/symlink_dot_zprofile | 1 - dot_config/zsh/symlink_dot_zsh_plugins.txt | 1 - dot_config/zsh/symlink_dot_zshenv | 1 - dot_config/zsh/symlink_dot_zshrc | 1 - dot_config/zsh/transfer.zsh | 26 ----- dot_config/zsh/zprofile.zsh | 1 - dot_local/bin/executable_bofh | 4 +- dot_local/bin/executable_hackerquotes | 2 +- 27 files changed, 361 insertions(+), 178 deletions(-) create mode 100644 dot_config/kitty/themes/embark.conf create mode 100644 dot_config/kitty/themes/penumbra.conf create mode 100644 dot_config/zsh-abbr/private_user-abbreviations create mode 100644 dot_config/zsh/dot_zprofile rename dot_config/zsh/{zsh_plugins.txt => dot_zsh_plugins.txt} (82%) rename dot_config/zsh/{env.zsh => dot_zshenv} (72%) create mode 100644 dot_config/zsh/dot_zshrc rename dot_config/zsh/{ => files}/aliases.zsh (97%) create mode 100644 dot_config/zsh/files/bashcomps.zsh create mode 100644 dot_config/zsh/files/compinit.zsh rename dot_config/zsh/{ => files}/distroicon.zsh (100%) create mode 100644 dot_config/zsh/files/evalstuff.zsh create mode 100644 dot_config/zsh/files/functions.zsh create mode 100644 dot_config/zsh/files/sshcomp.zsh delete mode 100644 dot_config/zsh/keybinds.zsh delete mode 100644 dot_config/zsh/rc.zsh delete mode 100644 dot_config/zsh/symlink_dot_zprofile delete mode 100644 dot_config/zsh/symlink_dot_zsh_plugins.txt delete mode 100644 dot_config/zsh/symlink_dot_zshenv delete mode 100644 dot_config/zsh/symlink_dot_zshrc delete mode 100644 dot_config/zsh/transfer.zsh delete mode 100644 dot_config/zsh/zprofile.zsh diff --git a/dot_config/kitty/current-theme.conf b/dot_config/kitty/current-theme.conf index 2cdbb2f..df8f4ee 100644 --- a/dot_config/kitty/current-theme.conf +++ b/dot_config/kitty/current-theme.conf @@ -1,32 +1,21 @@ -# One Dark by Giuseppe Cesarano, https://github.com/GiuseppeCesarano -# This work is licensed under the terms of the GPL-2.0 license. -# For a copy, see https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html. - -# Colors - -foreground #979eab -background #282c34 - -color0 #282c34 -color1 #e06c75 -color2 #98c379 -color3 #e5c07b -color4 #61afef -color5 #be5046 -color6 #56b6c2 -color7 #979eab -color8 #393e48 -color9 #d19a66 -color10 #56b6c2 -color11 #e5c07b -color12 #61afef -color13 #be5046 -color14 #56b6c2 -color15 #abb2bf - -# Tab Bar - -active_tab_foreground #282c34 -active_tab_background #979eab -inactive_tab_foreground #abb2bf -inactive_tab_background #282c34 +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 diff --git a/dot_config/kitty/kitty.conf b/dot_config/kitty/kitty.conf index 7b2cb36..6122203 100644 --- a/dot_config/kitty/kitty.conf +++ b/dot_config/kitty/kitty.conf @@ -9,7 +9,5 @@ shell_integration enabled # Fonts font_family FiraCode Nerd Font -# BEGIN_KITTY_THEME -# One Dark -include current-theme.conf -# END_KITTY_THEME +# Penumbra Theme +include themes/embark.conf 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 index bd2ae5f..7b2c650 100644 --- a/dot_config/sheldon/plugins.toml +++ b/dot_config/sheldon/plugins.toml @@ -1,32 +1,48 @@ shell = "zsh" [templates] -defer = "{% for file in files %}zsh-defer source \"{{ file }}\"\n{% endfor %}" -defer-more = "{% for file in files %}zsh-defer -t 0.5 source \"{{ file }}\"\n{% endfor %}" +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.localenv] +local = "~/.local/share/zsh/" +use = ["env.zsh"] -[plugins.zsh-defer] -github = "romkatv/zsh-defer" +[plugins.p10kconfig] +local = "~/.config/zsh/" +use = [".p10k.zsh"] + +[plugins.compinit] +local = "~/.config/zsh/files/" +use = ["compinit.zsh"] # completions -[plugins.zsh-completions] +[plugins.completions] github = "zsh-users/zsh-completions" +# lscolors +[plugins.lscolors] +github = "trapd00r/LS_COLORS" + # plugins -[plugins.ohmyzsh-lib] +[plugins.zshdefer] +github = "romkatv/zsh-defer" + +[plugins.omzlib] github = "ohmyzsh/ohmyzsh" dir = "lib" use = ["{completion,key-bindings,history,directories}.zsh"] -[plugins.ohmyzsh-plugins] +[plugins.omzplugins] github = "ohmyzsh/ohmyzsh" dir = "plugins" -use = ["{systemd,fzf,command-not-found}/*.plugin.zsh"] +use = ["{systemd,fzf,command-not-found,transfer}/*.plugin.zsh"] -[plugins.fzf-tab] +[plugins.fzftab] github = "Aloxaf/fzf-tab" -[plugins.fzf-marks] +[plugins.fzfmarks] github = "urbainvaes/fzf-marks" [plugins.evalcache] @@ -35,42 +51,66 @@ github = "mroth/evalcache" [plugins.colorize] github = "zpm-zsh/colorize" -[plugins.ssh] -github = "zpm-zsh/ssh" - -[plugins.wakatime-zsh-plugin] +[plugins.wakatime] github = "sobolevn/wakatime-zsh-plugin" -[plugins.zsh-titles] +[plugins.titles] github = "amyreese/zsh-titles" -[plugins.zsh-thefuck] +[plugins.thefuck] github = "laggardkernel/zsh-thefuck" [plugins.oath] github = "alexdesousa/oath" -[plugins.zsh-exa] +[plugins.exa] github = "TwoPizza9621536/zsh-exa" -[plugins.zsh-bat] +[plugins.bat] github = "fdellwing/zsh-bat" -[plugins.zsh-you-should-use] +[plugins.youshoulduse] github = "MichaelAquilina/zsh-you-should-use" -[plugins.zsh-autosuggestions] +[plugins.autosuggestions] github = "zsh-users/zsh-autosuggestions" -use = ["{{ name }}.zsh"] -[plugins.zsh-syntax-highlighting] +[plugins.emoji-cli] +github = "b4b4r07/emoji-cli" + +#[plugins.autocomplete] +#github = "marlonrichert/zsh-autocomplete" + +[plugins.syntaxhighlighting] github = "zsh-users/zsh-syntax-highlighting" -# theme -[plugins.powerlevel10k] -github = "romkatv/powerlevel10k" +[plugins.asdf] +github = "asdf-vm/asdf" -# own files -[plugins.own-files] -local = "~/.config/zsh/" -use = ["{aliases,keybinds,distroicon,transfer}.zsh"] +[plugins.hoco] +github = "Felixoid/zsh-hoco" + +[plugins.abbr] +github = "olets/zsh-abbr" +use = ["zsh-abbr.zsh"] + +[plugins.sshcomp] +local = "~/.config/zsh/files/" +use = ["sshcomp.zsh"] + +# themes +#[plugins.powerlevel10k] +#github = "romkatv/powerlevel10k" + +# evals +[plugins.evalstuff] +local = "~/.config/zsh/files/" +use = ["evalstuff.zsh"] + +[plugins.ownfiles] +local = "~/.config/zsh/files/" +use = ["{aliases,functions,distroicon}.zsh"] + +[plugins.bashcomps] +local = "~/.config/zsh/files/" +use = ["bashcomps.zsh"] diff --git a/dot_config/zsh-abbr/private_user-abbreviations b/dot_config/zsh-abbr/private_user-abbreviations new file mode 100644 index 0000000..b6e2458 --- /dev/null +++ b/dot_config/zsh-abbr/private_user-abbreviations @@ -0,0 +1,8 @@ +abbr -g "g"="git" +abbr -g "git m"="git checkout main" +abbr -g "git rei"="git rebase -i" +abbr -g "git reim"="git rebase -i main" +abbr -g "git ri"="git rebase -i" +abbr "m"="git checkout main" +abbr "rei"="git rebase -i" +abbr "reim"="git rebase -i main" diff --git a/dot_config/zsh/dot_zprofile b/dot_config/zsh/dot_zprofile new file mode 100644 index 0000000..4e2652e --- /dev/null +++ b/dot_config/zsh/dot_zprofile @@ -0,0 +1 @@ +# create the file diff --git a/dot_config/zsh/zsh_plugins.txt b/dot_config/zsh/dot_zsh_plugins.txt similarity index 82% rename from dot_config/zsh/zsh_plugins.txt rename to dot_config/zsh/dot_zsh_plugins.txt index 15e09a6..3f367e5 100644 --- a/dot_config/zsh/zsh_plugins.txt +++ b/dot_config/zsh/dot_zsh_plugins.txt @@ -6,6 +6,7 @@ ohmyzsh/ohmyzsh path:lib/key-bindings.zsh ohmyzsh/ohmyzsh path:plugins/systemd ohmyzsh/ohmyzsh path:plugins/fzf ohmyzsh/ohmyzsh path:plugins/command-not-found +ohmyzsh/ohmyzsh path:plugins/transfer # other plugins Aloxaf/fzf-tab @@ -20,10 +21,17 @@ MichaelAquilina/zsh-you-should-use alexdesousa/oath TwoPizza9621536/zsh-exa fdellwing/zsh-bat +asdf-vm/asdf +Felixoid/zsh-hoco +olets/zsh-abbr +trapd00r/LS_COLORS # theme romkatv/powerlevel10k +# stuff +zsh-users/zsh-completions + # fish like zsh-users/zsh-autosuggestions zsh-users/zsh-syntax-highlighting diff --git a/dot_config/zsh/env.zsh b/dot_config/zsh/dot_zshenv similarity index 72% rename from dot_config/zsh/env.zsh rename to dot_config/zsh/dot_zshenv index a908235..b1f1312 100644 --- a/dot_config/zsh/env.zsh +++ b/dot_config/zsh/dot_zshenv @@ -1,16 +1,13 @@ # path export PATH="$HOME"/.local/bin:"$PATH" -# ibus specific -export GTK_IM_MODULE=ibus -export QT_IM_MODULE=ibus -export XMODIFIERS=@im=ibus - # xdg stuff -export XDG_DATA_HOME="$HOME"/.local/share -export XDG_CONFIG_HOME="$HOME"/.config -export XDG_STATE_HOME="$HOME"/.local/state 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_STATE_HOME="$HOME"/.local/state export XDG_DESKTOP_DIR=$HOME/Desktop export XDG_DOCUMENTS_DIR="$HOME"/Documents export XDG_DOWNLOAD_DIR="$HOME"/Downloads @@ -19,10 +16,6 @@ export XDG_PICTURES_DIR="$HOME"/Pictures export XDG_VIDEOS_DIR="$HOME"/Videos export XDG_PROJECTS_DIR="$XDG_DOCUMENTS_DIR"/projects -# system xdg stuff -export XDG_DATA_DIRS=/usr/local/share:/usr/share -export XDG_CONFIG_DIRS=/etc/xdg - # cache files export NUGET_PACKAGES="$XDG_CACHE_HOME"/NuGetPackages export ZSH_EVALCACHE_DIR="$XDG_CACHE_HOME"/evalcache @@ -43,23 +36,27 @@ 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 - -# gpg +export WINEPREFIX="$XDG_DATA_HOME"/wine #export GNUPGHOME="$XDG_DATA_HOME"/gnupg -export GPG_TTY="$TTY" +export W3M_DIR="$XDG_DATA_HOME"/w3m +export GIBO_BOILERPLATES="$XDG_DATA_HOME"/giboboilerplates # other programs export LESSHISTFILE="$XDG_STATE_HOME"/less/history -export EDITOR=nvim -export VISUAL="subl -w" +export EDITOR=vim +#export VISUAL=kate export ZSH_WAKATIME_BIN=/usr/bin/wakatime +export PYTHONSTARTUP=/etc/python/pythonrc # stuff export ZELLIJ_AUTO_ATTACH=true export ZELLIJ_AUTO_EXIT=true -export TERMINALNAME=$(fastfetch --pipe 2>/dev/null | grep -i terminal: | awk '{print $2}') +export TERMINALNAME=$(fastfetch --pipe 2>/dev/null | grep Terminal: | awk '{print $2}') # zsh specific -export HISTSIZE=1048576 -export SAVEHIST=1048576 -export HISTFILE="$XDG_CACHE_HOME"/zsh/history +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 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" diff --git a/dot_config/zsh/dot_zshrc b/dot_config/zsh/dot_zshrc new file mode 100644 index 0000000..f56aa77 --- /dev/null +++ b/dot_config/zsh/dot_zshrc @@ -0,0 +1,31 @@ +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 + +# startup banner +potentialBanner=('bofh; echo " - BOFH"' 'hackerquotes' 'fastfetch')#'colorscript random') +eval "$potentialBanner[$RANDOM%$#potentialBanner+1]" + +function source () { test -r $1 && builtin source $1 } + +# local env exports +source "$XDG_DATA_HOME"/zsh/env.zsh + +# completion stuff +source "$ZDOTDIR"/files/compinit.zsh +source "$ZDOTDIR"/files/bashcomps.zsh + +# antidote +source "$XDG_DATA_HOME"/antidote/antidote.zsh +zstyle ':antidote:bundle' use-friendly-names 'yes' +antidote load + +# eval stuff +source "$ZDOTDIR"/files/evalstuff.zsh + +# seperate configs +source "$ZDOTDIR"/files/aliases.zsh +source "$ZDOTDIR"/files/functions.zsh +source "$ZDOTDIR"/files/distroicon.zsh + +# ssh ignored patterns +source "$ZDOTDIR"/files/sshcomp.zsh diff --git a/dot_config/zsh/aliases.zsh b/dot_config/zsh/files/aliases.zsh similarity index 97% rename from dot_config/zsh/aliases.zsh rename to dot_config/zsh/files/aliases.zsh index 6815e47..d691777 100644 --- a/dot_config/zsh/aliases.zsh +++ b/dot_config/zsh/files/aliases.zsh @@ -1,4 +1,3 @@ -alias cd='z' alias grep='rg' alias find='fd' diff --git a/dot_config/zsh/files/bashcomps.zsh b/dot_config/zsh/files/bashcomps.zsh new file mode 100644 index 0000000..7c9b85c --- /dev/null +++ b/dot_config/zsh/files/bashcomps.zsh @@ -0,0 +1,11 @@ +if (( ${+commands[distrobox]} )); then + source /usr/share/bash-completion/completions/distrobox + source /usr/share/bash-completion/completions/distrobox-create + source /usr/share/bash-completion/completions/distrobox-enter + source /usr/share/bash-completion/completions/distrobox-ephemeral + source /usr/share/bash-completion/completions/distrobox-generate-entry + source /usr/share/bash-completion/completions/distrobox-list + source /usr/share/bash-completion/completions/distrobox-rm + source /usr/share/bash-completion/completions/distrobox-stop + source /usr/share/bash-completion/completions/distrobox-upgrade +fi diff --git a/dot_config/zsh/files/compinit.zsh b/dot_config/zsh/files/compinit.zsh new file mode 100644 index 0000000..afd93cc --- /dev/null +++ b/dot_config/zsh/files/compinit.zsh @@ -0,0 +1,4 @@ +mkdir -p "$XDG_CACHE_HOME"/zsh &>/dev/null + +autoload -Uz compinit +compinit -d "$XDG_CACHE_HOME"/zsh/compdump diff --git a/dot_config/zsh/distroicon.zsh b/dot_config/zsh/files/distroicon.zsh similarity index 100% rename from dot_config/zsh/distroicon.zsh rename to dot_config/zsh/files/distroicon.zsh diff --git a/dot_config/zsh/files/evalstuff.zsh b/dot_config/zsh/files/evalstuff.zsh new file mode 100644 index 0000000..b95e8e8 --- /dev/null +++ b/dot_config/zsh/files/evalstuff.zsh @@ -0,0 +1,14 @@ +# starship +#_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)" + +# 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)" diff --git a/dot_config/zsh/files/functions.zsh b/dot_config/zsh/files/functions.zsh new file mode 100644 index 0000000..6a40a2f --- /dev/null +++ b/dot_config/zsh/files/functions.zsh @@ -0,0 +1,15 @@ +pet_select () { + BUFFER=$(pet search --query "$LBUFFER") + CURSOR=$#BUFFER + zle redisplay +} +zle -N pet_select +bindkey '^l' pet_select + +run_ranger () { + echo + ranger < $TTY + zle redisplay +} +zle -N run_ranger +bindkey '^f' run_ranger diff --git a/dot_config/zsh/files/sshcomp.zsh b/dot_config/zsh/files/sshcomp.zsh new file mode 100644 index 0000000..3984595 --- /dev/null +++ b/dot_config/zsh/files/sshcomp.zsh @@ -0,0 +1,12 @@ +zstyle ':completion:*:(ssh|scp|sshfs|mosh|rsync):*' sort false +zstyle ':completion:*:(ssh|scp|sshfs|mosh|rsync):*' group-name '' +zstyle ':completion:*:(ssh|scp|sshfs|mosh|rsync):*' verbose yes + +zstyle ':completion:*:(ssh|scp|sshfs|mosh|rsync):*' tag-order 'hosts:-host:host hosts:-domain:domain hosts:-ipaddr:ip\ address *' +zstyle ':completion:*:(scp|sshfs|rsync):*' group-order users files all-files hosts-domain hosts-host hosts-ipaddr +zstyle ':completion:*:(ssh|mosh):*' group-order users hosts-domain hosts-host users hosts-ipaddr + +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::*' diff --git a/dot_config/zsh/keybinds.zsh b/dot_config/zsh/keybinds.zsh deleted file mode 100644 index 854db4d..0000000 --- a/dot_config/zsh/keybinds.zsh +++ /dev/null @@ -1,7 +0,0 @@ -run_ranger () { echo; ranger < $TTY; zle redisplay } -zle -N run_ranger -bindkey '^f' run_ranger - -pet_select () { BUFFER=$(pet search --query "$LBUFFER"); CURSOR=$#BUFFER; zle redisplay } -zle -N pet_select -bindkey '^l' pet_select diff --git a/dot_config/zsh/rc.zsh b/dot_config/zsh/rc.zsh deleted file mode 100644 index 6f9fb20..0000000 --- a/dot_config/zsh/rc.zsh +++ /dev/null @@ -1,50 +0,0 @@ -if test -v DISTROBOX_HOST_HOME; then unset ZDOTDIR; exec zsh; fi # fix distrobox -if test $TERMINALNAME = "alacritty"; then eval "$(zellij setup --generate-auto-start zsh)"; fi # autostart only in alacritty - -#fastfetch -bofh; echo " - BOFH" -#hackerquotes -#colorscript random - -try_source () { test -r $1 && source $1 } - -# local env exports -try_source "$XDG_DATA_HOME"/zsh/env.zsh - -# Powerlevel10k - instant prompt and config -try_source "$XDG_CACHE_HOME"/p10k-instant-prompt-$USERNAME.zsh -try_source "$XDG_CONFIG_HOME"/zsh/.p10k.zsh # p10k configure - -# ensure zsh cache folder exists -mkdir -p "$XDG_CACHE_HOME"/zsh &>/dev/null - -# compinit -autoload -Uz compinit; compinit -d "$XDG_CACHE_HOME"/zsh/compdump - -# antidote -try_source /usr/share/zsh-antidote/antidote.zsh -zstyle ':antidote:bundle' use-friendly-names 'yes' -antidote load - -# other themes -#_evalcache starship init zsh -#_evalcache oh-my-posh init zsh --config /usr/share/oh-my-posh/themes/kali.omp.json - -# eval stuff -_evalcache zoxide init zsh -_evalcache dircolors -b /usr/share/LS_COLORS/LS_COLORS -_evalcache atuin init zsh -_evalcache navi widget zsh -_evalcache direnv hook zsh -try_source /opt/asdf-vm/asdf.sh -eval "$(keychain --dir "$XDG_CACHE_HOME"/keychain --eval --quiet id_rsa)" - -# seperate configs -try_source "$ZDOTDIR"/aliases.zsh -try_source "$ZDOTDIR"/keybinds.zsh -try_source "$ZDOTDIR"/distroicon.zsh -try_source "$ZDOTDIR"/transfer.zsh - -# ssh ignored patterns -zstyle ':completion:*:*:*:users' ignored-patterns '*' -zstyle ':completion:*:*:*:hosts-domain' ignored-patterns '<->.<->.<->.<->' '^[-[:alnum:]]##(.[-[:alnum:]]##)##' '*@*' '*localdomain*' '*.eeleater.org' '*.local' '*.hbz-nrw.de' diff --git a/dot_config/zsh/symlink_dot_zprofile b/dot_config/zsh/symlink_dot_zprofile deleted file mode 100644 index fc78fe4..0000000 --- a/dot_config/zsh/symlink_dot_zprofile +++ /dev/null @@ -1 +0,0 @@ -zprofile.zsh diff --git a/dot_config/zsh/symlink_dot_zsh_plugins.txt b/dot_config/zsh/symlink_dot_zsh_plugins.txt deleted file mode 100644 index d349554..0000000 --- a/dot_config/zsh/symlink_dot_zsh_plugins.txt +++ /dev/null @@ -1 +0,0 @@ -zsh_plugins.txt diff --git a/dot_config/zsh/symlink_dot_zshenv b/dot_config/zsh/symlink_dot_zshenv deleted file mode 100644 index c3ac24e..0000000 --- a/dot_config/zsh/symlink_dot_zshenv +++ /dev/null @@ -1 +0,0 @@ -env.zsh diff --git a/dot_config/zsh/symlink_dot_zshrc b/dot_config/zsh/symlink_dot_zshrc deleted file mode 100644 index 807d307..0000000 --- a/dot_config/zsh/symlink_dot_zshrc +++ /dev/null @@ -1 +0,0 @@ -rc.zsh diff --git a/dot_config/zsh/transfer.zsh b/dot_config/zsh/transfer.zsh deleted file mode 100644 index 1415467..0000000 --- a/dot_config/zsh/transfer.zsh +++ /dev/null @@ -1,26 +0,0 @@ -transfer(){ - if [ $# -eq 0 ]; then - echo "No arguments specified.\nUsage:\n transfer \n ... | transfer ">&2 - return 1 - fi - - if tty -s; then - file="$1" - file_name=$(basename "$file") - - if [ ! -e "$file" ]; then - echo "$file: No such file or directory">&2 - return 1 - fi - - if [ -d "$file" ]; then - file_name="$file_name.zip" - (cd "$file" && zip -r -q - .) | curl --progress-bar --upload-file "-" "https://transfer.sh/$file_name" | tee /dev/null - else - cat "$file" | curl --progress-bar --upload-file "-" "https://transfer.sh/$file_name" | tee /dev/null - fi - else - file_name=$1 - curl --progress-bar --upload-file "-" "https://transfer.sh/$file_name" | tee /dev/null - fi -} diff --git a/dot_config/zsh/zprofile.zsh b/dot_config/zsh/zprofile.zsh deleted file mode 100644 index 8b13789..0000000 --- a/dot_config/zsh/zprofile.zsh +++ /dev/null @@ -1 +0,0 @@ - diff --git a/dot_local/bin/executable_bofh b/dot_local/bin/executable_bofh index 711e373..d1ca04e 100644 --- a/dot_local/bin/executable_bofh +++ b/dot_local/bin/executable_bofh @@ -1,5 +1,5 @@ #!/usr/bin/env bash excuses_file="$HOME/.local/share/zsh/bofh" -num_lines=$(nl $excuses_file | tail -n 1 | awk '{print $1}') -awk 'NR=='$((1 + RANDOM % num_lines ))'{print;exit}' $excuses_file \ No newline at end of file +num_lines=$(nl "$excuses_file" | tail -n 1 | awk '{print $1}') +awk 'NR=='$((1 + RANDOM % num_lines ))'{print;exit}' "$excuses_file" \ No newline at end of file diff --git a/dot_local/bin/executable_hackerquotes b/dot_local/bin/executable_hackerquotes index 83d73c4..b7a3e0c 100644 --- a/dot_local/bin/executable_hackerquotes +++ b/dot_local/bin/executable_hackerquotes @@ -1,4 +1,4 @@ -#!/usr/bin/zsh +#!/usr/bin/env zsh # Just print a hacker quote randomly when open a terminal. # From 933ac6a5c991f0226f62a5bf3062dffa04854fb7 Mon Sep 17 00:00:00 2001 From: eeleater Date: Sun, 30 Apr 2023 23:18:42 +0200 Subject: [PATCH 02/97] updated antidote config somewhat --- dot_config/zsh/dot_zshrc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dot_config/zsh/dot_zshrc b/dot_config/zsh/dot_zshrc index f56aa77..dd680e1 100644 --- a/dot_config/zsh/dot_zshrc +++ b/dot_config/zsh/dot_zshrc @@ -5,7 +5,9 @@ if test "x$TERMINALNAME" = "xalacritty"; then eval "$(zellij setup --generate-au potentialBanner=('bofh; echo " - BOFH"' 'hackerquotes' 'fastfetch')#'colorscript random') eval "$potentialBanner[$RANDOM%$#potentialBanner+1]" -function source () { test -r $1 && builtin source $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 @@ -29,3 +31,6 @@ 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 From 5ade9a740d68894c4156b00379ea3a968313a8c3 Mon Sep 17 00:00:00 2001 From: eeleater Date: Sun, 30 Apr 2023 23:20:43 +0200 Subject: [PATCH 03/97] updated antidote config somewhat --- dot_config/zsh/dot_zshenv | 1 + 1 file changed, 1 insertion(+) diff --git a/dot_config/zsh/dot_zshenv b/dot_config/zsh/dot_zshenv index b1f1312..2caee91 100644 --- a/dot_config/zsh/dot_zshenv +++ b/dot_config/zsh/dot_zshenv @@ -46,6 +46,7 @@ export LESSHISTFILE="$XDG_STATE_HOME"/less/history export EDITOR=vim #export VISUAL=kate export ZSH_WAKATIME_BIN=/usr/bin/wakatime +export WAKATIME_DO_NOT_TRACK=1 export PYTHONSTARTUP=/etc/python/pythonrc # stuff From 80f14c3aee9c75798c25b44dcfe42d48cbd6ae23 Mon Sep 17 00:00:00 2001 From: eeleater Date: Mon, 1 May 2023 00:01:24 +0200 Subject: [PATCH 04/97] updated antidote config somewhat --- dot_config/zsh/dot_zsh_plugins.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dot_config/zsh/dot_zsh_plugins.txt b/dot_config/zsh/dot_zsh_plugins.txt index 3f367e5..560aa28 100644 --- a/dot_config/zsh/dot_zsh_plugins.txt +++ b/dot_config/zsh/dot_zsh_plugins.txt @@ -22,7 +22,7 @@ alexdesousa/oath TwoPizza9621536/zsh-exa fdellwing/zsh-bat asdf-vm/asdf -Felixoid/zsh-hoco +#Felixoid/zsh-hoco olets/zsh-abbr trapd00r/LS_COLORS From 88a9903375ca4cd952ed77d87631de04c0f80bba Mon Sep 17 00:00:00 2001 From: eeleater Date: Mon, 1 May 2023 00:07:57 +0200 Subject: [PATCH 05/97] updated antidote config somewhat --- dot_config/zsh/dot_zsh_plugins.txt | 2 +- dot_config/zsh/files/sshcomp.zsh | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dot_config/zsh/dot_zsh_plugins.txt b/dot_config/zsh/dot_zsh_plugins.txt index 560aa28..3f367e5 100644 --- a/dot_config/zsh/dot_zsh_plugins.txt +++ b/dot_config/zsh/dot_zsh_plugins.txt @@ -22,7 +22,7 @@ alexdesousa/oath TwoPizza9621536/zsh-exa fdellwing/zsh-bat asdf-vm/asdf -#Felixoid/zsh-hoco +Felixoid/zsh-hoco olets/zsh-abbr trapd00r/LS_COLORS diff --git a/dot_config/zsh/files/sshcomp.zsh b/dot_config/zsh/files/sshcomp.zsh index 3984595..623d3a5 100644 --- a/dot_config/zsh/files/sshcomp.zsh +++ b/dot_config/zsh/files/sshcomp.zsh @@ -10,3 +10,6 @@ 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::*' + +function knownhosts () { cat "$HOME"/.ssh/known_hosts | grep ',' | cut -d',' -f1 } +HOCO_FUNCTIONS=(knownhosts) From c4637f4ff121708a1bd033e48d9c87234a62b31c Mon Sep 17 00:00:00 2001 From: eeleater Date: Mon, 1 May 2023 00:10:37 +0200 Subject: [PATCH 06/97] updated antidote config somewhat --- dot_config/zsh/dot_zsh_plugins.txt | 2 +- dot_config/zsh/files/sshcomp.zsh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dot_config/zsh/dot_zsh_plugins.txt b/dot_config/zsh/dot_zsh_plugins.txt index 3f367e5..560aa28 100644 --- a/dot_config/zsh/dot_zsh_plugins.txt +++ b/dot_config/zsh/dot_zsh_plugins.txt @@ -22,7 +22,7 @@ alexdesousa/oath TwoPizza9621536/zsh-exa fdellwing/zsh-bat asdf-vm/asdf -Felixoid/zsh-hoco +#Felixoid/zsh-hoco olets/zsh-abbr trapd00r/LS_COLORS diff --git a/dot_config/zsh/files/sshcomp.zsh b/dot_config/zsh/files/sshcomp.zsh index 623d3a5..961dad1 100644 --- a/dot_config/zsh/files/sshcomp.zsh +++ b/dot_config/zsh/files/sshcomp.zsh @@ -11,5 +11,5 @@ 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) +#function knownhosts () { cat "$HOME"/.ssh/known_hosts | grep ',' | cut -d',' -f1 } +#HOCO_FUNCTIONS=(knownhosts) From 1f04c5b3d8628ff517da7c5305094f1c317942a9 Mon Sep 17 00:00:00 2001 From: eeleater Date: Tue, 2 May 2023 00:19:50 +0200 Subject: [PATCH 07/97] moved env.zsh to private repo --- .chezmoiexternal.toml | 3 +++ dot_local/share/{zsh => }/bofh | 0 dot_local/share/zsh/encrypted_env.zsh.age | 12 ------------ 3 files changed, 3 insertions(+), 12 deletions(-) create mode 100644 .chezmoiexternal.toml rename dot_local/share/{zsh => }/bofh (100%) delete mode 100644 dot_local/share/zsh/encrypted_env.zsh.age diff --git a/.chezmoiexternal.toml b/.chezmoiexternal.toml new file mode 100644 index 0000000..0686ab9 --- /dev/null +++ b/.chezmoiexternal.toml @@ -0,0 +1,3 @@ +[".local/share/zsh/config"] + type = "git-repo" + url = "git@git.eeleater.org:eeleater/dotfiles_private.git" diff --git a/dot_local/share/zsh/bofh b/dot_local/share/bofh similarity index 100% rename from dot_local/share/zsh/bofh rename to dot_local/share/bofh diff --git a/dot_local/share/zsh/encrypted_env.zsh.age b/dot_local/share/zsh/encrypted_env.zsh.age deleted file mode 100644 index 7d0016c..0000000 --- a/dot_local/share/zsh/encrypted_env.zsh.age +++ /dev/null @@ -1,12 +0,0 @@ ------BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBQUHFPSUJkUGc0anhDVkli -VlFYNHBVUEpmZmtwdXBTSGdvdnIrSjM1M3pFCmdzWkhmVGcwckpoVXRyNjJnK01t -b0h3dVRHcDh2Q0psV1NQZ2pvYmRoSUUKLS0tIEdIVVFMQkl4enBhMHI0OU5KWGZC -aTlibTdVcWcwanduVXZ4MXMxS2xsWUEKpSA8zaN0Lpk3Mqce5kQmDktfRNT5SSW9 -u7k5jfk+7yzKocqiWKB3/GIdkFauNtFguyqeMy2BUq2VOE91wW/usgrOWiUHbulp -917pa72C72eGnSc1RcpXxyd5J6EqLXLIutJAxWPnKIZcQLQyj22YWT8pYnTibkGU -bodl1uZKrfEC7I013qr3hRdrbJAi3sAKmD76Ie2RCf2ubxqJxgOiAcgoZA44ArjC -Tw4KU1sKNzimm2MA4Hjf5/yYGOF00fo/DtuJtu1jHckyynK80Ppda/AcRfbE3ByC -My5ILbJ2/q0yMO9phMmOyC6kVomjgyFARAPQXAY6CZe0JdFIESbzz0yNbA7QKWKW -o59c ------END AGE ENCRYPTED FILE----- From 6d40f3fa639df90a16291afd149a1c393b0a4414 Mon Sep 17 00:00:00 2001 From: eeleater Date: Tue, 2 May 2023 00:21:54 +0200 Subject: [PATCH 08/97] moved env.zsh to private repo --- .chezmoiexternal.toml | 3 --- dot_local/bin/executable_bofh | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) delete mode 100644 .chezmoiexternal.toml diff --git a/.chezmoiexternal.toml b/.chezmoiexternal.toml deleted file mode 100644 index 0686ab9..0000000 --- a/.chezmoiexternal.toml +++ /dev/null @@ -1,3 +0,0 @@ -[".local/share/zsh/config"] - type = "git-repo" - url = "git@git.eeleater.org:eeleater/dotfiles_private.git" diff --git a/dot_local/bin/executable_bofh b/dot_local/bin/executable_bofh index d1ca04e..c8a022c 100644 --- a/dot_local/bin/executable_bofh +++ b/dot_local/bin/executable_bofh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -excuses_file="$HOME/.local/share/zsh/bofh" +excuses_file="$HOME/.local/share/bofh" num_lines=$(nl "$excuses_file" | tail -n 1 | awk '{print $1}') -awk 'NR=='$((1 + RANDOM % num_lines ))'{print;exit}' "$excuses_file" \ No newline at end of file +awk 'NR=='$((1 + RANDOM % num_lines ))'{print;exit}' "$excuses_file" From f7cb8e5949cd00f27d9789f9a6ccc683fbf7ba10 Mon Sep 17 00:00:00 2001 From: Nikolas Weger Date: Thu, 28 Sep 2023 12:18:38 +0200 Subject: [PATCH 09/97] updated antidote to newest state --- .chezmoi.toml.tmpl | 10 ++ .chezmoiexternal.toml | 3 + dot_config/kitty/current-theme.conf | 21 --- dot_config/kitty/kitty.conf | 6 +- dot_config/sheldon/plugins.toml | 20 +-- dot_config/topgrade.toml | 98 +++++++++++++ dot_config/zsh/dot_zsh_plugins.txt | 23 +-- dot_config/zsh/dot_zshenv | 8 +- dot_config/zsh/dot_zshrc | 13 +- dot_config/zsh/files/evalstuff.zsh | 19 ++- dot_config/zsh/files/functions.zsh | 5 + dot_config/zsh/files/sshcomp.zsh | 13 +- dot_local/bin/executable_bofh | 5 - dot_local/bin/executable_hackerquotes | 195 -------------------------- dot_local/bin/executable_joke | 20 +++ dot_local/share/hackerquotes/dijkstra | 6 + dot_local/share/hackerquotes/knuth | 5 + dot_local/share/hackerquotes/misc | 19 +++ dot_local/share/hackerquotes/perlis | 120 ++++++++++++++++ dot_local/share/hackerquotes/torvalds | 3 + 20 files changed, 343 insertions(+), 269 deletions(-) create mode 100644 .chezmoi.toml.tmpl create mode 100644 .chezmoiexternal.toml delete mode 100644 dot_config/kitty/current-theme.conf create mode 100644 dot_config/topgrade.toml delete mode 100644 dot_local/bin/executable_bofh delete mode 100644 dot_local/bin/executable_hackerquotes create mode 100644 dot_local/bin/executable_joke create mode 100644 dot_local/share/hackerquotes/dijkstra create mode 100644 dot_local/share/hackerquotes/knuth create mode 100644 dot_local/share/hackerquotes/misc create mode 100644 dot_local/share/hackerquotes/perlis create mode 100644 dot_local/share/hackerquotes/torvalds diff --git a/.chezmoi.toml.tmpl b/.chezmoi.toml.tmpl new file mode 100644 index 0000000..12016de --- /dev/null +++ b/.chezmoi.toml.tmpl @@ -0,0 +1,10 @@ +{{ $email := promptString "email" -}} +{{ $username := promptString "username" -}} + +[git] + autoCommit = true + autoPush = true + +[data] + email = {{ $email | quote }} + name = {{ $username | quote }} diff --git a/.chezmoiexternal.toml b/.chezmoiexternal.toml new file mode 100644 index 0000000..0686ab9 --- /dev/null +++ b/.chezmoiexternal.toml @@ -0,0 +1,3 @@ +[".local/share/zsh/config"] + type = "git-repo" + url = "git@git.eeleater.org:eeleater/dotfiles_private.git" diff --git a/dot_config/kitty/current-theme.conf b/dot_config/kitty/current-theme.conf deleted file mode 100644 index df8f4ee..0000000 --- a/dot_config/kitty/current-theme.conf +++ /dev/null @@ -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 diff --git a/dot_config/kitty/kitty.conf b/dot_config/kitty/kitty.conf index 6122203..62b78fe 100644 --- a/dot_config/kitty/kitty.conf +++ b/dot_config/kitty/kitty.conf @@ -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 diff --git a/dot_config/sheldon/plugins.toml b/dot_config/sheldon/plugins.toml index 7b2c650..e2a3ba3 100644 --- a/dot_config/sheldon/plugins.toml +++ b/dot_config/sheldon/plugins.toml @@ -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"] diff --git a/dot_config/topgrade.toml b/dot_config/topgrade.toml new file mode 100644 index 0000000..ca03fc1 --- /dev/null +++ b/dot_config/topgrade.toml @@ -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 diff --git a/dot_config/zsh/dot_zsh_plugins.txt b/dot_config/zsh/dot_zsh_plugins.txt index 560aa28..9bc706e 100644 --- a/dot_config/zsh/dot_zsh_plugins.txt +++ b/dot_config/zsh/dot_zsh_plugins.txt @@ -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 diff --git a/dot_config/zsh/dot_zshenv b/dot_config/zsh/dot_zshenv index 2caee91..80a93d8 100644 --- a/dot_config/zsh/dot_zshenv +++ b/dot_config/zsh/dot_zshenv @@ -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" diff --git a/dot_config/zsh/dot_zshrc b/dot_config/zsh/dot_zshrc index dd680e1..e3e9b16 100644 --- a/dot_config/zsh/dot_zshrc +++ b/dot_config/zsh/dot_zshrc @@ -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 diff --git a/dot_config/zsh/files/evalstuff.zsh b/dot_config/zsh/files/evalstuff.zsh index b95e8e8..1eeba07 100644 --- a/dot_config/zsh/files/evalstuff.zsh +++ b/dot_config/zsh/files/evalstuff.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)" diff --git a/dot_config/zsh/files/functions.zsh b/dot_config/zsh/files/functions.zsh index 6a40a2f..51af6bf 100644 --- a/dot_config/zsh/files/functions.zsh +++ b/dot_config/zsh/files/functions.zsh @@ -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 diff --git a/dot_config/zsh/files/sshcomp.zsh b/dot_config/zsh/files/sshcomp.zsh index 961dad1..33fc146 100644 --- a/dot_config/zsh/files/sshcomp.zsh +++ b/dot_config/zsh/files/sshcomp.zsh @@ -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)"$(/dev/null && [ -n "${COLUMNS:-}" ]; then - printf '%b\n\n' "$*" | fold -s -w $COLUMNS - else - printf '%b\n\n' "$*" - fi -} - - _zp_hq_hacker_quotes=( - # Linus Torvalds - # https://en.wikiquote.org/wiki/Linus_Torvalds - "Talk is cheap. Show me the code.\n - Linus Torvalds" - "Most good programmers do programming not because they expect to get paid or get adulation by the public, but because it is fun to program.\n - Linus Torvalds" - "I'm an egotistical bastard, and I name all my projects after myself. First Linux, now git.\n - Linus Torvalds" - - # Alan J. Perlis - # https://en.wikiquote.org/wiki/Alan_Perlis - "One man's constant is another man's variable.\n - Alan J. Perlis" - "Functions delay binding; data structures induce binding. Moral: Structure data late in the programming process.\n - Alan J. Perlis" - "Syntactic sugar causes cancer of the semicolon.\n - Alan J. Perlis" - "Every program is a part of some other program and rarely fits.\n - Alan J. Perlis" - "If a program manipulates a large amount of data, it does so in a small number of ways.\n - Alan J. Perlis" - "Symmetry is a complexity-reducing concept (co-routines include subroutines); seek it everywhere.\n - Alan J. Perlis" - "It is easier to write an incorrect program than understand a correct one.\n - Alan J. Perlis" - "A programming language is low level when its programs require attention to the irrelevant.\n - Alan J. Perlis" - "It is better to have 100 functions operate on one data structure than 10 functions on 10 data structures.\n - Alan J. Perlis" - "Get into a rut early: Do the same process the same way. Accumulate idioms. Standardize. The only difference(!) between Shakespeare and you was the size of his idiom list - not the size of his vocabulary.\n - Alan J. Perlis" - "If you have a procedure with ten parameters, you probably missed some.\n - Alan J. Perlis" - "Recursion is the root of computation since it trades description for time.\n - Alan J. Perlis" - "If two people write exactly the same program, each should be put into microcode and then they certainly won't be the same.\n - Alan J. Perlis" - "In the long run every program becomes rococo - then rubble.\n - Alan J. Perlis" - "Everything should be built top-down, except the first time.\n - Alan J. Perlis" - "Every program has (at least) two purposes: the one for which it was written, and another for which it wasn't.\n - Alan J. Perlis" - "If a listener nods his head when you're explaining your program, wake him up.\n - Alan J. Perlis" - "A program without a loop and a structured variable isn't worth writing.\n - Alan J. Perlis" - "A language that doesn't affect the way you think about programming, is not worth knowing.\n - Alan J. Perlis" - "Wherever there is modularity there is the potential for misunderstanding: Hiding information implies a need to check communication.\n - Alan J. Perlis" - "Optimization hinders evolution.\n - Alan J. Perlis" - "A good system can't have a weak command language.\n - Alan J. Perlis" - "To understand a program you must become both the machine and the program.\n - Alan J. Perlis" - "Perhaps if we wrote programs from childhood on, as adults we'd be able to read them.\n - Alan J. Perlis" - "One can only display complex information in the mind. Like seeing, movement or flow or alteration of view is more important than the static picture, no matter how lovely.\n - Alan J. Perlis" - "There will always be things we wish to say in our programs that in all known languages can only be said poorly.\n - Alan J. Perlis" - "Once you understand how to write a program get someone else to write it.\n - Alan J. Perlis" - "Around computers it is difficult to find the correct unit of time to measure progress. Some cathedrals took a century to complete. Can you imagine the grandeur and scope of a program that would take as long?\n - Alan J. Perlis" - "For systems, the analogue of a face-lift is to add to the control graph an edge that creates a cycle, not just an additional node.\n - Alan J. Perlis" - "In programming, everything we do is a special case of something more general -- and often we know it too quickly.\n - Alan J. Perlis" - "Simplicity does not precede complexity, but follows it.\n - Alan J. Perlis" - "Programmers are not to be measured by their ingenuity and their logic but by the completeness of their case analysis.\n - Alan J. Perlis" - "The eleventh commandment was \"Thou Shalt Compute\" or \"Thou Shalt Not Compute\" - I forget which.\n - Alan J. Perlis" - "The string is a stark data structure and everywhere it is passed there is much duplication of process. It is a perfect vehicle for hiding information.\n - Alan J. Perlis" - "Everyone can be taught to sculpt: Michelangelo would have had to be taught not to. So it is with great programmers.\n - Alan J. Perlis" - "The use of a program to prove the 4-color theorem will not change mathematics - it merely demonstrates that the theorem, a challenge for a century, is probably not important to mathematics.\n - Alan J. Perlis" - "The most important computer is the one that rages in our skulls and ever seeks that satisfactory external emulator. The standarization of real computers would be a disaster - and so it probably won't happen.\n - Alan J. Perlis" - "Structured Programming supports the law of the excluded middle.\n - Alan J. Perlis" - "Re graphics: A picture is worth 10K words - but only those to describe the picture. Hardly any sets of 10K words can be adequately described with pictures.\n - Alan J. Perlis" - "There are two ways to write error-free programs; only the third one works.\n - Alan J. Perlis" - "Some programming languages manage to absorb change, but withstand progress.\n - Alan J. Perlis" - "You can measure a programmer's perspective by noting his attitude on the continuing vitality of FORTRAN.\n - Alan J. Perlis" - "In software systems, it is often the early bird that makes the worm.\n - Alan J. Perlis" - "Sometimes I think the only universal in the computing field is the fetch-execute cycle.\n - Alan J. Perlis" - "The goal of computation is the emulation of our synthetic abilities, not the understanding of our analytic ones.\n - Alan J. Perlis" - "Like punning, programming is a play on words.\n - Alan J. Perlis" - "As Will Rogers would have said, \"There is no such thing as a free variable.\"\n - Alan J. Perlis" - "The best book on programming for the layman is \"Alice in Wonderland\"; but that's because it's the best book on anything for the layman.\n - Alan J. Perlis" - "Giving up on assembly language was the apple in our Garden of Eden: Languages whose use squanders machine cycles are sinful. The LISP machine now permits LISP programmers to abandon bra and fig-leaf.\n - Alan J. Perlis" - "When we understand knowledge-based systems, it will be as before -- except our fingertips will have been singed.\n - Alan J. Perlis" - "Bringing computers into the home won't change either one, but may revitalize the corner saloon.\n - Alan J. Perlis" - "Systems have sub-systems and sub-systems have sub-systems and so on ad infinitum - which is why we're always starting over.\n - Alan J. Perlis" - "So many good ideas are never heard from again once they embark in a voyage on the semantic gulf.\n - Alan J. Perlis" - "Beware of the Turing tar-pit in which everything is possible but nothing of interest is easy.\n - Alan J. Perlis" - "A LISP programmer knows the value of everything, but the cost of nothing.\n - Alan J. Perlis" - "Software is under a constant tension. Being symbolic it is arbitrarily perfectible; but also it is arbitrarily changeable.\n - Alan J. Perlis" - "It is easier to change the specification to fit the program than vice versa.\n - Alan J. Perlis" - "Fools ignore complexity. Pragmatists suffer it. Some can avoid it. Geniuses remove it.\n - Alan J. Perlis" - "In English every word can be verbed. Would that it were so in our programming languages.\n - Alan J. Perlis" - "In seeking the unattainable, simplicity only gets in the way.\n - Alan J. Perlis" - "In programming, as in everything else, to be in error is to be reborn.\n - Alan J. Perlis" - "In computing, invariants are ephemeral.\n - Alan J. Perlis" - "When we write programs that \"learn\", it turns out that we do and they don't.\n - Alan J. Perlis" - "Often it is the means that justify the ends: Goals advance technique and technique survives even when goal structures crumble.\n - Alan J. Perlis" - "Make no mistake about it: Computers process numbers - not symbols. We measure our understanding (and control) by the extent to which we can arithmetize an activity.\n - Alan J. Perlis" - "Making something variable is easy. Controlling duration of constancy is the trick.\n - Alan J. Perlis" - "Think of all the psychic energy expended in seeking a fundamental distinction between \"algorithm\" and \"program\".\n - Alan J. Perlis" - "If we believe in data structures, we must believe in independent (hence simultaneous) processing. For why else would we collect items within a structure? Why do we tolerate languages that give us the one without the other?\n - Alan J. Perlis" - "In a 5 year period we get one superb programming language. Only we can't control when the 5 year period will be.\n - Alan J. Perlis" - "Over the centuries the Indians developed sign language for communicating phenomena of interest. Programmers from different tribes (FORTRAN, LISP, ALGOL, SNOBOL, etc.) could use one that doesn't require them to carry a blackboard on their ponies.\n - Alan J. Perlis" - "Documentation is like term insurance: It satisfies because almost no one who subscribes to it depends on its benefits.\n - Alan J. Perlis" - "An adequate bootstrap is a contradiction in terms.\n - Alan J. Perlis" - "It is not a language's weakness but its strengths that control the gradient of its change: Alas, a language never escapes its embryonic sac.\n - Alan J. Perlis" - "Is it possible that software is not like anything else, that it is meant to be discarded: that the whole point is to see it as a soap bubble?\n - Alan J. Perlis" - "Because of its vitality, the computing field is always in desperate need of new cliches: Banality soothes our nerves.\n - Alan J. Perlis" - "It is the user who should parameterize procedures, not their creators.\n - Alan J. Perlis" - "The cybernetic exchange between man, computer and algorithm is like a game of musical chairs: The frantic search for balance always leaves one of the three standing ill at ease.\n - Alan J. Perlis" - "If your computer speaks English, it was probably made in Japan.\n - Alan J. Perlis" - "A year spent in artificial intelligence is enough to make one believe in God.\n - Alan J. Perlis" - "Prolonged contact with the computer turns mathematicians into clerks and vice versa.\n - Alan J. Perlis" - "In computing, turning the obvious into the useful is a living definition of the word \"frustration\".\n - Alan J. Perlis" - "We are on the verge: Today our program proved Fermat's next-to-last theorem.\n - Alan J. Perlis" - "What is the difference between a Turing machine and the modern computer? It's the same as that between Hillary's ascent of Everest and the establishment of a Hilton hotel on its peak.\n - Alan J. Perlis" - "Motto for a research laboratory: What we work on today, others will first think of tomorrow.\n - Alan J. Perlis" - "Though the Chinese should adore APL, it's FORTRAN they put their money on.\n - Alan J. Perlis" - "We kid ourselves if we think that the ratio of procedure to data in an active data-base system can be made arbitrarily small or even kept small.\n - Alan J. Perlis" - "We have the mini and the micro computer. In what semantic niche would the pico computer fall?\n - Alan J. Perlis" - "It is not the computer's fault that Maxwell's equations are not adequate to design the electric motor.\n - Alan J. Perlis" - "One does not learn computing by using a hand calculator, but one can forget arithmetic.\n - Alan J. Perlis" - "Computation has made the tree flower.\n - Alan J. Perlis" - "The computer reminds one of Lon Chaney -- it is the machine of a thousand faces.\n - Alan J. Perlis" - "The computer is the ultimate polluter: its feces are indistinguish- able from the food it produces.\n - Alan J. Perlis" - "When someone says \"I want a programming language in which I need only say what I wish done,\" give him a lollipop.\n - Alan J. Perlis" - "Interfaces keep things tidy, but don't accelerate growth: Functions do.\n - Alan J. Perlis" - "Don't have good ideas if you aren't willing to be responsible for them.\n - Alan J. Perlis" - "Computers don't introduce order anywhere as much as they expose opportunities.\n - Alan J. Perlis" - "When a professor insists computer science is X but not Y, have compassion for his graduate students.\n - Alan J. Perlis" - "In computing, the mean time to failure keeps getting shorter.\n - Alan J. Perlis" - "In man-machine symbiosis, it is man who must adjust: The machines can't.\n - Alan J. Perlis" - "We will never run out of things to program as long as there is a single program around.\n - Alan J. Perlis" - "Dealing with failure is easy: Work hard to improve. Success is also easy to handle: You've solved the wrong problem. Work hard to improve.\n - Alan J. Perlis" - "One can't proceed from the informal to the formal by formal means.\n - Alan J. Perlis" - "Purely applicative languages are poorly applicable.\n - Alan J. Perlis" - "The proof of a system's value is its existence.\n - Alan J. Perlis" - "You can't communicate complexity, only an awareness of it.\n - Alan J. Perlis" - "It's difficult to extract sense from strings, but they're the only communication coin we can count on.\n - Alan J. Perlis" - "The debate rages on: is PL/I Bachtrian or Dromedary?\n - Alan J. Perlis" - "Whenever two programmers meet to criticize their programs, both are silent.\n - Alan J. Perlis" - "Think of it! With VLSI we can pack 100 ENIACS in 1 sq. cm.\n - Alan J. Perlis" - "Editing is a rewording activity.\n - Alan J. Perlis" - "Why did the Roman Empire collapse? What is Latin for office automation?\n - Alan J. Perlis" - "Computer Science is embarrassed by the computer.\n - Alan J. Perlis" - "The only constructive theory connecting neuroscience and psychology will arise from the study of software.\n - Alan J. Perlis" - "Within a computer natural language is unnatural.\n - Alan J. Perlis" - "Most people find the concept of programming obvious, but the doing impossible.\n - Alan J. Perlis" - "You think you know when you can learn, are more sure when you can write, even more when you can teach, but certain when you can program.\n - Alan J. Perlis" - "It goes against the grain of modern education to teach children to program. What fun is there in making plans, acquiring discipline in organizing thoughts, devoting attention to detail and learning to be self-critical?\n - Alan J. Perlis" - "If you can imagine a society in which the computer- robot is the only menial, you can imagine anything.\n - Alan J. Perlis" - "Programming is an unnatural act.\n - Alan J. Perlis" - "Adapting old programs to fit new machines usually means adapting new machines to behave like old ones.\n - Alan J. Perlis" - - # Donald E. Knuth - # https://en.wikiquote.org/wiki/Donald_Knuth - "Beware of bugs in the above code; I have only proved it correct, not tried it.\n - Donald E. Knuth" - "Science is knowledge which we understand so well that we can teach it to a computer; and if we don't fully understand something, it is an art to deal with it.\n - Donald E. Knuth" - "In fact, my main conclusion after spending ten years of my life working on the TEX project is that software is hard. It’s harder than anything else I’ve ever had to do.\n - Donald E. Knuth" - "Let us change our traditional attitude to the construction of programs: Instead of imagining that our main task is to instruct a computer what to do, let us concentrate rather on explaining to human beings what we want a computer to do.\n - Donald E. Knuth" - "The real problem is that programmers have spent far too much time worrying about efficiency in the wrong places and at the wrong times; premature optimization is the root of all evil (or at least most of it) in programming.\n - Donald E. Knuth" - - # Edsger W. Dijkstra - # https://en.wikiquote.org/wiki/Edsger_W._Dijkstra - "Testing shows the presence, not the absence of bugs.\n - Edsger W. Dijkstra" - "The competent programmer is fully aware of the strictly limited size of his own skull; therefore he approaches the programming task in full humility, and among other things he avoids clever tricks like the plague.\n - Edsger W. Dijkstra" - "LISP has been jokingly described as \"the most intelligent way to misuse a computer\". I think that description a great compliment because it transmits the full flavor of liberation: it has assisted a number of our most gifted fellow humans in thinking previously impossible thoughts.\n - Edsger W. Dijkstra" - "Besides a mathematical inclination, an exceptionally good mastery of one's native tongue is the most vital asset of a competent programmer.\n - Edsger W. Dijkstra" - "Simplicity is a great virtue but it requires hard work to achieve it and education to appreciate it. And to make matters worse: complexity sells better.\n - Edsger W. Dijkstra" - "My point today is that, if we wish to count lines of code, we should not regard them as \"lines produced\" but as \"lines spent\": the current conventional wisdom is so foolish as to book that count on the wrong side of the ledger.\n - Edsger W. Dijkstra" - - # mics - "There are two ways of constructing a software design. One way is to make it so simple that there are obviously no deficiencies. And the other way is to make it so complicated that there are no obvious deficiencies.\n - C.A.R. Hoare" - "There are only two hard things in Computer Science: cache invalidation and naming things.\n - Phil Karlton" - "There are 2 hard problems in computer science: cache invalidation, naming things, and off-by-1 errors.\n - https://martinfowler.com/bliki/TwoHardThings.html" - "Always code as if the guy who ends up maintaining your code will be a violent psychopath who knows where you live.\n - Martin Golding" - "The trouble with programmers is that you can never tell what a programmer is doing until it’s too late.\n - Seymour Cray" - "First learn computer science and all the theory. Next develop a programming style. Then forget all that and just hack.\n - George Carrette" - "Debugging is twice as hard as writing the code in the first place. Therefore, if you write the code as cleverly as possible, you are, by definition, not smart enough to debug it.\n - Brian W. Kernighan" - "Measuring programming progress by lines of code is like measuring aircraft building progress by weight.\n - Bill Gates" - "The best programmers are not marginally better than merely good ones. They are an order-of-magnitude better, measured by whatever standard: conceptual creativity, speed, ingenuity of design, or problem-solving ability.\n - Randall E. Stross" - "For a long time it puzzled me how something so expensive, so leading edge, could be so useless. And then it occurred to me that a computer is a stupid machine with the ability to do incredibly smart things, while computer programmers are smart people with the ability to do incredibly stupid things. They are, in short, a perfect match.\n - Bill Bryson" - "You can’t have great software without a great team, and most software teams behave like dysfunctional families.\n - Jim McCarthy" - "Incorrect documentation is often worse than no documentation.\n - Bertrand Meyer" - "Correctness is clearly the prime quality. If a system does not do what it is supposed to do, then everything else about it matters little.\n - Bertrand Meyer" - "I would love to change the world, but they won't give me the source code.\n - Anonymous" - "Any fool can write code that a computer can understand. Good programmers write code that humans can understand.\n - Martin Fowler" - "I am not a great programmer; I am just a good programmer with great habits.\n - Kent Beck" - "A Computer is a state machine. Threads are for people who can't program state machines.\n - Alan Cox" - "Not everything worth doing is worth doing well.\n - Tom West" - "Peace comes from thinking.\n - N.S.A" - ) - - _zp_hq::print_quote "${_zp_hq_hacker_quotes[RANDOM % $#_zp_hq_hacker_quotes + 1]}" diff --git a/dot_local/bin/executable_joke b/dot_local/bin/executable_joke new file mode 100644 index 0000000..00546a9 --- /dev/null +++ b/dot_local/bin/executable_joke @@ -0,0 +1,20 @@ +##!/usr/bin/env bash + +case "$1" in +"dad") + joke=$(/usr/bin/curl -sH "Accept: text/plain" 'https://icanhazdadjoke.com/') + echo "Daily Dad Joke: $joke" + ;; +"bofh") + excuses_file="$HOME/.local/share/bofh" + num_lines=$(nl "$excuses_file" | tail -n 1 | awk '{print $1}') + echo -n "Daily BOFH Excuse: " + awk 'NR=='$((1 + RANDOM % num_lines ))'{print;exit}' "$excuses_file" + ;; +"hq") + file="$HOME/.local/share/hackerquotes/$2" + lines=$(nl "$file" | tail -n 1 | awk '{print $1}') + echo -n "Daily Hackerquote: " + awk 'NR=='$((1 + RANDOM % $lines ))'{print;exit}' "$file" + ;; +esac diff --git a/dot_local/share/hackerquotes/dijkstra b/dot_local/share/hackerquotes/dijkstra new file mode 100644 index 0000000..7369cc5 --- /dev/null +++ b/dot_local/share/hackerquotes/dijkstra @@ -0,0 +1,6 @@ +Testing shows the presence, not the absence of bugs. - Edsger W. Dijkstra +The competent programmer is fully aware of the strictly limited size of his own skull; therefore he approaches the programming task in full humility, and among other things he avoids clever tricks like the plague. - Edsger W. Dijkstra +LISP has been jokingly described as 'the most intelligent way to misuse a computer'. I think that description a great compliment because it transmits the full flavor of liberation: it has assisted a number of our most gifted fellow humans in thinking previously impossible thoughts. - Edsger W. Dijkstra +Besides a mathematical inclination, an exceptionally good mastery of one's native tongue is the most vital asset of a competent programmer. - Edsger W. Dijkstra +Simplicity is a great virtue but it requires hard work to achieve it and education to appreciate it. And to make matters worse: complexity sells better. - Edsger W. Dijkstra +My point today is that, if we wish to count lines of code, we should not regard them as 'lines produced' but as 'lines spent': the current conventional wisdom is so foolish as to book that count on the wrong side of the ledger. - Edsger W. Dijkstra diff --git a/dot_local/share/hackerquotes/knuth b/dot_local/share/hackerquotes/knuth new file mode 100644 index 0000000..603c2c7 --- /dev/null +++ b/dot_local/share/hackerquotes/knuth @@ -0,0 +1,5 @@ +Beware of bugs in the above code; I have only proved it correct, not tried it. - Donald E. Knuth +Science is knowledge which we understand so well that we can teach it to a computer; and if we don't fully understand something, it is an art to deal with it. - Donald E. Knuth +In fact, my main conclusion after spending ten years of my life working on the TEX project is that software is hard. It’s harder than anything else I’ve ever had to do. - Donald E. Knuth +Let us change our traditional attitude to the construction of programs: Instead of imagining that our main task is to instruct a computer what to do, let us concentrate rather on explaining to human beings what we want a computer to do. - Donald E. Knuth +The real problem is that programmers have spent far too much time worrying about efficiency in the wrong places and at the wrong times; premature optimization is the root of all evil (or at least most of it) in programming. - Donald E. Knuth diff --git a/dot_local/share/hackerquotes/misc b/dot_local/share/hackerquotes/misc new file mode 100644 index 0000000..9f6a097 --- /dev/null +++ b/dot_local/share/hackerquotes/misc @@ -0,0 +1,19 @@ +There are two ways of constructing a software design. One way is to make it so simple that there are obviously no deficiencies. And the other way is to make it so complicated that there are no obvious deficiencies. - C.A.R. Hoare +There are only two hard things in Computer Science: cache invalidation and naming things. - Phil Karlton +There are 2 hard problems in computer science: cache invalidation, naming things, and off-by-1 errors. - https://martinfowler.com/bliki/TwoHardThings.html +Always code as if the guy who ends up maintaining your code will be a violent psychopath who knows where you live. - Martin Golding +The trouble with programmers is that you can never tell what a programmer is doing until it’s too late. - Seymour Cray +First learn computer science and all the theory. Next develop a programming style. Then forget all that and just hack. - George Carrette +Debugging is twice as hard as writing the code in the first place. Therefore, if you write the code as cleverly as possible, you are, by definition, not smart enough to debug it. - Brian W. Kernighan +Measuring programming progress by lines of code is like measuring aircraft building progress by weight. - Bill Gates +The best programmers are not marginally better than merely good ones. They are an order-of-magnitude better, measured by whatever standard: conceptual creativity, speed, ingenuity of design, or problem-solving ability. - Randall E. Stross +For a long time it puzzled me how something so expensive, so leading edge, could be so useless. And then it occurred to me that a computer is a stupid machine with the ability to do incredibly smart things, while computer programmers are smart people with the ability to do incredibly stupid things. They are, in short, a perfect match. - Bill Bryson +You can’t have great software without a great team, and most software teams behave like dysfunctional families. - Jim McCarthy +Incorrect documentation is often worse than no documentation. - Bertrand Meyer +Correctness is clearly the prime quality. If a system does not do what it is supposed to do, then everything else about it matters little. - Bertrand Meyer +I would love to change the world, but they won't give me the source code. - Anonymous +Any fool can write code that a computer can understand. Good programmers write code that humans can understand. - Martin Fowler +I am not a great programmer; I am just a good programmer with great habits. - Kent Beck +A Computer is a state machine. Threads are for people who can't program state machines. - Alan Cox +Not everything worth doing is worth doing well. - Tom West +Peace comes from thinking. - N.S.A \ No newline at end of file diff --git a/dot_local/share/hackerquotes/perlis b/dot_local/share/hackerquotes/perlis new file mode 100644 index 0000000..7ab1892 --- /dev/null +++ b/dot_local/share/hackerquotes/perlis @@ -0,0 +1,120 @@ +One man's constant is another man's variable. - Alan J. Perlis +Functions delay binding; data structures induce binding. Moral: Structure data late in the programming process. - Alan J. Perlis +Syntactic sugar causes cancer of the semicolon. - Alan J. Perlis +Every program is a part of some other program and rarely fits. - Alan J. Perlis +If a program manipulates a large amount of data, it does so in a small number of ways. - Alan J. Perlis +Symmetry is a complexity-reducing concept (co-routines include subroutines); seek it everywhere. - Alan J. Perlis +It is easier to write an incorrect program than understand a correct one. - Alan J. Perlis +A programming language is low level when its programs require attention to the irrelevant. - Alan J. Perlis +It is better to have 100 functions operate on one data structure than 10 functions on 10 data structures. - Alan J. Perlis +Get into a rut early: Do the same process the same way. Accumulate idioms. Standardize. The only difference(!) between Shakespeare and you was the size of his idiom list - not the size of his vocabulary. - Alan J. Perlis +If you have a procedure with ten parameters, you probably missed some. - Alan J. Perlis +Recursion is the root of computation since it trades description for time. - Alan J. Perlis +If two people write exactly the same program, each should be put into microcode and then they certainly won't be the same. - Alan J. Perlis +In the long run every program becomes rococo - then rubble. - Alan J. Perlis +Everything should be built top-down, except the first time. - Alan J. Perlis +Every program has (at least) two purposes: the one for which it was written, and another for which it wasn't. - Alan J. Perlis +If a listener nods his head when you're explaining your program, wake him up. - Alan J. Perlis +A program without a loop and a structured variable isn't worth writing. - Alan J. Perlis +A language that doesn't affect the way you think about programming, is not worth knowing. - Alan J. Perlis +Wherever there is modularity there is the potential for misunderstanding: Hiding information implies a need to check communication. - Alan J. Perlis +Optimization hinders evolution. - Alan J. Perlis +A good system can't have a weak command language. - Alan J. Perlis +To understand a program you must become both the machine and the program. - Alan J. Perlis +Perhaps if we wrote programs from childhood on, as adults we'd be able to read them. - Alan J. Perlis +One can only display complex information in the mind. Like seeing, movement or flow or alteration of view is more important than the static picture, no matter how lovely. - Alan J. Perlis +There will always be things we wish to say in our programs that in all known languages can only be said poorly. - Alan J. Perlis +Once you understand how to write a program get someone else to write it. - Alan J. Perlis +Around computers it is difficult to find the correct unit of time to measure progress. Some cathedrals took a century to complete. Can you imagine the grandeur and scope of a program that would take as long? - Alan J. Perlis +For systems, the analogue of a face-lift is to add to the control graph an edge that creates a cycle, not just an additional node. - Alan J. Perlis +In programming, everything we do is a special case of something more general -- and often we know it too quickly. - Alan J. Perlis +Simplicity does not precede complexity, but follows it. - Alan J. Perlis +Programmers are not to be measured by their ingenuity and their logic but by the completeness of their case analysis. - Alan J. Perlis +The eleventh commandment was \Thou Shalt Compute\ or \Thou Shalt Not Compute\ - I forget which. - Alan J. Perlis +The string is a stark data structure and everywhere it is passed there is much duplication of process. It is a perfect vehicle for hiding information. - Alan J. Perlis +Everyone can be taught to sculpt: Michelangelo would have had to be taught not to. So it is with great programmers. - Alan J. Perlis +The use of a program to prove the 4-color theorem will not change mathematics - it merely demonstrates that the theorem, a challenge for a century, is probably not important to mathematics. - Alan J. Perlis +The most important computer is the one that rages in our skulls and ever seeks that satisfactory external emulator. The standarization of real computers would be a disaster - and so it probably won't happen. - Alan J. Perlis +Structured Programming supports the law of the excluded middle. - Alan J. Perlis +Re graphics: A picture is worth 10K words - but only those to describe the picture. Hardly any sets of 10K words can be adequately described with pictures. - Alan J. Perlis +There are two ways to write error-free programs; only the third one works. - Alan J. Perlis +Some programming languages manage to absorb change, but withstand progress. - Alan J. Perlis +You can measure a programmer's perspective by noting his attitude on the continuing vitality of FORTRAN. - Alan J. Perlis +In software systems, it is often the early bird that makes the worm. - Alan J. Perlis +Sometimes I think the only universal in the computing field is the fetch-execute cycle. - Alan J. Perlis +The goal of computation is the emulation of our synthetic abilities, not the understanding of our analytic ones. - Alan J. Perlis +Like punning, programming is a play on words. - Alan J. Perlis +As Will Rogers would have said, \There is no such thing as a free variable. - Alan J. Perlis +The best book on programming for the layman is \Alice in Wonderland\; but that's because it's the best book on anything for the layman. - Alan J. Perlis +Giving up on assembly language was the apple in our Garden of Eden: Languages whose use squanders machine cycles are sinful. The LISP machine now permits LISP programmers to abandon bra and fig-leaf. - Alan J. Perlis +When we understand knowledge-based systems, it will be as before -- except our fingertips will have been singed. - Alan J. Perlis +Bringing computers into the home won't change either one, but may revitalize the corner saloon. - Alan J. Perlis +Systems have sub-systems and sub-systems have sub-systems and so on ad infinitum - which is why we're always starting over. - Alan J. Perlis +So many good ideas are never heard from again once they embark in a voyage on the semantic gulf. - Alan J. Perlis +Beware of the Turing tar-pit in which everything is possible but nothing of interest is easy. - Alan J. Perlis +A LISP programmer knows the value of everything, but the cost of nothing. - Alan J. Perlis +Software is under a constant tension. Being symbolic it is arbitrarily perfectible; but also it is arbitrarily changeable. - Alan J. Perlis +It is easier to change the specification to fit the program than vice versa. - Alan J. Perlis +Fools ignore complexity. Pragmatists suffer it. Some can avoid it. Geniuses remove it. - Alan J. Perlis +In English every word can be verbed. Would that it were so in our programming languages. - Alan J. Perlis +In seeking the unattainable, simplicity only gets in the way. - Alan J. Perlis +In programming, as in everything else, to be in error is to be reborn. - Alan J. Perlis +In computing, invariants are ephemeral. - Alan J. Perlis +When we write programs that \learn\, it turns out that we do and they don't. - Alan J. Perlis +Often it is the means that justify the ends: Goals advance technique and technique survives even when goal structures crumble. - Alan J. Perlis +Make no mistake about it: Computers process numbers - not symbols. We measure our understanding (and control) by the extent to which we can arithmetize an activity. - Alan J. Perlis +Making something variable is easy. Controlling duration of constancy is the trick. - Alan J. Perlis +Think of all the psychic energy expended in seeking a fundamental distinction between 'algorithm' and 'program'. - Alan J. Perlis +If we believe in data structures, we must believe in independent (hence simultaneous) processing. For why else would we collect items within a structure? Why do we tolerate languages that give us the one without the other? - Alan J. Perlis +In a 5 year period we get one superb programming language. Only we can't control when the 5 year period will be. - Alan J. Perlis +Over the centuries the Indians developed sign language for communicating phenomena of interest. Programmers from different tribes (FORTRAN, LISP, ALGOL, SNOBOL, etc.) could use one that doesn't require them to carry a blackboard on their ponies. - Alan J. Perlis +Documentation is like term insurance: It satisfies because almost no one who subscribes to it depends on its benefits. - Alan J. Perlis +An adequate bootstrap is a contradiction in terms. - Alan J. Perlis +It is not a language's weakness but its strengths that control the gradient of its change: Alas, a language never escapes its embryonic sac. - Alan J. Perlis +Is it possible that software is not like anything else, that it is meant to be discarded: that the whole point is to see it as a soap bubble? - Alan J. Perlis +Because of its vitality, the computing field is always in desperate need of new cliches: Banality soothes our nerves. - Alan J. Perlis +It is the user who should parameterize procedures, not their creators. - Alan J. Perlis +The cybernetic exchange between man, computer and algorithm is like a game of musical chairs: The frantic search for balance always leaves one of the three standing ill at ease. - Alan J. Perlis +If your computer speaks English, it was probably made in Japan. - Alan J. Perlis +A year spent in artificial intelligence is enough to make one believe in God. - Alan J. Perlis +Prolonged contact with the computer turns mathematicians into clerks and vice versa. - Alan J. Perlis +In computing, turning the obvious into the useful is a living definition of the word \frustration\. - Alan J. Perlis +We are on the verge: Today our program proved Fermat's next-to-last theorem. - Alan J. Perlis +What is the difference between a Turing machine and the modern computer? It's the same as that between Hillary's ascent of Everest and the establishment of a Hilton hotel on its peak. - Alan J. Perlis +Motto for a research laboratory: What we work on today, others will first think of tomorrow. - Alan J. Perlis +Though the Chinese should adore APL, it's FORTRAN they put their money on. - Alan J. Perlis +We kid ourselves if we think that the ratio of procedure to data in an active data-base system can be made arbitrarily small or even kept small. - Alan J. Perlis +We have the mini and the micro computer. In what semantic niche would the pico computer fall? - Alan J. Perlis +It is not the computer's fault that Maxwell's equations are not adequate to design the electric motor. - Alan J. Perlis +One does not learn computing by using a hand calculator, but one can forget arithmetic. - Alan J. Perlis +Computation has made the tree flower. - Alan J. Perlis +The computer reminds one of Lon Chaney -- it is the machine of a thousand faces. - Alan J. Perlis +The computer is the ultimate polluter: its feces are indistinguish- able from the food it produces. - Alan J. Perlis +When someone says \I want a programming language in which I need only say what I wish done, give him a lollipop. - Alan J. Perlis +Interfaces keep things tidy, but don't accelerate growth: Functions do. - Alan J. Perlis +Don't have good ideas if you aren't willing to be responsible for them. - Alan J. Perlis +Computers don't introduce order anywhere as much as they expose opportunities. - Alan J. Perlis +When a professor insists computer science is X but not Y, have compassion for his graduate students. - Alan J. Perlis +In computing, the mean time to failure keeps getting shorter. - Alan J. Perlis +In man-machine symbiosis, it is man who must adjust: The machines can't. - Alan J. Perlis +We will never run out of things to program as long as there is a single program around. - Alan J. Perlis +Dealing with failure is easy: Work hard to improve. Success is also easy to handle: You've solved the wrong problem. Work hard to improve. - Alan J. Perlis +One can't proceed from the informal to the formal by formal means. - Alan J. Perlis +Purely applicative languages are poorly applicable. - Alan J. Perlis +The proof of a system's value is its existence. - Alan J. Perlis +You can't communicate complexity, only an awareness of it. - Alan J. Perlis +It's difficult to extract sense from strings, but they're the only communication coin we can count on. - Alan J. Perlis +The debate rages on: is PL/I Bachtrian or Dromedary? - Alan J. Perlis +Whenever two programmers meet to criticize their programs, both are silent. - Alan J. Perlis +Think of it! With VLSI we can pack 100 ENIACS in 1 sq. cm. - Alan J. Perlis +Editing is a rewording activity. - Alan J. Perlis +Why did the Roman Empire collapse? What is Latin for office automation? - Alan J. Perlis +Computer Science is embarrassed by the computer. - Alan J. Perlis +The only constructive theory connecting neuroscience and psychology will arise from the study of software. - Alan J. Perlis +Within a computer natural language is unnatural. - Alan J. Perlis +Most people find the concept of programming obvious, but the doing impossible. - Alan J. Perlis +You think you know when you can learn, are more sure when you can write, even more when you can teach, but certain when you can program. - Alan J. Perlis +It goes against the grain of modern education to teach children to program. What fun is there in making plans, acquiring discipline in organizing thoughts, devoting attention to detail and learning to be self-critical? - Alan J. Perlis +If you can imagine a society in which the computer- robot is the only menial, you can imagine anything. - Alan J. Perlis +Programming is an unnatural act. - Alan J. Perlis +Adapting old programs to fit new machines usually means adapting new machines to behave like old ones. - Alan J. Perlis diff --git a/dot_local/share/hackerquotes/torvalds b/dot_local/share/hackerquotes/torvalds new file mode 100644 index 0000000..5badb4d --- /dev/null +++ b/dot_local/share/hackerquotes/torvalds @@ -0,0 +1,3 @@ +Talk is cheap. Show me the code. - Linus Torvalds +Most good programmers do programming not because they expect to get paid or get adulation by the public, but because it is fun to program. - Linus Torvalds +I'm an egotistical bastard, and I name all my projects after myself. First Linux, now git. - Linus Torvalds From 1f9f405d484d302690b0b5ed4ff826e5d75c5246 Mon Sep 17 00:00:00 2001 From: eeleater Date: Wed, 4 Oct 2023 17:24:27 +0000 Subject: [PATCH 10/97] Update dot_zshrc --- dot_config/zsh/dot_zshrc | 1 + 1 file changed, 1 insertion(+) diff --git a/dot_config/zsh/dot_zshrc b/dot_config/zsh/dot_zshrc index e3e9b16..e5c5e48 100644 --- a/dot_config/zsh/dot_zshrc +++ b/dot_config/zsh/dot_zshrc @@ -15,6 +15,7 @@ source "$ZDOTDIR"/files/compinit.zsh source "$ZDOTDIR"/files/bashcomps.zsh # 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 From 0474f8878ab6b5fe269bd13aa025c0f4ff32be0e Mon Sep 17 00:00:00 2001 From: eeleater Date: Thu, 5 Oct 2023 07:56:18 +0000 Subject: [PATCH 11/97] Update dot_zshrc --- dot_config/zsh/dot_zshrc | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dot_config/zsh/dot_zshrc b/dot_config/zsh/dot_zshrc index e5c5e48..8e3ff0d 100644 --- a/dot_config/zsh/dot_zshrc +++ b/dot_config/zsh/dot_zshrc @@ -13,6 +13,7 @@ source "$XDG_DATA_HOME"/zsh/config/env.zsh # completion stuff source "$ZDOTDIR"/files/compinit.zsh source "$ZDOTDIR"/files/bashcomps.zsh +source "$ZDOTDIR"/files/sshcomp.zsh # antidote test -r "$XDG_DATA_HOME"/antidote/antidote.zsh || git clone https://github.com/mattmc3/antidote.git "$XDG_DATA_HOME"/antidote @@ -22,11 +23,6 @@ antidote load # eval stuff source "$ZDOTDIR"/files/evalstuff.zsh - -# seperate configs source "$ZDOTDIR"/files/aliases.zsh source "$ZDOTDIR"/files/functions.zsh source "$ZDOTDIR"/files/distroicon.zsh - -# ssh ignored patterns -source "$ZDOTDIR"/files/sshcomp.zsh From 6100d79be748b0534b9e61045e3f0ff55955993c Mon Sep 17 00:00:00 2001 From: eeleater Date: Thu, 5 Oct 2023 07:56:33 +0000 Subject: [PATCH 12/97] Update dot_zshrc From f1ed7f64960bd476d2a2e8277e6edf9d34f43f23 Mon Sep 17 00:00:00 2001 From: eeleater Date: Thu, 5 Oct 2023 15:14:21 +0200 Subject: [PATCH 13/97] updated antidote --- dot_config/zsh/dot_zsh_plugins.txt | 3 - dot_config/zsh/dot_zshrc | 11 +- dot_config/zsh/files/evalstuff.zsh | 14 --- dot_config/zsh/files/mal.zsh | 195 +++++++++++++++++++++++++++++ 4 files changed, 205 insertions(+), 18 deletions(-) create mode 100644 dot_config/zsh/files/mal.zsh diff --git a/dot_config/zsh/dot_zsh_plugins.txt b/dot_config/zsh/dot_zsh_plugins.txt index 9bc706e..a707551 100644 --- a/dot_config/zsh/dot_zsh_plugins.txt +++ b/dot_config/zsh/dot_zsh_plugins.txt @@ -30,9 +30,6 @@ MichaelAquilina/zsh-you-should-use asdf-vm/asdf olets/zsh-abbr -# theme -#romkatv/powerlevel10k - # fish like zsh-users/zsh-autosuggestions zsh-users/zsh-syntax-highlighting diff --git a/dot_config/zsh/dot_zshrc b/dot_config/zsh/dot_zshrc index 8e3ff0d..823154c 100644 --- a/dot_config/zsh/dot_zshrc +++ b/dot_config/zsh/dot_zshrc @@ -7,12 +7,13 @@ eval "$potentialBanner[$RANDOM%$#potentialBanner+1]" function source () { test -r "$1" && builtin source "$1" } +stty -ixon + # local env exports source "$XDG_DATA_HOME"/zsh/config/env.zsh # completion stuff source "$ZDOTDIR"/files/compinit.zsh -source "$ZDOTDIR"/files/bashcomps.zsh source "$ZDOTDIR"/files/sshcomp.zsh # antidote @@ -26,3 +27,11 @@ source "$ZDOTDIR"/files/evalstuff.zsh source "$ZDOTDIR"/files/aliases.zsh source "$ZDOTDIR"/files/functions.zsh source "$ZDOTDIR"/files/distroicon.zsh + +# bash completions +source "$ZDOTDIR"/files/bashcomps.zsh + +# theme +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="$XDG_DATA_HOME/omp/themes/$potentialTheme[$RANDOM%$#potentialTheme+1]" +eval "$(oh-my-posh init zsh)" \ No newline at end of file diff --git a/dot_config/zsh/files/evalstuff.zsh b/dot_config/zsh/files/evalstuff.zsh index 1eeba07..5102e34 100644 --- a/dot_config/zsh/files/evalstuff.zsh +++ b/dot_config/zsh/files/evalstuff.zsh @@ -1,17 +1,3 @@ -# starship -#_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') -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 diff --git a/dot_config/zsh/files/mal.zsh b/dot_config/zsh/files/mal.zsh new file mode 100644 index 0000000..fc14d7d --- /dev/null +++ b/dot_config/zsh/files/mal.zsh @@ -0,0 +1,195 @@ +export ALIASES_FILE="$XDG_CONFIG_HOME"/aliasesrc + +function mal { + # Use fzf to allow the user to select an alias from the aliases file + function _execute_alias { + local alias_to_execute=$(cut -d' ' -f2- "$ALIASES_FILE" | fzf) + + # Check if the user cancelled the selection + test -z $alias_to_execute && return 1 + + echo "Executing alias: $alias_to_execute" + # Execute the selected alias + eval ${alias_to_execute%%=*} + return 0 + } + + # Delete an existing alias by selecting it from a list + function _interactive_delete { + local alias_to_delete=$(cut -d' ' -f2- "$ALIASES_FILE" | fzf) + + # Check if the user cancelled the selection + test -z $alias_to_delete && return 1 + + echo "Deleted alias: $alias_to_delete" + # Delete the selected alias from the aliases file + sed -i "/^alias ${alias_to_delete%%=*}=/d" "$ALIASES_FILE" + unalias ${alias_to_delete%%=*} + } + + # Delete an existing alias using specified name + function _parameter_delete { + local alias_to_delete=$1 + local line_with_alias=$(grep "$1=" "$ALIASES_FILE") + + # Check if the alias exists in the aliases file + if test -z "$line_with_alias"; then + echo "No alias with the name $1 found." + return 2 + fi + + echo "Deleted alias: $alias_to_delete" + # Delete the selected alias from the aliases file + sed -i "/^alias ${alias_to_delete%%=*}=/d" "$ALIASES_FILE" + unalias ${alias_to_delete%%=*} + } + + # Rename an existing alias by selecting it from a list + function _interactive_rename { + local alias_to_rename=$(cut -d' ' -f2- "$ALIASES_FILE" | fzf) + + # Check if the user cancelled the selection + test -z $alias_to_rename && return 1 + + echo "Input new name:" + read new_name + echo "Renaming alias from $alias_to_rename to $new_name" + sed -i "s/^alias ${alias_to_rename%%=*}=/alias ${new_name}=/g" "$ALIASES_FILE" + unalias ${alias_to_rename%%=*} + } + + # Rename an existing alias using specified old and new names + function _parameter_rename { + local old_alias_name=$1 + local new_alias_name=$2 + local line_with_alias=$(grep "^alias ${old_alias_name}=" "$ALIASES_FILE") + + if test -z "$line_with_alias"; then + echo "No alias with the name $old_alias_name found." + return 1 + fi + + echo "Renaming alias from $old_alias_name to $new_alias_name" + sed -i "s/^alias ${old_alias_name}=/alias ${new_alias_name}=/g" "$ALIASES_FILE" + unalias ${old_alias_name} + } + + # Change the command associated with an existing alias by selecting it from a list + function _interactive_command_change { + local alias_to_change=$(cut -d' ' -f2- "$ALIASES_FILE" | fzf) + + # Check if the user cancelled the selection + test -z $alias_to_change && return 1 + + echo "Input new command:" + read new_command + echo "Changing command for alias ${alias_to_change%%=*} to \"$new_command\"" + sed -i "/^alias ${alias_to_change%%=*}=/{s/=.*/=\"$new_command\"/}" "$ALIASES_FILE" + } + + # Change the command associated with an existing alias using specified name and command + function _parameter_command_change { + local alias_to_change=$1 + local new_command="${@:2}" + local line_with_alias=$(grep "$alias_to_change=" "$ALIASES_FILE") + + if test -z "$line_with_alias"; then + echo "No alias with the name $alias_to_change found." + return 1 + fi + + echo "Changing command for alias $alias_to_change to \"$new_command\"" + sed -i "/^alias ${alias_to_change}=/{s/=.*/=\"$new_command\"/}" "$ALIASES_FILE" + } + + # Add a new alias + function _add_command { + local line_with_alias=$(grep "$1=" "$ALIASES_FILE") + + if test ! -z "$line_with_alias"; then + echo "Alias found: $line_with_alias; change alias by using the -c flag." + return 1 + fi + + local lh="alias $1" + local rh=\"${@:2}\" + local alias_str="$lh=$rh" + + echo $alias_str >>"$ALIASES_FILE" + echo "added '$alias_str' to .aliases" + } + + # List all aliases from the aliases file + function _list_aliases { + cut -d' ' -f2- "$ALIASES_FILE" | command cat + } + + # ============================================================================================================================================================== + + action="$1" + param1="$2" + param2="$3" + + # Check if the user has provided a help option or no arguments + helpParams=('-h' '--help' '-help') + if (($helpParams[(Ie)$action])) || test $# -eq 0; then + # Display usage information + echo "Usage: mal [OPTION]... [ALIAS_NAME] [ALIAS_COMMAND]..." + echo "" + echo "Create, delete, change, or execute aliases interactively." + echo "" + echo "Options:" + echo " -h, --help display this help and exit" + echo " -l list all defined aliases" + echo " -e execute an alias interactively" + echo " -d delete an alias interactively" + echo " -dn NAME delete an alias by name" + echo " -r rename an alias interactively" + echo " -rn OLD NEW rename an existing alias" + echo " -c change the command associated with an existing alias interactively" + echo " -cc NAME COMMAND change the command associated with an existing alias by name" + return 0 + fi + + case "$action" in + "-e") + # Execute an alias interactively + _execute_alias + ;; + "-l") + # List all aliases + _list_aliases + ;; + "-d") + # Delete an alias interactively + _interactive_delete + ;; + "-dn") + # Delete an alias using a parameter + _parameter_delete "$param1" + ;; + "-r") + # rename an alias interactively + _interactive_rename + ;; + "-rn") + # rename an alias using parameters + _parameter_rename "$param1" "$param2" + ;; + "-c") + # change a command interactively + _interactive_command_change + ;; + "-cc") + # change a command using parameters + _parameter_command_change "$param1" "$param2" + ;; + *) + # add a new command + _add_command "$action" "$param1" + ;; + esac + + # Reload aliases + source "$ALIASES_FILE" +} From 60f40957485a7158629ca784e05b9297722a9fc6 Mon Sep 17 00:00:00 2001 From: eeleater Date: Thu, 5 Oct 2023 15:18:13 +0200 Subject: [PATCH 14/97] updated antidote --- .chezmoiexternal.toml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.chezmoiexternal.toml b/.chezmoiexternal.toml index 0686ab9..dd69ce0 100644 --- a/.chezmoiexternal.toml +++ b/.chezmoiexternal.toml @@ -1,3 +1,9 @@ [".local/share/zsh/config"] type = "git-repo" url = "git@git.eeleater.org:eeleater/dotfiles_private.git" +[".local/share/omp"] + type = "git-repo" + url = "https://github.com/JanDeDobbeleer/oh-my-posh.git" + stripComponents = 1 + exact = true + refreshPeriod = "168h" \ No newline at end of file From b48b9617332ea17230425046ffa5ce84e04b5eee Mon Sep 17 00:00:00 2001 From: eeleater Date: Fri, 6 Oct 2023 04:27:11 +0000 Subject: [PATCH 15/97] Update .chezmoiexternal.toml --- .chezmoiexternal.toml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.chezmoiexternal.toml b/.chezmoiexternal.toml index dd69ce0..a29f79c 100644 --- a/.chezmoiexternal.toml +++ b/.chezmoiexternal.toml @@ -1,9 +1,8 @@ [".local/share/zsh/config"] type = "git-repo" url = "git@git.eeleater.org:eeleater/dotfiles_private.git" + refreshPeriod = "24h" [".local/share/omp"] type = "git-repo" url = "https://github.com/JanDeDobbeleer/oh-my-posh.git" - stripComponents = 1 - exact = true - refreshPeriod = "168h" \ No newline at end of file + refreshPeriod = "24h" From d0a543e8102d3bdfe4874927e3d77c8677ef106b Mon Sep 17 00:00:00 2001 From: eeleater Date: Mon, 23 Oct 2023 23:20:41 +0200 Subject: [PATCH 16/97] changed topgrade.toml --- dot_config/topgrade.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dot_config/topgrade.toml b/dot_config/topgrade.toml index ca03fc1..1116178 100644 --- a/dot_config/topgrade.toml +++ b/dot_config/topgrade.toml @@ -21,7 +21,7 @@ skip_notify = true #run_in_tmux = true # List of remote machines with Topgrade installed on them -remote_topgrades = ["chat", "db", "git", "java", "kali", "mail", "misc", "mon"] +remote_topgrades = ["chat", "db", "git", "java", "kali", "mail", "misc"] # Arguments to pass SSH when upgrading remote systems #ssh_arguments = "-o ConnectTimeout=2" From cee9b26d04c7edfa28d3ad916ff907a2fa45cfb4 Mon Sep 17 00:00:00 2001 From: eeleater Date: Tue, 24 Oct 2023 10:15:26 +0200 Subject: [PATCH 17/97] fixed topgrade.toml --- dot_config/topgrade.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dot_config/topgrade.toml b/dot_config/topgrade.toml index 1116178..e3332a5 100644 --- a/dot_config/topgrade.toml +++ b/dot_config/topgrade.toml @@ -3,7 +3,7 @@ #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"] +disable = ["firmware", "tldr", "pip3", "node", "vim", "git_repos", "containers", "asdf", "distrobox", "helix", "composer", "yarn", "cargo", "remotes", "flatpak", "shell", "rustup", "vscode", "powershell"] # Skip Notify skip_notify = true From 576ffc0f9d4b63a3f9cfece2aa330c1278f8e34a Mon Sep 17 00:00:00 2001 From: eeleater Date: Tue, 24 Oct 2023 08:19:29 +0000 Subject: [PATCH 18/97] Update topgrade.toml --- dot_config/topgrade.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dot_config/topgrade.toml b/dot_config/topgrade.toml index e3332a5..5a3b524 100644 --- a/dot_config/topgrade.toml +++ b/dot_config/topgrade.toml @@ -3,7 +3,7 @@ #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", "vscode", "powershell"] +disable = ["firmware", "tldr", "pip3", "node", "vim", "git_repos", "containers", "asdf", "distrobox", "helix", "composer", "yarn", "cargo", "remotes", "flatpak", "shell", "rustup", "dotnet", "vscode", "powershell"] # Skip Notify skip_notify = true From 30606208d4391fcac599923a5d59bc46449cad57 Mon Sep 17 00:00:00 2001 From: eeleater Date: Tue, 24 Oct 2023 08:20:02 +0000 Subject: [PATCH 19/97] Update topgrade.toml --- dot_config/topgrade.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dot_config/topgrade.toml b/dot_config/topgrade.toml index 5a3b524..74bb4b6 100644 --- a/dot_config/topgrade.toml +++ b/dot_config/topgrade.toml @@ -3,7 +3,7 @@ #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", "dotnet", "vscode", "powershell"] +disable = ["firmware", "tldr", "pip3", "node", "vim", "git_repos", "containers", "asdf", "distrobox", "helix", "composer", "yarn", "cargo", "remotes", "flatpak", "shell", "rustup", "dotnet", "vscode", "powershell", "snap"] # Skip Notify skip_notify = true From 8fd767105fc5b8a10223da0884ce9e41821734aa Mon Sep 17 00:00:00 2001 From: eeleater Date: Mon, 6 Nov 2023 12:12:20 +0100 Subject: [PATCH 20/97] changed some stuff --- dot_config/zsh/dot_zshenv | 2 ++ dot_config/zsh/dot_zshrc | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dot_config/zsh/dot_zshenv b/dot_config/zsh/dot_zshenv index 80a93d8..0d6d61c 100644 --- a/dot_config/zsh/dot_zshenv +++ b/dot_config/zsh/dot_zshenv @@ -63,3 +63,5 @@ 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" + +setopt no_global_rcs diff --git a/dot_config/zsh/dot_zshrc b/dot_config/zsh/dot_zshrc index 823154c..a12cf10 100644 --- a/dot_config/zsh/dot_zshrc +++ b/dot_config/zsh/dot_zshrc @@ -32,6 +32,6 @@ source "$ZDOTDIR"/files/distroicon.zsh source "$ZDOTDIR"/files/bashcomps.zsh # theme -potentialTheme=('atomic.omp.json' 'emodipt-extend.omp.json' 'kali.omp.json' 'lambda.omp.json' 'nordtron.omp.json' 'pure.omp.json' 'uew.omp.json') +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)" \ No newline at end of file +eval "$(oh-my-posh init zsh)" From 16e4580f1cf4488dab9ec156798047784341ab0d Mon Sep 17 00:00:00 2001 From: eeleater Date: Mon, 6 Nov 2023 12:16:28 +0100 Subject: [PATCH 21/97] changed some stuff --- dot_config/zsh/dot_zshrc | 6 +++--- dot_config/zsh/files/sshcomp.zsh | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dot_config/zsh/dot_zshrc b/dot_config/zsh/dot_zshrc index a12cf10..15f3189 100644 --- a/dot_config/zsh/dot_zshrc +++ b/dot_config/zsh/dot_zshrc @@ -12,9 +12,8 @@ stty -ixon # local env exports source "$XDG_DATA_HOME"/zsh/config/env.zsh -# completion stuff +# initialize completion system source "$ZDOTDIR"/files/compinit.zsh -source "$ZDOTDIR"/files/sshcomp.zsh # antidote test -r "$XDG_DATA_HOME"/antidote/antidote.zsh || git clone https://github.com/mattmc3/antidote.git "$XDG_DATA_HOME"/antidote @@ -28,8 +27,9 @@ source "$ZDOTDIR"/files/aliases.zsh source "$ZDOTDIR"/files/functions.zsh source "$ZDOTDIR"/files/distroicon.zsh -# bash completions +# completion stuff source "$ZDOTDIR"/files/bashcomps.zsh +source "$ZDOTDIR"/files/sshcomp.zsh # theme potentialTheme=('atomic.omp.json' 'emodipt-extend.omp.json' 'kali.omp.json' 'lambda.omp.json' 'nordtron.omp.json') diff --git a/dot_config/zsh/files/sshcomp.zsh b/dot_config/zsh/files/sshcomp.zsh index 33fc146..122f7ba 100644 --- a/dot_config/zsh/files/sshcomp.zsh +++ b/dot_config/zsh/files/sshcomp.zsh @@ -17,8 +17,8 @@ zstyle ':completion:*:(ssh|scp|sshfs|mosh|rsync):*:hosts-ipaddr' ignored-pattern [ -r /etc/hosts ] && : ${(A)_etc_hosts:=${(s: :)${(ps:\t:)${${(f)~~"$( Date: Thu, 9 Nov 2023 09:18:57 +0100 Subject: [PATCH 22/97] changed some stuff --- dot_config/zsh/dot_zshrc | 3 +-- dot_config/zsh/files/sshcomp.zsh | 4 ++++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dot_config/zsh/dot_zshrc b/dot_config/zsh/dot_zshrc index 15f3189..4bdc136 100644 --- a/dot_config/zsh/dot_zshrc +++ b/dot_config/zsh/dot_zshrc @@ -5,8 +5,7 @@ test "x$TERMINALNAME" = "xalacritty" && eval "$(zellij setup --generate-auto-sta 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" } - +# disable flowcontrol stty -ixon # local env exports diff --git a/dot_config/zsh/files/sshcomp.zsh b/dot_config/zsh/files/sshcomp.zsh index 122f7ba..e392282 100644 --- a/dot_config/zsh/files/sshcomp.zsh +++ b/dot_config/zsh/files/sshcomp.zsh @@ -15,10 +15,14 @@ zstyle ':completion:*:(ssh|scp|sshfs|mosh|rsync):*:hosts-ipaddr' ignored-pattern [ -r /etc/ssh/ssh_known_hosts ] && _global_ssh_hosts=(${${${${(f)"$( Date: Sun, 19 Nov 2023 23:24:23 +0100 Subject: [PATCH 23/97] changed some stuff --- dot_config/zsh/dot_zsh_plugins.txt | 2 +- dot_config/zsh/dot_zshenv | 2 +- dot_config/zsh/files/aliases.zsh | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dot_config/zsh/dot_zsh_plugins.txt b/dot_config/zsh/dot_zsh_plugins.txt index a707551..3744b84 100644 --- a/dot_config/zsh/dot_zsh_plugins.txt +++ b/dot_config/zsh/dot_zsh_plugins.txt @@ -10,7 +10,7 @@ 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/fzf ohmyzsh/ohmyzsh path:plugins/command-not-found ohmyzsh/ohmyzsh path:plugins/transfer diff --git a/dot_config/zsh/dot_zshenv b/dot_config/zsh/dot_zshenv index 0d6d61c..a42d2a6 100644 --- a/dot_config/zsh/dot_zshenv +++ b/dot_config/zsh/dot_zshenv @@ -64,4 +64,4 @@ 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" -setopt no_global_rcs +unsetopt global_rcs diff --git a/dot_config/zsh/files/aliases.zsh b/dot_config/zsh/files/aliases.zsh index d691777..12b0ab3 100644 --- a/dot_config/zsh/files/aliases.zsh +++ b/dot_config/zsh/files/aliases.zsh @@ -1,3 +1,6 @@ +# temporary overwrite ls +alias ls='eza -Fgh --group-directories-first --git --git-ignore --icons --color-scale all --hyperlink' + alias grep='rg' alias find='fd' From 4cc57f4ad264be114aebe39d68159e8f8821ad01 Mon Sep 17 00:00:00 2001 From: eeleater Date: Mon, 20 Nov 2023 09:59:50 +0100 Subject: [PATCH 24/97] eza plugin got updated, remove workaround --- dot_config/zsh/files/aliases.zsh | 3 --- 1 file changed, 3 deletions(-) diff --git a/dot_config/zsh/files/aliases.zsh b/dot_config/zsh/files/aliases.zsh index 12b0ab3..d691777 100644 --- a/dot_config/zsh/files/aliases.zsh +++ b/dot_config/zsh/files/aliases.zsh @@ -1,6 +1,3 @@ -# temporary overwrite ls -alias ls='eza -Fgh --group-directories-first --git --git-ignore --icons --color-scale all --hyperlink' - alias grep='rg' alias find='fd' From c7ec08f21eb966254f471b6ef0b9d8f5d6d6756a Mon Sep 17 00:00:00 2001 From: eeleater Date: Mon, 20 Nov 2023 11:27:16 +0100 Subject: [PATCH 25/97] fixed diffprog error --- dot_config/zsh/dot_zshenv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dot_config/zsh/dot_zshenv b/dot_config/zsh/dot_zshenv index a42d2a6..0ab98ed 100644 --- a/dot_config/zsh/dot_zshenv +++ b/dot_config/zsh/dot_zshenv @@ -61,7 +61,7 @@ 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 From e55117b3833409705e13d641fe6057b0fe9e50c7 Mon Sep 17 00:00:00 2001 From: eeleater Date: Wed, 29 Nov 2023 21:03:49 +0100 Subject: [PATCH 26/97] removed some vms from vm host --- dot_config/topgrade.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dot_config/topgrade.toml b/dot_config/topgrade.toml index 74bb4b6..d1fcc5b 100644 --- a/dot_config/topgrade.toml +++ b/dot_config/topgrade.toml @@ -21,7 +21,7 @@ skip_notify = true #run_in_tmux = true # List of remote machines with Topgrade installed on them -remote_topgrades = ["chat", "db", "git", "java", "kali", "mail", "misc"] +remote_topgrades = ["docker", "git", "kali", "mail", "misc"] # Arguments to pass SSH when upgrading remote systems #ssh_arguments = "-o ConnectTimeout=2" From 62f50b0e92074a16739724572a2a471412fe0b48 Mon Sep 17 00:00:00 2001 From: eeleater Date: Thu, 30 Nov 2023 08:51:35 +0100 Subject: [PATCH 27/97] removed some vms from vm host --- dot_config/topgrade.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dot_config/topgrade.toml b/dot_config/topgrade.toml index d1fcc5b..26f46bd 100644 --- a/dot_config/topgrade.toml +++ b/dot_config/topgrade.toml @@ -21,7 +21,7 @@ skip_notify = true #run_in_tmux = true # List of remote machines with Topgrade installed on them -remote_topgrades = ["docker", "git", "kali", "mail", "misc"] +remote_topgrades = ["docker", "kali", "mail", "misc"] # Arguments to pass SSH when upgrading remote systems #ssh_arguments = "-o ConnectTimeout=2" From 4e443320456928dbcd77d35db9eede9b1fb4f9ad Mon Sep 17 00:00:00 2001 From: eeleater Date: Mon, 4 Dec 2023 08:47:10 +0100 Subject: [PATCH 28/97] removed some vms from vm host --- dot_config/topgrade.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dot_config/topgrade.toml b/dot_config/topgrade.toml index 26f46bd..6dd93ee 100644 --- a/dot_config/topgrade.toml +++ b/dot_config/topgrade.toml @@ -21,7 +21,7 @@ skip_notify = true #run_in_tmux = true # List of remote machines with Topgrade installed on them -remote_topgrades = ["docker", "kali", "mail", "misc"] +remote_topgrades = ["docker", "kali", "mail"] # Arguments to pass SSH when upgrading remote systems #ssh_arguments = "-o ConnectTimeout=2" From 1f9d47b42cee6ce5099b1159b7256f7f7dde64f1 Mon Sep 17 00:00:00 2001 From: Nikolas Weger Date: Tue, 19 Dec 2023 13:31:14 +0100 Subject: [PATCH 29/97] newest version of dotfiles --- .chezmoiexternal.toml | 8 ----- dot_config/kitty/current-theme.conf | 35 +++++++++++++++++++++ dot_config/kitty/kitty.conf | 4 +-- dot_config/sheldon/plugins.toml | 31 +++--------------- dot_config/zsh/dot_zsh_plugins.txt | 1 - dot_config/zsh/dot_zshenv | 16 ++++------ dot_config/zsh/dot_zshrc | 19 ++++++----- dot_config/zsh/files/options.zsh | 5 +++ dot_config/zsh/files/sshcomp.zsh | 12 +++---- dot_local/bin/executable_installOhMyPosh.sh | 9 ++++++ dot_local/bin/executable_updateOhMyPosh.sh | 9 ++++++ 11 files changed, 87 insertions(+), 62 deletions(-) delete mode 100644 .chezmoiexternal.toml create mode 100644 dot_config/kitty/current-theme.conf create mode 100644 dot_config/zsh/files/options.zsh create mode 100755 dot_local/bin/executable_installOhMyPosh.sh create mode 100755 dot_local/bin/executable_updateOhMyPosh.sh diff --git a/.chezmoiexternal.toml b/.chezmoiexternal.toml deleted file mode 100644 index a29f79c..0000000 --- a/.chezmoiexternal.toml +++ /dev/null @@ -1,8 +0,0 @@ -[".local/share/zsh/config"] - type = "git-repo" - url = "git@git.eeleater.org:eeleater/dotfiles_private.git" - refreshPeriod = "24h" -[".local/share/omp"] - type = "git-repo" - url = "https://github.com/JanDeDobbeleer/oh-my-posh.git" - refreshPeriod = "24h" diff --git a/dot_config/kitty/current-theme.conf b/dot_config/kitty/current-theme.conf new file mode 100644 index 0000000..627ba40 --- /dev/null +++ b/dot_config/kitty/current-theme.conf @@ -0,0 +1,35 @@ +# vim:ft=kitty +## name: Dracula +## author: Keegan Carruthers-Smith +## license: MIT +## upstream: https://raw.githubusercontent.com/dracula/kitty/master/dracula.conf + +foreground #f8f8f2 +background #282a36 +selection_foreground #ffffff +selection_background #44475a +url_color #8be9fd +color0 #21222c +color8 #6272a4 +color1 #ff5555 +color9 #ff6e6e +color2 #50fa7b +color10 #69ff94 +color3 #f1fa8c +color11 #ffffa5 +color4 #bd93f9 +color12 #d6acff +color5 #ff79c6 +color13 #ff92df +color6 #8be9fd +color14 #a4ffff +color7 #f8f8f2 +color15 #ffffff +cursor #f8f8f2 +cursor_text_color background +active_tab_foreground #282a36 +active_tab_background #f8f8f2 +inactive_tab_foreground #282a36 +inactive_tab_background #6272a4 +mark1_foreground #282a36 +mark1_background #ff5555 diff --git a/dot_config/kitty/kitty.conf b/dot_config/kitty/kitty.conf index 62b78fe..d4c30d8 100644 --- a/dot_config/kitty/kitty.conf +++ b/dot_config/kitty/kitty.conf @@ -4,12 +4,12 @@ copy_on_select no strip_trailing_spaces smart window_padding_width 5 enable_audio_bell no -shell_integration enabled +shell_integration disabled # Fonts font_family FiraCode Nerd Font # BEGIN_KITTY_THEME -# Rosé Pine Moon +# Dracula include current-theme.conf # END_KITTY_THEME diff --git a/dot_config/sheldon/plugins.toml b/dot_config/sheldon/plugins.toml index e2a3ba3..3e175c7 100644 --- a/dot_config/sheldon/plugins.toml +++ b/dot_config/sheldon/plugins.toml @@ -1,17 +1,10 @@ shell = "zsh" # own files -[plugins.disableflow] -inline = 'stty -ixon' - [plugins.localenv] local = "~/.local/share/zsh/config" use = ["env.zsh"] -[plugins.p10kconfig] -local = "~/.config/zsh/" -use = [".p10k.zsh"] - [plugins.compinit] local = "~/.config/zsh/files/" use = ["compinit.zsh"] @@ -56,10 +49,7 @@ github = "amyreese/zsh-titles" [plugins.thefuck] github = "laggardkernel/zsh-thefuck" -[plugins.oath] -github = "alexdesousa/oath" - -[plugins.exa] +[plugins.eza] github = "twopizza9621536/zsh-eza" [plugins.bat] @@ -71,9 +61,6 @@ github = "MichaelAquilina/zsh-you-should-use" [plugins.autosuggestions] github = "zsh-users/zsh-autosuggestions" -#[plugins.autocomplete] -#github = "marlonrichert/zsh-autocomplete" - [plugins.syntaxhighlighting] github = "zsh-users/zsh-syntax-highlighting" @@ -84,23 +71,15 @@ github = "asdf-vm/asdf" github = "olets/zsh-abbr" use = ["zsh-abbr.zsh"] -[plugins.sshcomp] +[plugins.bashcomps] local = "~/.config/zsh/files/" -use = ["sshcomp.zsh"] +use = ["bashcomps.zsh"] -# themes -#[plugins.powerlevel10k] -#github = "romkatv/powerlevel10k" - -# evals [plugins.evalstuff] local = "~/.config/zsh/files/" use = ["evalstuff.zsh"] -[plugins.ownfiles] +[plugins.ownconfigs] local = "~/.config/zsh/files/" -use = ["{aliases,functions,distroicon}.zsh"] +use = ["{options,sshcomp,aliases,functions,distroicon}.zsh"] -[plugins.bashcomps] -local = "~/.config/zsh/files/" -use = ["bashcomps.zsh"] diff --git a/dot_config/zsh/dot_zsh_plugins.txt b/dot_config/zsh/dot_zsh_plugins.txt index 3744b84..6b96e3c 100644 --- a/dot_config/zsh/dot_zsh_plugins.txt +++ b/dot_config/zsh/dot_zsh_plugins.txt @@ -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 diff --git a/dot_config/zsh/dot_zshenv b/dot_config/zsh/dot_zshenv index 0ab98ed..9251fa2 100644 --- a/dot_config/zsh/dot_zshenv +++ b/dot_config/zsh/dot_zshenv @@ -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 diff --git a/dot_config/zsh/dot_zshrc b/dot_config/zsh/dot_zshrc index 4bdc136..bc25929 100644 --- a/dot_config/zsh/dot_zshrc +++ b/dot_config/zsh/dot_zshrc @@ -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]")" diff --git a/dot_config/zsh/files/options.zsh b/dot_config/zsh/files/options.zsh new file mode 100644 index 0000000..a8477c6 --- /dev/null +++ b/dot_config/zsh/files/options.zsh @@ -0,0 +1,5 @@ +setopt NO_CLOBBER +setopt INTERACTIVE_COMMENTS +setopt HASH_EXECUTABLES_ONLY +setopt NUMERIC_GLOB_SORT +unsetopt FLOW_CONTROL diff --git a/dot_config/zsh/files/sshcomp.zsh b/dot_config/zsh/files/sshcomp.zsh index e392282..799786b 100644 --- a/dot_config/zsh/files/sshcomp.zsh +++ b/dot_config/zsh/files/sshcomp.zsh @@ -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)"$( Date: Thu, 25 Jan 2024 09:51:34 +0100 Subject: [PATCH 30/97] updated antidote config to newest --- dot_config/sheldon/plugins.toml | 16 ++++++---------- dot_config/topgrade.toml | 2 +- dot_config/zsh/dot_zsh_plugins.txt | 1 - dot_config/zsh/dot_zshrc | 2 +- dot_local/bin/executable_installOhMyPosh | 5 +++++ dot_local/bin/executable_installOhMyPosh.sh | 9 --------- ...dateOhMyPosh.sh => executable_updateOhMyPosh} | 0 7 files changed, 13 insertions(+), 22 deletions(-) create mode 100755 dot_local/bin/executable_installOhMyPosh delete mode 100755 dot_local/bin/executable_installOhMyPosh.sh rename dot_local/bin/{executable_updateOhMyPosh.sh => executable_updateOhMyPosh} (100%) diff --git a/dot_config/sheldon/plugins.toml b/dot_config/sheldon/plugins.toml index 3e175c7..79a578d 100644 --- a/dot_config/sheldon/plugins.toml +++ b/dot_config/sheldon/plugins.toml @@ -1,10 +1,6 @@ shell = "zsh" # own files -[plugins.localenv] -local = "~/.local/share/zsh/config" -use = ["env.zsh"] - [plugins.compinit] local = "~/.config/zsh/files/" use = ["compinit.zsh"] @@ -58,12 +54,6 @@ github = "fdellwing/zsh-bat" [plugins.youshoulduse] github = "MichaelAquilina/zsh-you-should-use" -[plugins.autosuggestions] -github = "zsh-users/zsh-autosuggestions" - -[plugins.syntaxhighlighting] -github = "zsh-users/zsh-syntax-highlighting" - [plugins.asdf] github = "asdf-vm/asdf" @@ -71,6 +61,12 @@ github = "asdf-vm/asdf" github = "olets/zsh-abbr" use = ["zsh-abbr.zsh"] +[plugins.autosuggestions] +github = "zsh-users/zsh-autosuggestions" + +[plugins.syntaxhighlighting] +github = "zsh-users/zsh-syntax-highlighting" + [plugins.bashcomps] local = "~/.config/zsh/files/" use = ["bashcomps.zsh"] diff --git a/dot_config/topgrade.toml b/dot_config/topgrade.toml index 6dd93ee..4922282 100644 --- a/dot_config/topgrade.toml +++ b/dot_config/topgrade.toml @@ -3,7 +3,7 @@ #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", "dotnet", "vscode", "powershell", "snap"] +disable = ["tldr", "pip3", "node", "vim", "git_repos", "containers", "asdf", "distrobox", "helix", "composer", "yarn", "cargo", "remotes", "rustup", "vscode", "powershell", "dotnet", "flatpak", "shell", "snap", "firmware"] # Skip Notify skip_notify = true diff --git a/dot_config/zsh/dot_zsh_plugins.txt b/dot_config/zsh/dot_zsh_plugins.txt index 6b96e3c..4388382 100644 --- a/dot_config/zsh/dot_zsh_plugins.txt +++ b/dot_config/zsh/dot_zsh_plugins.txt @@ -19,7 +19,6 @@ Aloxaf/fzf-tab urbainvaes/fzf-marks mroth/evalcache zpm-zsh/colorize -zpm-zsh/ssh sobolevn/wakatime-zsh-plugin amyreese/zsh-titles laggardkernel/zsh-thefuck diff --git a/dot_config/zsh/dot_zshrc b/dot_config/zsh/dot_zshrc index bc25929..495fc5c 100644 --- a/dot_config/zsh/dot_zshrc +++ b/dot_config/zsh/dot_zshrc @@ -7,7 +7,7 @@ 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') +potentialBanner=('joke bofh' 'joke dad' 'joke hq dijkstra' 'joke hq knuth' 'joke hq perlis' 'joke hq misc' 'colorscript random' 'fastfetch') eval "$potentialBanner[$RANDOM%$#potentialBanner+1]" # disable flowcontrol diff --git a/dot_local/bin/executable_installOhMyPosh b/dot_local/bin/executable_installOhMyPosh new file mode 100755 index 0000000..cb76c09 --- /dev/null +++ b/dot_local/bin/executable_installOhMyPosh @@ -0,0 +1,5 @@ +#!/bin/bash +tmpFile="$(mktemp -u)" + +curl -so "$tmpFile" https://ohmyposh.dev/install.sh +bash "$tmpFile" -d "$HOME"/.local/bin diff --git a/dot_local/bin/executable_installOhMyPosh.sh b/dot_local/bin/executable_installOhMyPosh.sh deleted file mode 100755 index 42548c8..0000000 --- a/dot_local/bin/executable_installOhMyPosh.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash -newestVersion="$(curl -sL https://api.github.com/repos/JanDeDobbeleer/oh-my-posh/releases/latest | jq -r '.name' | cut -dv -f2)" -localVersion="$(oh-my-posh --version)" -tmpFile="$(mktemp -u)" - -test "$newestVersion" != "$localVersion" && { - curl -so "$tmpFile" https://ohmyposh.dev/install.sh - bash "$tmpFile" -d "$HOME"/.local/bin -} diff --git a/dot_local/bin/executable_updateOhMyPosh.sh b/dot_local/bin/executable_updateOhMyPosh similarity index 100% rename from dot_local/bin/executable_updateOhMyPosh.sh rename to dot_local/bin/executable_updateOhMyPosh From 5e8eee53e8306a89753f4788f9f40c917cde989a Mon Sep 17 00:00:00 2001 From: eeleater Date: Mon, 5 Feb 2024 16:05:17 +0000 Subject: [PATCH 31/97] Update aliases.zsh --- dot_config/zsh/files/aliases.zsh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dot_config/zsh/files/aliases.zsh b/dot_config/zsh/files/aliases.zsh index d691777..c5bcaf0 100644 --- a/dot_config/zsh/files/aliases.zsh +++ b/dot_config/zsh/files/aliases.zsh @@ -1,3 +1,6 @@ +# temp fix for eza +alias ls='eza -F -gh --group-directories-first --git --git-ignore --icons --color-scale all --hyperlink' + alias grep='rg' alias find='fd' From 1a33b9127cd6f0e21ce4d7ba5705db5a093ac105 Mon Sep 17 00:00:00 2001 From: eeleater Date: Sun, 25 Feb 2024 21:29:36 +0100 Subject: [PATCH 32/97] removed colorscript where its not installed anyway --- dot_config/zsh/dot_zshrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dot_config/zsh/dot_zshrc b/dot_config/zsh/dot_zshrc index 495fc5c..34f712d 100644 --- a/dot_config/zsh/dot_zshrc +++ b/dot_config/zsh/dot_zshrc @@ -7,7 +7,7 @@ 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 misc' 'colorscript random' 'fastfetch') +potentialBanner=('joke bofh' 'joke dad' 'joke hq dijkstra' 'joke hq knuth' 'joke hq perlis' 'joke hq misc' 'fastfetch') eval "$potentialBanner[$RANDOM%$#potentialBanner+1]" # disable flowcontrol From 376f09760ec83d4ff2c9fb71d25a14ffa1f42f3e Mon Sep 17 00:00:00 2001 From: eeleater Date: Sun, 25 Feb 2024 21:31:52 +0100 Subject: [PATCH 33/97] removed difftool meld when no gui is available anyway --- dot_config/zsh/dot_zshenv | 1 - 1 file changed, 1 deletion(-) diff --git a/dot_config/zsh/dot_zshenv b/dot_config/zsh/dot_zshenv index 9251fa2..33d61c2 100644 --- a/dot_config/zsh/dot_zshenv +++ b/dot_config/zsh/dot_zshenv @@ -59,5 +59,4 @@ 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" From 62ea83b28b1dbb8f46937d73023173bcf2c346b9 Mon Sep 17 00:00:00 2001 From: eeleater Date: Sun, 11 Aug 2024 23:15:51 +0200 Subject: [PATCH 34/97] updated antidote --- dot_config/alacritty/alacritty.toml | 48 ++++++ dot_config/alacritty/alacritty.yml | 162 ------------------ dot_config/alacritty/dracula.toml | 76 ++++++++ dot_config/sheldon/plugins.toml | 13 +- .../{topgrade.toml => topgrade.toml.tmpl} | 6 +- dot_config/zsh/dot_zsh_plugins.txt | 3 +- dot_config/zsh/dot_zshenv | 7 +- dot_config/zsh/dot_zshrc | 9 +- dot_local/share/bofh | 30 ++-- 9 files changed, 154 insertions(+), 200 deletions(-) create mode 100644 dot_config/alacritty/alacritty.toml delete mode 100755 dot_config/alacritty/alacritty.yml create mode 100644 dot_config/alacritty/dracula.toml rename dot_config/{topgrade.toml => topgrade.toml.tmpl} (94%) diff --git a/dot_config/alacritty/alacritty.toml b/dot_config/alacritty/alacritty.toml new file mode 100644 index 0000000..0761e47 --- /dev/null +++ b/dot_config/alacritty/alacritty.toml @@ -0,0 +1,48 @@ +import = ["./dracula.toml"] + +[env] +TERM = "xterm-256color" + +[font] +size = 10 + +[font.bold] +family = "FiraCode Nerd Font" +style = "Bold" + +[font.bold_italic] +family = "FiraCode Nerd Font" +style = "Bold Italic" + +[font.italic] +family = "FiraCode Nerd Font" +style = "Italic" + +[font.normal] +family = "FiraCode Nerd Font" +style = "Regular" + +[[keyboard.bindings]] +action = "Paste" +key = "V" +mods = "Control|Shift" + +[[keyboard.bindings]] +action = "Copy" +key = "C" +mods = "Control|Shift" + +[scrolling] +history = 99999 + +[shell] +args = ["--login"] +program = "/usr/bin/zsh" + +[window] +opacity = 0.95 +title = "Alacritty" + +[window.class] +general = "Alacritty" +instance = "Alacritty" diff --git a/dot_config/alacritty/alacritty.yml b/dot_config/alacritty/alacritty.yml deleted file mode 100755 index 5947a3a..0000000 --- a/dot_config/alacritty/alacritty.yml +++ /dev/null @@ -1,162 +0,0 @@ -env: - TERM: xterm-256color - -window: - padding: - x: 4 - y: 4 - - title: Alacritty - - class: - instance: Alacritty - general: Alacritty - - opacity: 0.95 - -scrolling: - history: 20000 - -font: - normal: - family: FiraCode Nerd Font - style: Regular - - bold: - family: FiraCode Nerd Font - style: Bold - - italic: - family: FiraCode Nerd Font - style: Italic - - bold_italic: - family: FiraCode Nerd Font - style: Bold Italic - - size: 7.5 - -schemes: - onedark: &onedark - primary: - background: '#282c34' - foreground: '#abb2bf' - - normal: - black: '#131613' - red: '#e06c75' - green: '#98c379' - yellow: '#d19a66' - blue: '#61afef' - magenta: '#c678dd' - cyan: '#56b6c2' - white: '#abb2bf' - - bright: - black: '#5c6370' - red: '#e06c75' - green: '#98c379' - yellow: '#d19a66' - blue: '#61afef' - magenta: '#c678dd' - cyan: '#56b6c2' - white: '#ffffff' - - ayudark: &ayudark - primary: - background: '#0A0E14' - foreground: '#B3B1AD' - - normal: - black: '#01060E' - red: '#EA6C73' - green: '#91B362' - yellow: '#F9AF4F' - blue: '#53BDFA' - magenta: '#FAE994' - cyan: '#90E1C6' - white: '#C7C7C7' - - bright: - black: '#686868' - red: '#F07178' - green: '#C2D94C' - yellow: '#FFB454' - blue: '#59C2FF' - magenta: '#FFEE99' - cyan: '#95E6CB' - white: '#FFFFFF' - - nord: &nord - primary: - background: '#2e3440' - foreground: '#d8dee9' - dim_foreground: '#a5abb6' - - cursor: - text: '#2e3440' - cursor: '#d8dee9' - - vi_mode_cursor: - text: '#2e3440' - cursor: '#d8dee9' - - selection: - text: CellForeground - background: '#4c566a' - - search: - matches: - foreground: CellBackground - background: '#88c0d0' - - footer_bar: - background: '#434c5e' - foreground: '#d8dee9' - - normal: - black: '#3b4252' - red: '#bf616a' - green: '#a3be8c' - yellow: '#ebcb8b' - blue: '#81a1c1' - magenta: '#b48ead' - cyan: '#88c0d0' - white: '#e5e9f0' - - bright: - black: '#4c566a' - red: '#bf616a' - green: '#a3be8c' - yellow: '#ebcb8b' - blue: '#81a1c1' - magenta: '#b48ead' - cyan: '#8fbcbb' - white: '#eceff4' - - dim: - black: '#373e4d' - red: '#94545d' - green: '#809575' - yellow: '#b29e75' - blue: '#68809a' - magenta: '#8c738c' - cyan: '#6d96a5' - white: '#aeb3bb' - -colors: *nord - -shell: - program: /usr/bin/zsh - args: - - --login - -key_bindings: - - { key: V, mods: Control|Shift, action: Paste } - - { key: C, mods: Control|Shift, action: Copy } - - { key: L, mods: Control, action: ClearLogNotice } - - { key: L, mods: Control, chars: "\x0c" } - - { key: PageUp, mods: Shift, action: ScrollPageUp, mode: ~Alt } - - { key: PageDown, mods: Shift, action: ScrollPageDown, mode: ~Alt } - - { key: Home, mods: Shift, action: ScrollToTop, mode: ~Alt } - - { key: End, mods: Shift, action: ScrollToBottom, mode: ~Alt } diff --git a/dot_config/alacritty/dracula.toml b/dot_config/alacritty/dracula.toml new file mode 100644 index 0000000..0a56c29 --- /dev/null +++ b/dot_config/alacritty/dracula.toml @@ -0,0 +1,76 @@ +# Dracula theme for Alacritty +# https://draculatheme.com/alacritty +# +# Color palette +# https://spec.draculatheme.com +# +# Instructions +# https://github.com/alacritty/alacritty/blob/master/extra/man/alacritty.5.scd + +[colors.primary] + +background = "#282a36" +foreground = "#f8f8f2" +bright_foreground = "#ffffff" + +[colors.cursor] + +text = "#282a36" +cursor = "#f8f8f2" + +[colors.vi_mode_cursor] + +text = "CellBackground" +cursor = "CellForeground" + +[colors.selection] + +text = "CellForeground" +background = "#44475a" + +[colors.normal] + +black = "#21222c" +red = "#ff5555" +green = "#50fa7b" +yellow = "#f1fa8c" +blue = "#bd93f9" +magenta = "#ff79c6" +cyan = "#8be9fd" +white = "#f8f8f2" + +[colors.bright] + +black = "#6272a4" +red = "#ff6e6e" +green = "#69ff94" +yellow = "#ffffa5" +blue = "#d6acff" +magenta = "#ff92df" +cyan = "#a4ffff" +white = "#ffffff" + +[colors.search.matches] + +foreground = "#44475a" +background = "#50fa7b" + +[colors.search.focused_match] + +foreground = "#44475a" +background = "#ffb86c" + +[colors.footer_bar] + +background = "#282a36" +foreground = "#f8f8f2" + +[colors.hints.start] + +foreground = "#282a36" +background = "#f1fa8c" + +[colors.hints.end] + +foreground = "#f1fa8c" +background = "#282a36" diff --git a/dot_config/sheldon/plugins.toml b/dot_config/sheldon/plugins.toml index 79a578d..72c9e62 100644 --- a/dot_config/sheldon/plugins.toml +++ b/dot_config/sheldon/plugins.toml @@ -22,7 +22,7 @@ use = ["{completion,key-bindings,history,directories}.zsh"] [plugins.omzplugins] github = "ohmyzsh/ohmyzsh" dir = "plugins" -use = ["{systemd,fzf,command-not-found,transfer}/*.plugin.zsh"] +use = ["{systemd,command-not-found,ssh-agent}/*.plugin.zsh"] [plugins.fzftab] github = "Aloxaf/fzf-tab" @@ -67,15 +67,6 @@ github = "zsh-users/zsh-autosuggestions" [plugins.syntaxhighlighting] github = "zsh-users/zsh-syntax-highlighting" -[plugins.bashcomps] -local = "~/.config/zsh/files/" -use = ["bashcomps.zsh"] - -[plugins.evalstuff] -local = "~/.config/zsh/files/" -use = ["evalstuff.zsh"] - [plugins.ownconfigs] local = "~/.config/zsh/files/" -use = ["{options,sshcomp,aliases,functions,distroicon}.zsh"] - +use = ["{bashcomps,evalstuff,options,sshcomp,aliases,functions,distroicon}.zsh"] diff --git a/dot_config/topgrade.toml b/dot_config/topgrade.toml.tmpl similarity index 94% rename from dot_config/topgrade.toml rename to dot_config/topgrade.toml.tmpl index 4922282..0458c67 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", "dotnet", "flatpak", "shell", "snap", "firmware"] +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_zsh_plugins.txt b/dot_config/zsh/dot_zsh_plugins.txt index 4388382..08c0d61 100644 --- a/dot_config/zsh/dot_zsh_plugins.txt +++ b/dot_config/zsh/dot_zsh_plugins.txt @@ -10,9 +10,8 @@ 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 -ohmyzsh/ohmyzsh path:plugins/transfer +ohmyzsh/ohmyzsh path:plugins/ssh-agent # other plugins Aloxaf/fzf-tab diff --git a/dot_config/zsh/dot_zshenv b/dot_config/zsh/dot_zshenv index 33d61c2..ad78257 100644 --- a/dot_config/zsh/dot_zshenv +++ b/dot_config/zsh/dot_zshenv @@ -5,7 +5,7 @@ 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_DESKTOP_DIR="$HOME"/Desktop export XDG_DOCUMENTS_DIR="$HOME"/Documents export XDG_DOWNLOAD_DIR="$HOME"/Downloads export XDG_MUSIC_DIR="$HOME"/Music @@ -39,11 +39,11 @@ 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 # other programs export LESSHISTFILE="$XDG_STATE_HOME"/less/history export EDITOR=nvim -#export VISUAL=kate export ZSH_WAKATIME_BIN=/usr/bin/wakatime export PYTHONSTARTUP=/etc/python/pythonrc @@ -52,6 +52,7 @@ export ZELLIJ_AUTO_ATTACH=true export ZELLIJ_AUTO_EXIT=true export TERMINALNAME=$(fastfetch --pipe -s Terminal 2>/dev/null | awk '{print $2}') 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 )) @@ -59,4 +60,6 @@ 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" +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 34f712d..7d6e362 100644 --- a/dot_config/zsh/dot_zshrc +++ b/dot_config/zsh/dot_zshrc @@ -7,7 +7,7 @@ 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 misc' 'fastfetch') +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 @@ -24,9 +24,9 @@ antidote load # source files source "$ZDOTDIR"/files/evalstuff.zsh +source "$ZDOTDIR"/files/options.zsh source "$ZDOTDIR"/files/aliases.zsh source "$ZDOTDIR"/files/functions.zsh -source "$ZDOTDIR"/files/options.zsh source "$ZDOTDIR"/files/distroicon.zsh # completion files @@ -37,5 +37,6 @@ source "$ZDOTDIR"/files/sshcomp.zsh 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') -eval "$(oh-my-posh init zsh --config="$XDG_CACHE_HOME/oh-my-posh/themes/$potentialTheme[$RANDOM%$#potentialTheme+1]")" +#potentialTheme=('emodipt-extend') # 'kali' 'lambda' 'bubblesextra' 'illusi0n' 'nordtron' 'di4am0nd' 'atomic' +#eval "$(oh-my-posh init zsh --config="$XDG_CACHE_HOME/oh-my-posh/themes/$potentialTheme[$RANDOM%$#potentialTheme+1].omp.json")" +eval "$(oh-my-posh init zsh --config="$XDG_CACHE_HOME/oh-my-posh/themes/emodipt-extend.omp.json")" diff --git a/dot_local/share/bofh b/dot_local/share/bofh index a3d0b72..2790b5d 100644 --- a/dot_local/share/bofh +++ b/dot_local/share/bofh @@ -194,7 +194,7 @@ Did you pay the new Support Fee? We only support a 1200 bps connection. We only support a 28000 bps connection. Me no internet, only janitor, me just wax floors. -I'm sorry a PPC won't do, you need an Intel to connect with us. +I'm sorry a pentium won't do, you need an SGI to connect with us. Post-it Note Sludge leaked into the monitor. the curls in your keyboard cord are losing electricity. The monitor needs another box of pixels. @@ -222,9 +222,7 @@ The mainframe needs to rest. It's getting old, you know. I'm not sure. Try calling the Internet's head office -- it's in the book. The lines are all busy (busied out, that is -- why let them in to begin with?). Jan 9 16:41:27 huber su: 'su root' succeeded for .... on /dev/pts/1 -It's those computer people in New York City. They keep stuffing things up. -It's those computer people in Houston. They keep stuffing things up. -It's those computer people in New Delhi. They keep stuffing things up. +It's those computer people in X {city of world}. They keep stuffing things up. A star wars satellite accidently blew up the WAN. Fatal error right in front of screen That function is not currently supported, but Bill Gates assures us it will be featured in the next upgrade. @@ -245,18 +243,13 @@ Software uses US measurements, but the OS is in metric... The computer fleetly, mouse and all. Your cat tried to eat the mouse. The Borg tried to assimilate your system. Resistance is futile. -It must have been the lightning storm we had yesterday. -It must have been the lightning storm we had last week. -It must have been the lightning storm we had last month. +It must have been the lightning storm we had (yesterday) (last week) (last month) Due to Federal Budget problems we have been forced to cut back on the number of users able to access the system at one time. (namely none allowed....) Too much radiation coming from the soil. Unfortunately we have run out of bits/bytes/whatever. Don't worry, the next supply will be coming next week. Program load too heavy for processor to lift. Processes running slowly due to weak power supply -Our ISP is having switching problems. -Our ISP is having routing problems. -Our ISP is having power problems. -Our ISP is having connection problems. +Our ISP is having {switching,routing,SMDS,frame relay} problems We've run out of licenses Interference from lunar radiation Standing room only on the bus. @@ -326,7 +319,7 @@ Your EMAIL is now being delivered by the USPS. Your computer hasn't been returning all the bits it gets from the Internet. You've been infected by the Telescoping Hubble virus. Scheduled global CPU outage -Your PPC has a heating problem - try cooling it with ice cold water.(Do not turn off your computer, you do not want to cool down the PPC Chip while he isn't working, do you?) +Your Pentium has a heating problem - try cooling it with ice cold water.(Do not turn off your computer, you do not want to cool down the Pentium Chip while he isn't working, do you?) Your processor has processed too many instructions. Turn it off immediately, do not type any commands!! Your packets were eaten by the terminator Your processor does not develop enough heat. @@ -344,16 +337,13 @@ the xy axis in the trackball is coordinated with the summer solstice the butane lighter causes the pincushioning old inkjet cartridges emanate barium-based fumes manager in the cable duct -We'll fix that in the next upgrade. -We'll fix that in the next update. -We'll fix that in the next patch release. -We'll fix that in the next service pack. +We'll fix that in the next (upgrade, update, patch release, service pack). HTTPD Error 666 : BOFH was here -HTTPD Error 4004 : very old Motorola cpu - insufficient processing power +HTTPD Error 4004 : very old Intel cpu - insufficient processing power The ATM board has run out of 10 pound notes. We are having a whip round to refill it, care to contribute ? Network failure - call NBC Having to manually track the satellite. -Your computer had suffered a memory leak, and we are waiting for them to be topped off. +Your/our computer(s) had suffered a memory leak, and we are waiting for them to be topped up. The rubber band broke We're on Token Ring, and it looks like the token got loose. Stray Alpha Particles from memory packaging caused Hard Memory Error on Server. @@ -470,6 +460,10 @@ Power surges on the Underground. Don't worry; it's been deprecated. The new one is worse. Excess condensation in cloud network It is a layer 8 problem +The math co-processor had an overflow error that leaked out and shorted the RAM +Leap second overloaded RHEL6 servers +DNS server drank too much and had a hiccup +Your machine had the fuses in backwards. Foxconn factory caught fire insufficient data; cannot compute Please press all keys simultaneously to continue working. From 6e3aa326229fcb26aa25e9eb3b1423dcd9ebe561 Mon Sep 17 00:00:00 2001 From: eeleater Date: Sun, 11 Aug 2024 23:19:17 +0200 Subject: [PATCH 35/97] updated antidote --- dot_config/topgrade.toml.tmpl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dot_config/topgrade.toml.tmpl b/dot_config/topgrade.toml.tmpl index 0458c67..f293b35 100644 --- a/dot_config/topgrade.toml.tmpl +++ b/dot_config/topgrade.toml.tmpl @@ -21,11 +21,11 @@ skip_notify = true #run_in_tmux = true # List of remote machines with Topgrade installed on them -{{- if eq .chezmoi.hostname "pxm" }} +{{ if eq .chezmoi.hostname "pxm" }} remote_topgrades = ["docker", "kali", "mail"] -{{ else -}} +{{ else }} remote_topgrades = ["pxm", "web", "infra"] -{{- end }} +{{ end }} # Arguments to pass SSH when upgrading remote systems #ssh_arguments = "-o ConnectTimeout=2" From 0ed285bef9932a81daeaab820423bb21c2a53079 Mon Sep 17 00:00:00 2001 From: eeleater Date: Mon, 12 Aug 2024 18:54:30 +0200 Subject: [PATCH 36/97] updated antidote --- dot_config/zsh/{dot_zshenv => dot_zshenv.tmpl} | 2 ++ 1 file changed, 2 insertions(+) rename dot_config/zsh/{dot_zshenv => dot_zshenv.tmpl} (97%) 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" From 863808c00de8cb047264dd2780e2b9c04e557048 Mon Sep 17 00:00:00 2001 From: eeleater Date: Wed, 14 Aug 2024 00:45:09 +0200 Subject: [PATCH 37/97] updated antidote from sheldon --- dot_config/zsh/dot_zshrc | 6 ++---- dot_config/zsh/files/evalstuff.zsh | 3 ++- dot_config/zsh/files/functions.zsh | 4 ++-- dot_local/bin/executable_joke | 6 +++--- dot_local/bin/executable_updateOhMyPosh | 4 ++-- 5 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dot_config/zsh/dot_zshrc b/dot_config/zsh/dot_zshrc index 7d6e362..864f264 100644 --- a/dot_config/zsh/dot_zshrc +++ b/dot_config/zsh/dot_zshrc @@ -7,7 +7,7 @@ path+=("$XDG_DATA_HOME"/JetBrains/Toolbox/scripts) # jetbrains toolbox path+=("$HOME"/.local/bin) # local bin # startup banner -potentialBanner=('joke bofh' 'joke dad' 'fastfetch') # 'colorscript random' 'joke hq dijkstra' 'joke hq knuth' 'joke hq perlis' 'joke hq mimsc' +potentialBanner=('joke bofh' 'joke dad' 'fastfetch') eval "$potentialBanner[$RANDOM%$#potentialBanner+1]" # disable flowcontrol @@ -30,13 +30,11 @@ source "$ZDOTDIR"/files/functions.zsh source "$ZDOTDIR"/files/distroicon.zsh # completion files -source "$ZDOTDIR"/files/bashcomps.zsh source "$ZDOTDIR"/files/sshcomp.zsh +source "$ZDOTDIR"/files/bashcomps.zsh # local overrides for sourced in "$XDG_DATA_HOME"/zsh/files/*; do source $sourced; done # theme -#potentialTheme=('emodipt-extend') # 'kali' 'lambda' 'bubblesextra' 'illusi0n' 'nordtron' 'di4am0nd' 'atomic' -#eval "$(oh-my-posh init zsh --config="$XDG_CACHE_HOME/oh-my-posh/themes/$potentialTheme[$RANDOM%$#potentialTheme+1].omp.json")" eval "$(oh-my-posh init zsh --config="$XDG_CACHE_HOME/oh-my-posh/themes/emodipt-extend.omp.json")" diff --git a/dot_config/zsh/files/evalstuff.zsh b/dot_config/zsh/files/evalstuff.zsh index 5102e34..b19e153 100644 --- a/dot_config/zsh/files/evalstuff.zsh +++ b/dot_config/zsh/files/evalstuff.zsh @@ -1,7 +1,8 @@ # evalstuff +_evalcache fzf --zsh _evalcache zoxide init --cmd cd zsh _evalcache atuin init zsh _evalcache navi widget zsh _evalcache direnv hook zsh #_evalcache ntfy shell-integration -eval "$(keychain --dir "$XDG_CACHE_HOME"/keychain --eval --quiet id_rsa)" +#eval "$(keychain --dir "$XDG_CACHE_HOME"/keychain --eval --quiet id_rsa)" diff --git a/dot_config/zsh/files/functions.zsh b/dot_config/zsh/files/functions.zsh index 51af6bf..1fbf928 100644 --- a/dot_config/zsh/files/functions.zsh +++ b/dot_config/zsh/files/functions.zsh @@ -4,9 +4,9 @@ pet_select () { zle redisplay } zle -N pet_select -bindkey '^l' pet_select +bindkey '^s' pet_select -pet_add_prev () { +prev () { PREV=$(fc -lrn | head -n 1) sh -c "pet new $(printf %q "$PREV")" } diff --git a/dot_local/bin/executable_joke b/dot_local/bin/executable_joke index 00546a9..248c9fa 100644 --- a/dot_local/bin/executable_joke +++ b/dot_local/bin/executable_joke @@ -6,10 +6,10 @@ case "$1" in echo "Daily Dad Joke: $joke" ;; "bofh") - excuses_file="$HOME/.local/share/bofh" - num_lines=$(nl "$excuses_file" | tail -n 1 | awk '{print $1}') + file="$HOME/.local/share/bofh" + lines=$(nl "$file" | tail -n 1 | awk '{print $1}') echo -n "Daily BOFH Excuse: " - awk 'NR=='$((1 + RANDOM % num_lines ))'{print;exit}' "$excuses_file" + awk 'NR=='$((1 + RANDOM % lines ))'{print;exit}' "$file" ;; "hq") file="$HOME/.local/share/hackerquotes/$2" diff --git a/dot_local/bin/executable_updateOhMyPosh b/dot_local/bin/executable_updateOhMyPosh index e8366eb..8af14c4 100755 --- a/dot_local/bin/executable_updateOhMyPosh +++ b/dot_local/bin/executable_updateOhMyPosh @@ -1,6 +1,6 @@ #!/bin/bash -newestVersion="$(curl -sL https://api.github.com/repos/JanDeDobbeleer/oh-my-posh/releases/latest | jq -r '.name' | cut -dv -f2)" -localVersion="$(oh-my-posh --version)" +newestVersion="$(curl -sL https://api.github.com/repos/JanDeDobbeleer/oh-my-posh/releases/latest | jq -r '.name')" +localVersion="v$(oh-my-posh --version)" tmpFile="$(mktemp -u)" test "$newestVersion" != "$localVersion" && { From 4dce77ed89c1a2588fb97e8e43629c6f2ab107b6 Mon Sep 17 00:00:00 2001 From: eeleater Date: Wed, 14 Aug 2024 00:45:29 +0200 Subject: [PATCH 38/97] updated antidote from sheldon --- dot_config/zsh/files/paths.zsh | 75 ++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 dot_config/zsh/files/paths.zsh diff --git a/dot_config/zsh/files/paths.zsh b/dot_config/zsh/files/paths.zsh new file mode 100644 index 0000000..97d767b --- /dev/null +++ b/dot_config/zsh/files/paths.zsh @@ -0,0 +1,75 @@ +# +# Paths +# + +# Export existing paths. +typeset -gxU path PATH +typeset -gxU fpath FPATH +typeset -gxU cdpath CDPATH +typeset -gxU mailpath MAILPATH +typeset -gxU manpath MANPATH +# Create and export new paths. +typeset -gxU infopath INFOPATH +typeset -gxU node_path NODE_PATH +# Tie the new paths. +typeset -gxTU INFOPATH infopath +typeset -gxTU NODE_PATH nodepath + +# Set the list of directories that zsh searches for commands. +path=( + $HOME/bin + $HOME/.rvm/bin + /Applications/Postgres.app/Contents/MacOS/bin + /usr/local/{sbin,bin} + /usr/local/heroku/{sbin,bin} + /usr/local/opt/rbenv/shims + /usr/local/share/npm/bin + /opt/{sbin,bin} + /opt/local/{sbin,bin} + /usr/{sbin,bin} + /usr/X11R6/bin + /{sbin,bin} + $path +) +path=($^path(N-/)) + +# Set the list of directories that cd searches for directories. +setopt auto_cd +cdpath=( + . + $HOME + $HOME/Documents/Development + /Volumes/Daten/Development/gubo + /Volumes/Daten/Development/mojo + /Volumes/7\ Web/ +) +cdpath=($^cdpath(N-/)) + +# Set the list of directories that info searches for manuals. +infopath=( + /usr/local/info + /usr/local/share/info + /usr/share/info +) +infopath=($^infopath(N-/)) + +# Set the list of directories that man searches for manuals. +manpath=( + /usr/local/man + /usr/local/share/man + /usr/share/man +) +manpath=($^manpath(N-/)) + +# Set the list of directories that zsh searches for mail. +mailpath=( + $mailpath +) +mailpath=($^mailpath(N-/)) + +# Set the list of directories that node.js searches for modules. +nodepath=( + /usr/local/share/npm/lib/node_modules + /usr/local/lib/node_modules + ./node_modules +) From ef46d0e0a07a78462f582114a190a54b520d75d9 Mon Sep 17 00:00:00 2001 From: eeleater Date: Thu, 15 Aug 2024 23:25:11 +0200 Subject: [PATCH 39/97] updated antidote in prep for usage on laptop --- dot_config/kitty/kitty.conf | 2 +- dot_config/topgrade.toml.tmpl | 6 +- dot_config/zsh/dot_zprofile | 1 - dot_config/zsh/dot_zsh_plugins.txt | 33 ++-- dot_config/zsh/{dot_zshrc => dot_zshrc.tmpl} | 17 +- dot_config/zsh/files/bashcomps.zsh | 11 -- dot_config/zsh/files/compinit.zsh | 4 - dot_config/zsh/files/distroicon.zsh | 33 ---- dot_config/zsh/files/evalstuff.zsh | 3 - dot_config/zsh/files/mal.zsh | 195 ------------------- dot_config/zsh/files/options.zsh | 5 - 11 files changed, 29 insertions(+), 281 deletions(-) delete mode 100644 dot_config/zsh/dot_zprofile rename dot_config/zsh/{dot_zshrc => dot_zshrc.tmpl} (82%) delete mode 100644 dot_config/zsh/files/bashcomps.zsh delete mode 100644 dot_config/zsh/files/compinit.zsh delete mode 100644 dot_config/zsh/files/distroicon.zsh delete mode 100644 dot_config/zsh/files/mal.zsh delete mode 100644 dot_config/zsh/files/options.zsh diff --git a/dot_config/kitty/kitty.conf b/dot_config/kitty/kitty.conf index d4c30d8..efa925e 100644 --- a/dot_config/kitty/kitty.conf +++ b/dot_config/kitty/kitty.conf @@ -7,7 +7,7 @@ enable_audio_bell no shell_integration disabled # Fonts -font_family FiraCode Nerd Font +font_family CommitMono Nerd Font # BEGIN_KITTY_THEME # Dracula diff --git a/dot_config/topgrade.toml.tmpl b/dot_config/topgrade.toml.tmpl index f293b35..1098f6a 100644 --- a/dot_config/topgrade.toml.tmpl +++ b/dot_config/topgrade.toml.tmpl @@ -21,11 +21,11 @@ skip_notify = true #run_in_tmux = true # List of remote machines with Topgrade installed on them -{{ if eq .chezmoi.hostname "pxm" }} +{{- if eq .chezmoi.hostname "pxm" }} remote_topgrades = ["docker", "kali", "mail"] -{{ else }} +{{- else }} remote_topgrades = ["pxm", "web", "infra"] -{{ end }} +{{- end }} # Arguments to pass SSH when upgrading remote systems #ssh_arguments = "-o ConnectTimeout=2" diff --git a/dot_config/zsh/dot_zprofile b/dot_config/zsh/dot_zprofile deleted file mode 100644 index 4e2652e..0000000 --- a/dot_config/zsh/dot_zprofile +++ /dev/null @@ -1 +0,0 @@ -# create the file diff --git a/dot_config/zsh/dot_zsh_plugins.txt b/dot_config/zsh/dot_zsh_plugins.txt index 08c0d61..2767945 100644 --- a/dot_config/zsh/dot_zsh_plugins.txt +++ b/dot_config/zsh/dot_zsh_plugins.txt @@ -1,32 +1,33 @@ -# completions -zsh-users/zsh-completions - # lscolors trapd00r/LS_COLORS # ohmyzsh -ohmyzsh/ohmyzsh path:lib/completion.zsh -ohmyzsh/ohmyzsh path:lib/key-bindings.zsh -ohmyzsh/ohmyzsh path:lib/history.zsh -ohmyzsh/ohmyzsh path:lib/directories.zsh +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 -# other plugins -Aloxaf/fzf-tab -urbainvaes/fzf-marks +# utility plugins +3v1n0/zsh-bash-completions-fallback mroth/evalcache zpm-zsh/colorize -sobolevn/wakatime-zsh-plugin -amyreese/zsh-titles -laggardkernel/zsh-thefuck 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 asdf-vm/asdf -olets/zsh-abbr -# fish like +# fish like (load last) +zsh-users/zsh-completions path:src kind:fpath zsh-users/zsh-autosuggestions -zsh-users/zsh-syntax-highlighting +zdharma-continuum/fast-syntax-highlighting diff --git a/dot_config/zsh/dot_zshrc b/dot_config/zsh/dot_zshrc.tmpl similarity index 82% rename from dot_config/zsh/dot_zshrc rename to dot_config/zsh/dot_zshrc.tmpl index 864f264..c6ca66d 100644 --- a/dot_config/zsh/dot_zshrc +++ b/dot_config/zsh/dot_zshrc.tmpl @@ -1,6 +1,10 @@ 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 +# options +setopt NO_CLOBBER INTERACTIVE_COMMENTS HASH_EXECUTABLES_ONLY NUMERIC_GLOB_SORT +unsetopt FLOW_CONTROL + # deduplicate path typeset -U path PATH path+=("$XDG_DATA_HOME"/JetBrains/Toolbox/scripts) # jetbrains toolbox @@ -10,28 +14,23 @@ path+=("$HOME"/.local/bin) # local bin potentialBanner=('joke bofh' 'joke dad' 'fastfetch') eval "$potentialBanner[$RANDOM%$#potentialBanner+1]" -# disable flowcontrol -stty -ixon - -# initialize completion system -source "$ZDOTDIR"/files/compinit.zsh - # antidote +{{- if 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 # source files source "$ZDOTDIR"/files/evalstuff.zsh -source "$ZDOTDIR"/files/options.zsh source "$ZDOTDIR"/files/aliases.zsh source "$ZDOTDIR"/files/functions.zsh -source "$ZDOTDIR"/files/distroicon.zsh # completion files source "$ZDOTDIR"/files/sshcomp.zsh -source "$ZDOTDIR"/files/bashcomps.zsh # local overrides for sourced in "$XDG_DATA_HOME"/zsh/files/*; do source $sourced; done diff --git a/dot_config/zsh/files/bashcomps.zsh b/dot_config/zsh/files/bashcomps.zsh deleted file mode 100644 index 7c9b85c..0000000 --- a/dot_config/zsh/files/bashcomps.zsh +++ /dev/null @@ -1,11 +0,0 @@ -if (( ${+commands[distrobox]} )); then - source /usr/share/bash-completion/completions/distrobox - source /usr/share/bash-completion/completions/distrobox-create - source /usr/share/bash-completion/completions/distrobox-enter - source /usr/share/bash-completion/completions/distrobox-ephemeral - source /usr/share/bash-completion/completions/distrobox-generate-entry - source /usr/share/bash-completion/completions/distrobox-list - source /usr/share/bash-completion/completions/distrobox-rm - source /usr/share/bash-completion/completions/distrobox-stop - source /usr/share/bash-completion/completions/distrobox-upgrade -fi diff --git a/dot_config/zsh/files/compinit.zsh b/dot_config/zsh/files/compinit.zsh deleted file mode 100644 index afd93cc..0000000 --- a/dot_config/zsh/files/compinit.zsh +++ /dev/null @@ -1,4 +0,0 @@ -mkdir -p "$XDG_CACHE_HOME"/zsh &>/dev/null - -autoload -Uz compinit -compinit -d "$XDG_CACHE_HOME"/zsh/compdump diff --git a/dot_config/zsh/files/distroicon.zsh b/dot_config/zsh/files/distroicon.zsh deleted file mode 100644 index fc4599c..0000000 --- a/dot_config/zsh/files/distroicon.zsh +++ /dev/null @@ -1,33 +0,0 @@ -# find out which distribution we are running on -FILE="/etc/*-release" -if [[ -f $FILE ]]; then - _distro=$(awk '/^ID=/' /etc/*-release | awk -F'=' '{ print tolower($2) }') -fi - -# set an icon based on the distro -case $_distro in - *kali*) ICON="ﴣ";; - *arch*|*endeavouros*) ICON="";; - *debian*) ICON="";; - *raspbian*) ICON="";; - *ubuntu*) ICON="";; - *elementary*) ICON="";; - *fedora*) ICON="";; - *coreos*) ICON="";; - *gentoo*) ICON="";; - *mageia*) ICON="";; - *centos*) ICON="";; - *opensuse*|*tumbleweed*) ICON="";; - *sabayon*) ICON="";; - *slackware*) ICON="";; - *linuxmint*) ICON="";; - *alpine*) ICON="";; - *aosc*) ICON="";; - *nixos*) ICON="";; - *devuan*) ICON="";; - *manjaro*) ICON="";; - *rhel*) ICON="";; - *) ICON="";; -esac - -export DISTROICON="$ICON" diff --git a/dot_config/zsh/files/evalstuff.zsh b/dot_config/zsh/files/evalstuff.zsh index b19e153..10e3509 100644 --- a/dot_config/zsh/files/evalstuff.zsh +++ b/dot_config/zsh/files/evalstuff.zsh @@ -1,8 +1,5 @@ # evalstuff -_evalcache fzf --zsh _evalcache zoxide init --cmd cd zsh _evalcache atuin init zsh _evalcache navi widget zsh _evalcache direnv hook zsh -#_evalcache ntfy shell-integration -#eval "$(keychain --dir "$XDG_CACHE_HOME"/keychain --eval --quiet id_rsa)" diff --git a/dot_config/zsh/files/mal.zsh b/dot_config/zsh/files/mal.zsh deleted file mode 100644 index fc14d7d..0000000 --- a/dot_config/zsh/files/mal.zsh +++ /dev/null @@ -1,195 +0,0 @@ -export ALIASES_FILE="$XDG_CONFIG_HOME"/aliasesrc - -function mal { - # Use fzf to allow the user to select an alias from the aliases file - function _execute_alias { - local alias_to_execute=$(cut -d' ' -f2- "$ALIASES_FILE" | fzf) - - # Check if the user cancelled the selection - test -z $alias_to_execute && return 1 - - echo "Executing alias: $alias_to_execute" - # Execute the selected alias - eval ${alias_to_execute%%=*} - return 0 - } - - # Delete an existing alias by selecting it from a list - function _interactive_delete { - local alias_to_delete=$(cut -d' ' -f2- "$ALIASES_FILE" | fzf) - - # Check if the user cancelled the selection - test -z $alias_to_delete && return 1 - - echo "Deleted alias: $alias_to_delete" - # Delete the selected alias from the aliases file - sed -i "/^alias ${alias_to_delete%%=*}=/d" "$ALIASES_FILE" - unalias ${alias_to_delete%%=*} - } - - # Delete an existing alias using specified name - function _parameter_delete { - local alias_to_delete=$1 - local line_with_alias=$(grep "$1=" "$ALIASES_FILE") - - # Check if the alias exists in the aliases file - if test -z "$line_with_alias"; then - echo "No alias with the name $1 found." - return 2 - fi - - echo "Deleted alias: $alias_to_delete" - # Delete the selected alias from the aliases file - sed -i "/^alias ${alias_to_delete%%=*}=/d" "$ALIASES_FILE" - unalias ${alias_to_delete%%=*} - } - - # Rename an existing alias by selecting it from a list - function _interactive_rename { - local alias_to_rename=$(cut -d' ' -f2- "$ALIASES_FILE" | fzf) - - # Check if the user cancelled the selection - test -z $alias_to_rename && return 1 - - echo "Input new name:" - read new_name - echo "Renaming alias from $alias_to_rename to $new_name" - sed -i "s/^alias ${alias_to_rename%%=*}=/alias ${new_name}=/g" "$ALIASES_FILE" - unalias ${alias_to_rename%%=*} - } - - # Rename an existing alias using specified old and new names - function _parameter_rename { - local old_alias_name=$1 - local new_alias_name=$2 - local line_with_alias=$(grep "^alias ${old_alias_name}=" "$ALIASES_FILE") - - if test -z "$line_with_alias"; then - echo "No alias with the name $old_alias_name found." - return 1 - fi - - echo "Renaming alias from $old_alias_name to $new_alias_name" - sed -i "s/^alias ${old_alias_name}=/alias ${new_alias_name}=/g" "$ALIASES_FILE" - unalias ${old_alias_name} - } - - # Change the command associated with an existing alias by selecting it from a list - function _interactive_command_change { - local alias_to_change=$(cut -d' ' -f2- "$ALIASES_FILE" | fzf) - - # Check if the user cancelled the selection - test -z $alias_to_change && return 1 - - echo "Input new command:" - read new_command - echo "Changing command for alias ${alias_to_change%%=*} to \"$new_command\"" - sed -i "/^alias ${alias_to_change%%=*}=/{s/=.*/=\"$new_command\"/}" "$ALIASES_FILE" - } - - # Change the command associated with an existing alias using specified name and command - function _parameter_command_change { - local alias_to_change=$1 - local new_command="${@:2}" - local line_with_alias=$(grep "$alias_to_change=" "$ALIASES_FILE") - - if test -z "$line_with_alias"; then - echo "No alias with the name $alias_to_change found." - return 1 - fi - - echo "Changing command for alias $alias_to_change to \"$new_command\"" - sed -i "/^alias ${alias_to_change}=/{s/=.*/=\"$new_command\"/}" "$ALIASES_FILE" - } - - # Add a new alias - function _add_command { - local line_with_alias=$(grep "$1=" "$ALIASES_FILE") - - if test ! -z "$line_with_alias"; then - echo "Alias found: $line_with_alias; change alias by using the -c flag." - return 1 - fi - - local lh="alias $1" - local rh=\"${@:2}\" - local alias_str="$lh=$rh" - - echo $alias_str >>"$ALIASES_FILE" - echo "added '$alias_str' to .aliases" - } - - # List all aliases from the aliases file - function _list_aliases { - cut -d' ' -f2- "$ALIASES_FILE" | command cat - } - - # ============================================================================================================================================================== - - action="$1" - param1="$2" - param2="$3" - - # Check if the user has provided a help option or no arguments - helpParams=('-h' '--help' '-help') - if (($helpParams[(Ie)$action])) || test $# -eq 0; then - # Display usage information - echo "Usage: mal [OPTION]... [ALIAS_NAME] [ALIAS_COMMAND]..." - echo "" - echo "Create, delete, change, or execute aliases interactively." - echo "" - echo "Options:" - echo " -h, --help display this help and exit" - echo " -l list all defined aliases" - echo " -e execute an alias interactively" - echo " -d delete an alias interactively" - echo " -dn NAME delete an alias by name" - echo " -r rename an alias interactively" - echo " -rn OLD NEW rename an existing alias" - echo " -c change the command associated with an existing alias interactively" - echo " -cc NAME COMMAND change the command associated with an existing alias by name" - return 0 - fi - - case "$action" in - "-e") - # Execute an alias interactively - _execute_alias - ;; - "-l") - # List all aliases - _list_aliases - ;; - "-d") - # Delete an alias interactively - _interactive_delete - ;; - "-dn") - # Delete an alias using a parameter - _parameter_delete "$param1" - ;; - "-r") - # rename an alias interactively - _interactive_rename - ;; - "-rn") - # rename an alias using parameters - _parameter_rename "$param1" "$param2" - ;; - "-c") - # change a command interactively - _interactive_command_change - ;; - "-cc") - # change a command using parameters - _parameter_command_change "$param1" "$param2" - ;; - *) - # add a new command - _add_command "$action" "$param1" - ;; - esac - - # Reload aliases - source "$ALIASES_FILE" -} diff --git a/dot_config/zsh/files/options.zsh b/dot_config/zsh/files/options.zsh deleted file mode 100644 index a8477c6..0000000 --- a/dot_config/zsh/files/options.zsh +++ /dev/null @@ -1,5 +0,0 @@ -setopt NO_CLOBBER -setopt INTERACTIVE_COMMENTS -setopt HASH_EXECUTABLES_ONLY -setopt NUMERIC_GLOB_SORT -unsetopt FLOW_CONTROL From 48b4d418af7475d97573a89181c008559fd84840 Mon Sep 17 00:00:00 2001 From: eeleater Date: Fri, 16 Aug 2024 00:02:15 +0200 Subject: [PATCH 40/97] updated antidote in prep for usage on laptop --- dot_config/alacritty/alacritty.toml | 48 ----- dot_config/alacritty/dracula.toml | 76 -------- dot_config/brewfile/Brewfile | 78 -------- dot_config/qtile/bars.py | 38 ---- dot_config/qtile/colors.py | 9 - dot_config/qtile/config.py | 15 -- dot_config/qtile/groups.py | 20 --- dot_config/qtile/keys.py | 62 ------- dot_config/qtile/layouts.py | 53 ------ dot_config/qtile/old_configs/config.py | 170 ------------------ dot_config/qtile/old_configs/sweenu/bars.py | 127 ------------- dot_config/qtile/old_configs/sweenu/colors.py | 40 ----- dot_config/qtile/old_configs/sweenu/config.py | 131 -------------- dot_config/qtile/old_configs/sweenu/keys.py | 124 ------------- .../qtile/old_configs/sweenu/util/__main__.py | 23 --- .../old_configs/sweenu/util/backlight.py | 50 ------ .../qtile/old_configs/sweenu/util/monitor.py | 24 --- .../old_configs/sweenu/util/screenshot.py | 16 -- .../old_configs/sweenu/util/soundcard.py | 79 -------- .../qtile/old_configs/sweenu/widgets.py | 9 - dot_config/qtile/screens.py | 5 - .../qtile/scripts/executable_autostart.sh | 19 -- dot_config/qtile/themes/ayu-dark.json | 12 -- dot_config/qtile/themes/dracula.json | 12 -- dot_config/qtile/themes/hopscotch.json | 12 -- dot_config/qtile/themes/material-darker.json | 12 -- dot_config/qtile/themes/nord.json | 12 -- dot_config/qtile/themes/one-dark.json | 12 -- dot_config/qtile/themes/operator.json | 12 -- dot_config/qtile/themes/royal.json | 12 -- dot_config/qtile/themes/seashells.json | 12 -- dot_config/qtile/themes/smyck.json | 12 -- dot_config/qtile/themes/spacedust.json | 12 -- dot_config/qtile/themes/spacegray.json | 12 -- dot_config/qtile/themes/square.json | 12 -- dot_config/qtile/themes/tomorrow-nb.json | 12 -- dot_config/starship.toml | 8 - .../zsh-abbr/private_user-abbreviations | 8 - dot_config/zsh/dot_zsh_plugins.txt | 4 +- 39 files changed, 1 insertion(+), 1403 deletions(-) delete mode 100644 dot_config/alacritty/alacritty.toml delete mode 100644 dot_config/alacritty/dracula.toml delete mode 100644 dot_config/brewfile/Brewfile delete mode 100644 dot_config/qtile/bars.py delete mode 100644 dot_config/qtile/colors.py delete mode 100644 dot_config/qtile/config.py delete mode 100644 dot_config/qtile/groups.py delete mode 100644 dot_config/qtile/keys.py delete mode 100644 dot_config/qtile/layouts.py delete mode 100644 dot_config/qtile/old_configs/config.py delete mode 100644 dot_config/qtile/old_configs/sweenu/bars.py delete mode 100644 dot_config/qtile/old_configs/sweenu/colors.py delete mode 100644 dot_config/qtile/old_configs/sweenu/config.py delete mode 100644 dot_config/qtile/old_configs/sweenu/keys.py delete mode 100644 dot_config/qtile/old_configs/sweenu/util/__main__.py delete mode 100644 dot_config/qtile/old_configs/sweenu/util/backlight.py delete mode 100644 dot_config/qtile/old_configs/sweenu/util/monitor.py delete mode 100644 dot_config/qtile/old_configs/sweenu/util/screenshot.py delete mode 100644 dot_config/qtile/old_configs/sweenu/util/soundcard.py delete mode 100644 dot_config/qtile/old_configs/sweenu/widgets.py delete mode 100644 dot_config/qtile/screens.py delete mode 100644 dot_config/qtile/scripts/executable_autostart.sh delete mode 100644 dot_config/qtile/themes/ayu-dark.json delete mode 100644 dot_config/qtile/themes/dracula.json delete mode 100644 dot_config/qtile/themes/hopscotch.json delete mode 100644 dot_config/qtile/themes/material-darker.json delete mode 100644 dot_config/qtile/themes/nord.json delete mode 100644 dot_config/qtile/themes/one-dark.json delete mode 100644 dot_config/qtile/themes/operator.json delete mode 100644 dot_config/qtile/themes/royal.json delete mode 100644 dot_config/qtile/themes/seashells.json delete mode 100644 dot_config/qtile/themes/smyck.json delete mode 100644 dot_config/qtile/themes/spacedust.json delete mode 100644 dot_config/qtile/themes/spacegray.json delete mode 100644 dot_config/qtile/themes/square.json delete mode 100644 dot_config/qtile/themes/tomorrow-nb.json delete mode 100644 dot_config/starship.toml delete mode 100644 dot_config/zsh-abbr/private_user-abbreviations diff --git a/dot_config/alacritty/alacritty.toml b/dot_config/alacritty/alacritty.toml deleted file mode 100644 index 0761e47..0000000 --- a/dot_config/alacritty/alacritty.toml +++ /dev/null @@ -1,48 +0,0 @@ -import = ["./dracula.toml"] - -[env] -TERM = "xterm-256color" - -[font] -size = 10 - -[font.bold] -family = "FiraCode Nerd Font" -style = "Bold" - -[font.bold_italic] -family = "FiraCode Nerd Font" -style = "Bold Italic" - -[font.italic] -family = "FiraCode Nerd Font" -style = "Italic" - -[font.normal] -family = "FiraCode Nerd Font" -style = "Regular" - -[[keyboard.bindings]] -action = "Paste" -key = "V" -mods = "Control|Shift" - -[[keyboard.bindings]] -action = "Copy" -key = "C" -mods = "Control|Shift" - -[scrolling] -history = 99999 - -[shell] -args = ["--login"] -program = "/usr/bin/zsh" - -[window] -opacity = 0.95 -title = "Alacritty" - -[window.class] -general = "Alacritty" -instance = "Alacritty" diff --git a/dot_config/alacritty/dracula.toml b/dot_config/alacritty/dracula.toml deleted file mode 100644 index 0a56c29..0000000 --- a/dot_config/alacritty/dracula.toml +++ /dev/null @@ -1,76 +0,0 @@ -# Dracula theme for Alacritty -# https://draculatheme.com/alacritty -# -# Color palette -# https://spec.draculatheme.com -# -# Instructions -# https://github.com/alacritty/alacritty/blob/master/extra/man/alacritty.5.scd - -[colors.primary] - -background = "#282a36" -foreground = "#f8f8f2" -bright_foreground = "#ffffff" - -[colors.cursor] - -text = "#282a36" -cursor = "#f8f8f2" - -[colors.vi_mode_cursor] - -text = "CellBackground" -cursor = "CellForeground" - -[colors.selection] - -text = "CellForeground" -background = "#44475a" - -[colors.normal] - -black = "#21222c" -red = "#ff5555" -green = "#50fa7b" -yellow = "#f1fa8c" -blue = "#bd93f9" -magenta = "#ff79c6" -cyan = "#8be9fd" -white = "#f8f8f2" - -[colors.bright] - -black = "#6272a4" -red = "#ff6e6e" -green = "#69ff94" -yellow = "#ffffa5" -blue = "#d6acff" -magenta = "#ff92df" -cyan = "#a4ffff" -white = "#ffffff" - -[colors.search.matches] - -foreground = "#44475a" -background = "#50fa7b" - -[colors.search.focused_match] - -foreground = "#44475a" -background = "#ffb86c" - -[colors.footer_bar] - -background = "#282a36" -foreground = "#f8f8f2" - -[colors.hints.start] - -foreground = "#282a36" -background = "#f1fa8c" - -[colors.hints.end] - -foreground = "#f1fa8c" -background = "#282a36" diff --git a/dot_config/brewfile/Brewfile b/dot_config/brewfile/Brewfile deleted file mode 100644 index 47111a2..0000000 --- a/dot_config/brewfile/Brewfile +++ /dev/null @@ -1,78 +0,0 @@ -tap "homebrew/bundle" -tap "homebrew/command-not-found" -tap "homebrew/core" -tap "homebrew/services" -tap "kdabir/tap" -tap "msoap/tools" -tap "xwmx/taps" -tap "yxdunc/tools" -brew "asciinema" -brew "perl" -brew "asdf" -brew "bat" -brew "brotli" -brew "node" -brew "gettext" -brew "bitwarden-cli" -brew "bottom" -brew "bpytop" -brew "cheat" -brew "chezmoi" -brew "choose-rust" -brew "util-linux" -brew "curlie" -brew "direnv" -brew "dog" -brew "duf" -brew "dust" -brew "libgit2" -brew "exa" -brew "fd" -brew "llvm" -brew "gh" -brew "git-delta" -brew "glances" -brew "grex" -brew "gron" -brew "hexyl" -brew "httpie" -brew "hub" -brew "hyperfine" -brew "ipinfo-cli" -brew "jc" -brew "jq" -brew "lf" -brew "lnav" -brew "lsd" -brew "mcfly" -brew "miller" -brew "name-that-hash" -brew "navi" -brew "nmap" -brew "ripgrep" -brew "w3m" -brew "nb" -brew "nghttp2" -brew "procs" -brew "pywhat" -brew "ranger" -brew "rm-improved" -brew "rust" -brew "scc" -brew "sd" -brew "shellcheck" -brew "spark" -brew "speedtest-cli" -brew "starship" -brew "tokei" -brew "up" -brew "viddy" -brew "wget" -brew "wgetpaste" -brew "whalebrew" -brew "xh" -brew "xsv" -brew "zoxide" -brew "kdabir/tap/has" -brew "msoap/tools/shell2http" -brew "yxdunc/tools/lipl" diff --git a/dot_config/qtile/bars.py b/dot_config/qtile/bars.py deleted file mode 100644 index 57a80bc..0000000 --- a/dot_config/qtile/bars.py +++ /dev/null @@ -1,38 +0,0 @@ -from libqtile import bar, widget -from colors import colors - -def base(fg='foreground', bg='background'): - return { 'foreground': colors[fg], 'background': colors[bg] } - -widget_defaults = { - 'font': 'FiraCode Mono Nerd Font', - 'fontsize': 12, - 'padding': 5, - 'foreground': colors['black'], - 'background': colors['background'] -} - -group_box = { - 'fontsize': 28, - 'active': colors['purple'], - 'inactive': colors['purple'], - 'highlight_method': 'line', - 'this_current_screen_border': colors['green'] -} - -green = { 'background': colors['green'] } -yellow = { 'background': colors['yellow'] } - -widgets_list = [ - widget.GroupBox(**group_box), - widget.WindowName(**base(fg='yellow')), - widget.Memory(**yellow), - widget.Battery(**green), - widget.Volume(**yellow), - widget.CapsNumLockIndicator(**green), - widget.CurrentLayout(**yellow), - widget.Clock(format='%A, %B %d (%T)', **green), - widget.Systray() -] - -top = bar.Bar(widgets_list, 30) diff --git a/dot_config/qtile/colors.py b/dot_config/qtile/colors.py deleted file mode 100644 index 4d70971..0000000 --- a/dot_config/qtile/colors.py +++ /dev/null @@ -1,9 +0,0 @@ -import json -import os - -theme = 'nord' - -user = os.path.expanduser('~') - -with open(user + "/.config/qtile/themes/" + theme + ".json") as theme_json: - colors = json.load(theme_json) diff --git a/dot_config/qtile/config.py b/dot_config/qtile/config.py deleted file mode 100644 index 2cc9cdc..0000000 --- a/dot_config/qtile/config.py +++ /dev/null @@ -1,15 +0,0 @@ -import subprocess -import os - -from libqtile import hook - -from keys import keys -from groups import groups -from screens import screens -from bars import widget_defaults -from layouts import layouts, floating_layout - -#@hook.subscribe.startup_once -# def start_once(): -# user = os.path.expanduser('~') -# subprocess.call([user + '/.config/qtile/scripts/autostart.sh']) diff --git a/dot_config/qtile/groups.py b/dot_config/qtile/groups.py deleted file mode 100644 index 40b3dac..0000000 --- a/dot_config/qtile/groups.py +++ /dev/null @@ -1,20 +0,0 @@ -from libqtile.config import Group, ScratchPad, DropDown - -group_names = [ - ("WWW", {'layout': 'treetab', 'label': ''}), - ("DEV", {'layout': 'monadtall', 'label': ''}), - ("SYS", {'layout': 'treetab', 'label': ''}), - ("VMS", {'layout': 'monadtall', 'label': ''}), - ("DOC", {'layout': 'monadtall', 'label': ''}), - ("IRC", {'layout': 'monadtall', 'label': ''}), - ("MUS", {'layout': 'monadtall', 'label': ''}), - ("VID", {'layout': 'monadtall', 'label': ''}), - ("GFX", {'layout': 'floating', 'label': ''}) -] - -terminals = [ - DropDown("term", "kitty", height = 0.65, width = 0.85, warp_pointer = False) -] - -groups = [Group(name, **kwargs) for name, kwargs in group_names] -groups.append(ScratchPad("DRP", dropdowns = terminals)) diff --git a/dot_config/qtile/keys.py b/dot_config/qtile/keys.py deleted file mode 100644 index a5c487a..0000000 --- a/dot_config/qtile/keys.py +++ /dev/null @@ -1,62 +0,0 @@ -from libqtile.config import Key, Drag, Click -from libqtile.lazy import lazy - -from groups import group_names - -mod = ["mod4"] -modshift = ["mod4", "shift"] -modctrl = ["mod4", "control"] -ctrl = ["control"] - -keys = [ - # Standard Controls - Key(modshift, "d", lazy.window.kill(), desc='kill active window'), - Key(modctrl, "r", lazy.restart(), desc='reload qtile config'), - Key(modctrl, "l", lazy.spawn('xdg-screensaver lock'), desc='lock screen'), - Key(modshift, "q", lazy.spawn('rofi -show p -modi p:rofi-power-menu'), desc="shutdown menu"), - Key(mod, "Tab", lazy.spawn('rofi -show window'), desc='window menu'), - - # Treetab controls - Key(modctrl, "Up", lazy.layout.section_up(), desc='Move up a section in treetab'), - Key(modctrl, "Down", lazy.layout.section_down(), desc='Move down a section in treetab'), - - # Window controls - Key(mod, "Up", lazy.layout.up(), desc='Move focus up in current stack pane'), - Key(mod, "Down", lazy.layout.down(), desc='Move focus down in current stack pane'), - Key(mod, "Left", lazy.layout.shrink(), lazy.layout.decrease_nmaster(), desc='Shrink window (MonadTall), decrease number in master pane (Tile)'), - Key(mod, "Right", lazy.layout.grow(), lazy.layout.increase_nmaster(), desc='Expand window (MonadTall), increase number in master pane (Tile)'), - Key(modshift, "Down", lazy.layout.shuffle_down(), desc='Move windows down in current stack'), - Key(modshift, "Up", lazy.layout.shuffle_up(), desc='Move windows up in current stack'), - Key(modctrl, "f", lazy.window.toggle_floating(), desc='toggle floating'), - Key(mod, "n", lazy.layout.normalize(), desc='normalize window size ratios'), - Key(mod, "m", lazy.layout.maximize(), desc='toggle window between minimum and maximum sizes'), - - # Stack controls - Key(modshift, "space", lazy.layout.rotate(), lazy.layout.flip(), desc='Switch which side main pane occupies (XmonadTall)'), - Key(mod, "space", lazy.layout.next(), desc='Switch window focus to other pane(s) of stack'), - Key(modctrl, "Return", lazy.layout.toggle_split(), desc='Toggle between split and unsplit sides of stack'), - - # run programs - Key(mod, "Return", lazy.spawn('rofi -show drun'), desc='launcher'), - Key(modshift, "r", lazy.spawn('pcmanfm'), desc='filebrowser'), - Key(modshift, "p", lazy.spawn('bwmenu'), desc='passwordmenu'), - Key(ctrl, "space", lazy.group["DRP"].dropdown_toggle("term")), - - # sound + brightness - Key([], "XF86AudioMute", lazy.spawn('pactl set-sink-mute @DEFAULT_SINK@ toggle')), - Key([], "XF86AudioMicMute", lazy.spawn('pactl set-source-mute @DEFAULT_SOURCE@ toggle')), - Key([], "XF86AudioLowerVolume", lazy.spawn('pactl set-sink-volume @DEFAULT_SINK@ -5%')), - Key([], "XF86AudioRaiseVolume", lazy.spawn('pactl set-sink-volume @DEFAULT_SINK@ +5%')), - Key([], "XF86MonBrightnessUp", lazy.spawn('brightnessctl set +10%')), - Key([], "XF86MonBrightnessDown", lazy.spawn('brightnessctl set 10%-')) -] - -mouse = [ - Drag(mod, "Button1", lazy.window.set_position_floating(), start=lazy.window.get_position()), - Drag(mod, "Button3", lazy.window.set_size_floating(), start=lazy.window.get_size()), - Click(mod, "Button2", lazy.window.bring_to_front()) -] - -for i, (name, kwargs) in enumerate(group_names, 1): - keys.append(Key(mod, str(i), lazy.group[name].toscreen())) - keys.append(Key(modshift, str(i), lazy.window.togroup(name))) diff --git a/dot_config/qtile/layouts.py b/dot_config/qtile/layouts.py deleted file mode 100644 index ebd9638..0000000 --- a/dot_config/qtile/layouts.py +++ /dev/null @@ -1,53 +0,0 @@ -from libqtile import layout -from libqtile.config import Match - -from colors import colors - -layout_theme = { - "border_width": 1, - "margin": 5, - "border_focus": colors['green'], - "border_normal": colors['cyan'] -} - -treetab_layout = { - "font": "FiraCode Nerd Font", - "fontsize": 10, - "sections": [""], - "section_fontsize": 8, - "bg_color": colors['background'], - "active_bg": colors['foreground'], - "active_fg": colors['background'], - "inactive_bg": colors['background'], - "inactive_fg": colors['white'], - "padding_y": 5, - "section_top": 10, - "panel_width": 100 -} - -layouts = [ - # layout.MonadWide(**layout_theme), - # layout.Bsp(**layout_theme), - # layout.Stack(num_stacks=2, **layout_theme), - # layout.Columns(**layout_theme), - # layout.RatioTile(**layout_theme), - # layout.VerticalTile(**layout_theme), - # layout.Matrix(**layout_theme), - layout.MonadTall(**layout_theme), - # layout.Max(**layout_theme), - # layout.Tile(shift_windows=True, **layout_theme), - layout.TreeTab(**treetab_layout), - layout.Floating(**layout_theme) -] - -floatrules = [ - *layout.Floating.default_float_rules, - Match(wm_class="confirmreset"), # gitk - Match(wm_class="makebranch"), # gitk - Match(wm_class="maketag"), # gitk - Match(wm_class="ssh-askpass"), # ssh-askpass - Match(title="branchdialog"), # gitk - Match(title="pinentry"), # GPG key password entry -] - -floating_layout = layout.Floating(float_rules = floatrules, border_width = 0) diff --git a/dot_config/qtile/old_configs/config.py b/dot_config/qtile/old_configs/config.py deleted file mode 100644 index 87ce40f..0000000 --- a/dot_config/qtile/old_configs/config.py +++ /dev/null @@ -1,170 +0,0 @@ -import json -import subprocess - -from libqtile import layout, bar, widget, hook -from libqtile.command import lazy -from libqtile.config import Key, Screen, Group, Drag, Click - -@hook.subscribe.startup_once -def start_once(): - subprocess.call(['/home/eeleater/.config/qtile/scripts/autostart.sh']) - -terminal = "kitty" -mod = ["mod4"] -modshift = ["mod4", "shift"] -modctrl = ["mod4", "control"] - -keys = [ - # Standard Controls - Key(modshift, "d", lazy.window.kill(), desc='kill active window'), - Key(modctrl, "r", lazy.restart(), desc='reload qtile config'), - Key(modctrl, "l", lazy.spawn("xdg-screensaver lock"), desc='lock screen'), - Key(modshift, "q", lazy.spawn("rofi -show p -modi p:rofi-power-menu"), desc="shutdown menu"), - Key(mod, "Tab", lazy.spawn("rofi -show window"), desc='window menu'), - - # Treetab controls - Key(modctrl, "Up", lazy.layout.section_up(), desc='Move up a section in treetab'), - Key(modctrl, "Down", lazy.layout.section_down(), desc='Move down a section in treetab'), - - # Window controls - Key(mod, "Up", lazy.layout.up(), desc='Move focus up in current stack pane'), - Key(mod, "Down", lazy.layout.down(), desc='Move focus down in current stack pane'), - Key(mod, "Left", lazy.layout.shrink(), lazy.layout.decrease_nmaster(), desc='Shrink window (MonadTall), decrease number in master pane (Tile)'), - Key(mod, "Right", lazy.layout.grow(), lazy.layout.increase_nmaster(), desc='Expand window (MonadTall), increase number in master pane (Tile)'), - Key(modshift, "Down", lazy.layout.shuffle_down(), desc='Move windows down in current stack'), - Key(modshift, "Up", lazy.layout.shuffle_up(), desc='Move windows up in current stack'), - Key(modctrl, "f", lazy.window.toggle_floating(), desc='toggle floating'), - Key(mod, "n", lazy.layout.normalize(), desc='normalize window size ratios'), - Key(mod, "m", lazy.layout.maximize(), desc='toggle window between minimum and maximum sizes'), - - # Stack controls - Key(modshift, "space", lazy.layout.rotate(), lazy.layout.flip(), desc='Switch which side main pane occupies (XmonadTall)'), - Key(mod, "space", lazy.layout.next(), desc='Switch window focus to other pane(s) of stack'), - Key(modctrl, "Return", lazy.layout.toggle_split(), desc='Toggle between split and unsplit sides of stack'), - - # run programs - Key(mod, "Return", lazy.spawn(terminal + ' --single-instance'), desc='terminal'), - Key(modshift, "Return", lazy.spawn("rofi -show drun"), desc='launcher'), - Key(modshift, "r", lazy.spawn("pcmanfm"), desc='filebrowser'), - Key(modshift, "p", lazy.spawn("bwmenu"), desc='passwordmenu'), - - # sound + brightness - Key([], "XF86AudioMute", lazy.spawn("pactl set-sink-mute @DEFAULT_SINK@ toggle")), - Key([], "XF86AudioMicMute", lazy.spawn("pactl set-source-mute @DEFAULT_SOURCE@ toggle")), - Key([], "XF86AudioLowerVolume", lazy.spawn("pactl set-sink-volume @DEFAULT_SINK@ -5%")), - Key([], "XF86AudioRaiseVolume", lazy.spawn("pactl set-sink-volume @DEFAULT_SINK@ +5%")), - Key([], "XF86MonBrightnessUp", lazy.spawn("brightnessctl set +10%")), - Key([], "XF86MonBrightnessDown", lazy.spawn("brightnessctl set 10%-")) -] - -mouse = [ - Drag(mod, "Button1", lazy.window.set_position_floating(), start=lazy.window.get_position()), - Drag(mod, "Button3", lazy.window.set_size_floating(), start=lazy.window.get_size()), - Click(mod, "Button2", lazy.window.bring_to_front()) -] - -# GROUPS -group_names = [ - ("WWW", {'layout': 'treetab', 'label': ''}), - ("DEV", {'layout': 'monadtall', 'label': ''}), - ("SYS", {'layout': 'monadtall', 'label': ''}), - ("VMS", {'layout': 'monadtall', 'label': ''}), - ("DOC", {'layout': 'monadtall', 'label': ''}), - ("IRC", {'layout': 'monadtall', 'label': ''}), - ("MUS", {'layout': 'monadtall', 'label': ''}), - ("VID", {'layout': 'monadtall', 'label': ''}), - ("GFX", {'layout': 'floating', 'label': ''}) -] - -groups = [Group(name, **kwargs) for name, kwargs in group_names] - -for i, (name, kwargs) in enumerate(group_names, 1): - keys.append(Key(mod, str(i), lazy.group[name].toscreen())) - keys.append(Key(modshift, str(i), lazy.window.togroup(name))) - -# LAYOUTS -layout_theme = {"border_width": 1, "margin": 5, "border_focus": "53bdfa", "border_normal": "01060e"} -treetab_layout = { - "font": "FiraCode Nerd Font", - "fontsize": 10, - "sections": [""], - "section_fontsize": 8, - "bg_color": "141414", - "active_bg": "90C435", - "active_fg": "000000", - "inactive_bg": "384323", - "inactive_fg": "a0a0a0", - "padding_y": 5, - "section_top": 10, - "panel_width": 100 -} - -layouts = [ - # layout.MonadWide(**layout_theme), - # layout.Bsp(**layout_theme), - # layout.Stack(num_stacks=2, **layout_theme), - # layout.Columns(**layout_theme), - # layout.RatioTile(**layout_theme), - # layout.VerticalTile(**layout_theme), - # layout.Matrix(**layout_theme), - layout.MonadTall(**layout_theme), - # layout.Max(**layout_theme), - # layout.Tile(shift_windows=True, **layout_theme), - layout.TreeTab(**treetab_layout), - layout.Floating(**layout_theme) -] - -# COLORS -theme = 'hopscotch' - -with open("/home/eeleater/.config/qtile/themes/" + theme + ".json") as theme_json: - colors = json.load(theme_json) - -def base(fg='foreground', bg='background'): - return {'foreground': colors[fg], 'background': colors[bg]} - -# DEFAULTS -widget_defaults = {'font': 'FiraCode Mono Nerd Font', 'fontsize': 12, 'padding': 5, 'foreground': colors['black'], 'background': colors['background']} -extension_defaults = widget_defaults.copy() - -group_box = { - 'fontsize': 25, - 'active': colors['purple'], - 'inactive': colors['purple'], - 'highlight_method': 'line', - 'this_current_screen_border': colors['green'] -} - -pacman = { 'update_interval': 1800 } -clock = { 'format': '%A, %B %d (%T)' } -wid_bg_one = { 'background': colors['green'] } -wid_bg_two = { 'background': colors['yellow'] } - -widgets_list = [ - widget.GroupBox(**group_box), - widget.WindowName(**base(fg='yellow')), - widget.Pacman(**pacman, **wid_bg_one), - widget.TextBox(text="Updates", **wid_bg_one), - widget.Memory(**wid_bg_two), - widget.Battery(**wid_bg_one), - widget.Volume(**wid_bg_two), - widget.CapsNumLockIndicator(**wid_bg_one), - widget.CurrentLayout(**wid_bg_two), - widget.Clock(**wid_bg_one, **clock), - widget.Systray() -] - -screens = [Screen(top=bar.Bar(widgets_list, 25))] - -floating_layout = layout.Floating(float_rules=[ - {'wmclass': 'confirm'}, {'wmclass': 'dialog'}, - {'wmclass': 'download'}, {'wmclass': 'error'}, - {'wmclass': 'file_progress'}, {'wmclass': 'notification'}, - {'wmclass': 'splash'}, {'wmclass': 'toolbar'}, - {'wmclass': 'confirmreset'}, {'wmclass': 'makebranch'}, - {'wmclass': 'maketag'}, {'wmclass': 'ssh-askpass'}, - {'wmclass': 'microsoft teams - preview'}, - {'wname': 'branchdialog'}, {'wname': 'pinentry-gtk-2'}, - {'wname': 'pinentry'}, {'wname': 'Welcome to PyCharm'}, - {'wname': 'Kali'} -]) diff --git a/dot_config/qtile/old_configs/sweenu/bars.py b/dot_config/qtile/old_configs/sweenu/bars.py deleted file mode 100644 index 1d5acf8..0000000 --- a/dot_config/qtile/old_configs/sweenu/bars.py +++ /dev/null @@ -1,127 +0,0 @@ -from pathlib import Path -from libqtile import bar, widget - -from colors import theme, border_color - -icon_theme_path = Path.home() / '{{ icon_dir | replace(user_dir + '/', '') }}' -bar_size = 36 - -groupbox = { - 'center_aligned': True, - 'foreground': theme['very_light_white'], - 'inactive': theme['gray'], - 'other_current_screen_border': theme['gray'], - 'this_current_screen_border': theme['dark_blue'], - 'this_screen_border': theme['dark_blue'], - 'urgent_border': theme['red'], - 'urgent_text': theme['red']} - -sep = { - 'linewidth': 2, - 'size_percent': 100, - 'padding': 12} - -soft_sep = { - 'linewidth': 2, - 'size_percent': 70, - 'foreground': theme['dark_gray'], - 'padding': 7} - -tasklist = { - 'border': border_color, - 'max_title_width': 200, - 'txt_floating': '🗗', - 'txt_maximized': '🗖', - 'txt_minimized': '🗕'} - - -volume = {'theme_path': icon_theme_path} - -clock = { - 'timezone': 'Europe/Paris', - 'format': '%B %-d, %H:%M'} - -music = widget.Mpris2( - background=theme['dark_blue'], - name='spotify', - scroll_chars=0, - stop_pause_text='', - display_metadata=['xesam:title', 'xesam:artist'], - objname="org.mpris.MediaPlayer2.spotify") - -disk = widget.DF( - update_interval=3600, - warn_space=5, - format=' {p} ({uf}{m})') - -updates = widget.CheckUpdates( - distro='Arch_checkupdates', - display_format=' {updates}', - execute='termite -e "pikaur -Syu"', - colour_have_updates=theme['dark_blue'], - colour_no_updates=theme['dark_green'], - update_interval=600) - -battery = widget.Battery( - foreground=theme['green'], - low_percentage=0.10, - low_foreground=theme['red'], - update_delay=10, - format='{percent:.0%} {hour:d}:{min:02d} {watt:.2}W') - -battery_icon = widget.BatteryIcon( - theme_path=icon_theme_path, - update_interval=120) - -systray = widget.Systray( - icon_size=24 -) - -main_bar = bar.Bar( - [ - widget.GroupBox(**groupbox, visible_groups=['a', 's', 'd', 'f', - 'music', 'chat', 'game']), - widget.Sep(**sep), - widget.Volume(**volume), - music, - widget.TaskList(**tasklist), - - systray, - widget.Sep(**sep), - disk, - updates, - widget.Sep(**soft_sep), - battery_icon, - battery, - widget.Sep(**soft_sep), - widget.Clock(**clock), - ], bar_size) - -bar1 = bar.Bar( - [ - widget.GroupBox(**groupbox, visible_groups=['a', 's', 'd', 'f', 'game']), - widget.Sep(**sep), - widget.Volume(**volume), - music, - widget.TaskList(**tasklist), - - systray, - widget.Sep(**sep), - disk, - updates, - widget.Sep(**soft_sep), - widget.Clock(**clock), - ], bar_size) - -bar2 = bar.Bar( - [ - widget.GroupBox(**groupbox, visible_groups=['u', 'i', 'o', 'p', 'music', 'chat']), - widget.Sep(**sep), - widget.Volume(**volume), - widget.TaskList(**tasklist), - - battery_icon, - battery, - widget.Sep(**soft_sep), - widget.Clock(**clock), - ], bar_size) diff --git a/dot_config/qtile/old_configs/sweenu/colors.py b/dot_config/qtile/old_configs/sweenu/colors.py deleted file mode 100644 index f4294f6..0000000 --- a/dot_config/qtile/old_configs/sweenu/colors.py +++ /dev/null @@ -1,40 +0,0 @@ -# gruvbox -theme = { - 'dark_black': '{{ theme.dark_black }}', - 'black': '{{ theme.black }}', - 'light_black': '{{ theme.light_black }}', - 'very_light_black': '{{ theme.very_light_black }}', - - 'dark_gray': '{{ theme.dark_gray }}', - 'gray': '{{ theme.gray }}', - 'light_gray': '{{ theme.light_gray }}', - 'very_light_gray': '{{ theme.very_light_gray }}', - - 'dark_white': '{{ theme.dark_white }}', - 'white': '{{ theme.white }}', - 'light_white': '{{ theme.light_white }}', - 'very_light_white': '{{ theme.very_light_white }}', - - 'dark_red': '{{ theme.dark_red }}', - 'red': '{{ theme.red }}', - - 'dark_green': '{{ theme.dark_green }}', - 'green': '{{ theme.green }}', - - 'dark_yellow': '{{ theme.dark_yellow }}', - 'yellow': '{{ theme.yellow }}', - - 'dark_blue': '{{ theme.dark_blue }}', - 'blue': '{{ theme.blue }}', - - 'dark_purple': '{{ theme.dark_purple }}', - 'purple': '{{ theme.purple }}', - - 'dark_teal': '{{ theme.dark_teal }}', - 'teal': '{{ theme.teal }}', - - 'dark_orange': '{{ theme.dark_orange }}', - 'orange': '{{ theme.orange }}', -} - -border_color = theme['white'] diff --git a/dot_config/qtile/old_configs/sweenu/config.py b/dot_config/qtile/old_configs/sweenu/config.py deleted file mode 100644 index cca870b..0000000 --- a/dot_config/qtile/old_configs/sweenu/config.py +++ /dev/null @@ -1,131 +0,0 @@ -import re -from subprocess import run -from pathlib import Path -from typing import List - -from libqtile import layout, hook -from libqtile.config import Group, Match, Screen, Rule - -from bars import main_bar, bar1, bar2 -from keys import keys, mouse, sc, get_backlight_keys -from colors import border_color, theme -from util import qtile_func -from util.monitor import enable_monitor - - -keys = keys -mouse = mouse -screens: List[Screen] = [] -groups = [ - Group('game', layouts=[layout.Max()], persist=False, init=False, - matches=[Match(wm_class=['Steam'])], label=''), - - Group('chat', layouts=[layout.Max()], persist=False, init=False, - matches=[Match(wm_class=['discord'])], label=''), - - Group('music', layouts=[layout.Max()], persist=False, init=False, - matches=[Match(wm_class=[re.compile('spotify', re.I)])], label=''), -] - - -float_rules = [ - {'wmclass': 'confirm'}, - {'wmclass': 'dialog'}, - {'wmclass': 'download'}, - {'wmclass': 'error'}, - {'wmclass': 'file_progress'}, - {'wmclass': 'notification'}, - {'wmclass': 'splash'}, - {'wmclass': 'toolbar'}, - {'wmclass': 'Xephyr'}, - {'wmclass': 'feh'}, - {'wmclass': 'Sms.py'}, - {'wmclass': 'leagueclientux.exe'}, - {'wmclass': 'Gcr-prompter'}, - {'wmclass': 'scrcpy'}, - {'wname': 'Friends'}, -] - -floating_layout = layout.Floating(border_focus=f'#{border_color}', - float_rules=float_rules) - - -layouts = [ - layout.Max(), - layout.Stack(num_stacks=2, border_focus=f'#{border_color}') -] - - -widget_defaults = {'font': 'DejaVu Sans', - 'fontsize': 18, - 'padding': 4, - 'foreground': theme['very_light_white'], - 'background': theme['dark_black']} - - -def setup_monitors(qtile): - monitors = qtile.conn.monitors - nb_monitors = len(monitors) - if nb_monitors == 1: - run('xrandr --auto'.split()) - elif nb_monitors == 2: - laptop_monitor = None - other_monitor = None - for monitor in monitors: - if monitor.name.startswith('eDP'): - laptop_monitor = monitor - else: - other_monitor = monitor - enable_monitor(other_monitor, primary=True, side='left-of', - relative_monitor=laptop_monitor) - - -def setup_screens(qtile, screens, groups): - nb_monitors = len(qtile.conn.monitors) - if nb_monitors == 1: - screens.append(Screen(top=main_bar)) - groups += [Group(i) for i in 'asdf'] - else: - screens += [Screen(top=bar1), Screen(top=bar2)] - groups += [Group(i) for i in 'asdfuiop'] - - -def main(qtile): - global keys - setup_monitors(qtile) - setup_screens(qtile, screens, groups) - keys += get_backlight_keys(qtile) - -def wallpaper(): - wallpaper_path = Path.home() / '.wallpaper' - run(['feh', '--bg-scale', wallpaper_path]) - - -@hook.subscribe.startup -def autostart(): - wallpaper() - sc.set_profile('analog') - - -@hook.subscribe.addgroup -def go_to_group(qtile, group): - try: - qtile.groupMap[group].cmd_toscreen() - except AttributeError: - pass - - -@hook.subscribe.screen_change -def configure_monitors(qtile, ev): - setup_monitors(qtile) - qtile.cmd_restart() - - -dgroups_app_rules: List[Rule] = [] -dgroups_key_binder = None -follow_mouse_focus = False -bring_front_click = False -cursor_warp = False -auto_fullscreen = True -focus_on_window_activation = 'focus' -wmname = 'LG3D' diff --git a/dot_config/qtile/old_configs/sweenu/keys.py b/dot_config/qtile/old_configs/sweenu/keys.py deleted file mode 100644 index f670047..0000000 --- a/dot_config/qtile/old_configs/sweenu/keys.py +++ /dev/null @@ -1,124 +0,0 @@ -from libqtile.config import Key, Drag -from libqtile.command import lazy - -from util.backlight import Backlight -from util.screenshot import screenshot -from util.soundcard import SoundCard -from util import qtile_func - - -# super = mod4, alt = mod1 -mod = 'mod4' - -BROWSER = '{{ browser }}' -TERM= '{{ term }}' -MUSIC_PLAYER = 'spotify' - -# add 'PlayPause', 'Next' or 'Previous' -spotify_cmd = ('dbus-send --print-reply --dest=org.mpris.MediaPlayer2.spotify ' - '/org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player.') -amixer_cmd = 'amixer -D pulse set Master' -rofi_cmd = 'rofi -combi-modi window,run -show combi -modi combi -monitor -4' - -sc = SoundCard('alsa_card.pci-0000_00_1f.3') - - -def app_or_group(group, app): - """Go to app if already open else open it.""" - def f(qtile): - if group in {'music'}: - qtile.cmd_to_screen(1) - try: - qtile.groupMap[group].cmd_toscreen() - except KeyError: - qtile.cmd_spawn(app) - return f - - -def go_to_group(group): - """The groups 'asdf' are accessible on screen 1, 'uiop' on screen 2.""" - def f(qtile): - if group in 'asdf': - qtile.cmd_to_screen(0) - qtile.groupMap[group].cmd_toscreen() - elif group in 'uiop': - qtile.cmd_to_screen(1) - qtile.groupMap[group].cmd_toscreen() - return f - - -# TODO: make this function work for more than two monitors -def get_backlight_keys(qtile): - monitors = qtile.conn.monitors - keys = [] - for monitor in monitors: - bl = Backlight(ctrl=monitor.backlight_ctrl) - if monitor.name.startswith('eDP'): - keys.append(Key([], 'XF86MonBrightnessUp', lazy.function(bl.change_backlight('inc')))) - keys.append(Key([], 'XF86MonBrightnessDown', lazy.function(bl.change_backlight('dec')))) - keys.append(Key([], 'F7', lazy.function(bl.turn_off_screen(monitor.x)))) - else: - keys.append(Key([mod], 'Up', lazy.function(bl.change_backlight('inc')))) - keys.append(Key([mod], 'Down', lazy.function(bl.change_backlight('dec')))) - keys.append(Key([mod], 'F7', lazy.function(bl.turn_off_screen(monitor.x)))) - return keys - - -keys = [ - Key([mod, 'control'], 'p', lazy.spawn('xbacklight -set 50')), - Key([mod], 'k', lazy.layout.down()), # noqa - Key([mod], 'j', lazy.layout.up()), # noqa - Key([mod], 'space', lazy.layout.next()), # noqa - Key([mod, 'control'], 'k', lazy.layout.shuffle_down()), # noqa - Key([mod, 'control'], 'j', lazy.layout.shuffle_up()), # noqa - Key([mod, 'shift'], 'h', lazy.layout.client_to_previous()), # noqa - Key([mod, 'shift'], 'l', lazy.layout.client_to_next()), # noqa - Key([mod, 'shift'], 'space', lazy.layout.rotate()), # noqa - Key([mod, 'shift'], 'Return', lazy.layout.toggle_split()), # noqa - - Key([mod], 'slash', lazy.screen.toggle_group()), # noqa - - Key([mod], 'x', lazy.window.kill()), # noqa - Key([mod], 'y', lazy.window.toggle_floating()), # noqa - - Key([mod], '1', lazy.to_screen(0)), # noqa - Key([mod], '2', lazy.to_screen(1)), # noqa - Key([mod], 'Tab', lazy.next_layout()), # noqa - Key([mod, 'control'], 'r', lazy.restart()), # noqa - Key([mod, 'control'], 'q', lazy.shutdown()), # noqa - - # Audio - Key([], 'XF86AudioMute', lazy.spawn(amixer_cmd + ' 1+ toggle')), # noqa - Key([], 'XF86AudioRaiseVolume', lazy.spawn(amixer_cmd + ' 5%+')), # noqa - Key([], 'XF86AudioLowerVolume', lazy.spawn(amixer_cmd + ' 5%-')), # noqa - Key([], 'XF86AudioPlay', lazy.spawn(spotify_cmd + 'PlayPause')), # noqa - Key([], 'XF86AudioNext', lazy.spawn(spotify_cmd + 'Next')), # noqa - Key([], 'XF86AudioPrev', lazy.spawn(spotify_cmd + 'Previous')), # noqa - - Key([mod], 'bracketleft', lazy.function(sc.change_sink('prev'))), # noqa - Key([mod], 'bracketright', lazy.function(sc.change_sink('next'))), # noqa - Key([], 'F8', lazy.function(sc.swap_profile())), # noqa - - # Apps - Key([mod], 't', lazy.spawn(rofi_cmd)), # noqa - Key([mod], 'Return', lazy.spawn(TERM)), # noqa - Key([mod], 'b', lazy.spawn(BROWSER)), # noqa - Key([mod], 'g', lazy.function(app_or_group('game', 'steam'))), # noqa - Key([mod], 'n', lazy.function(app_or_group('chat', 'discord'))), # noqa - Key([mod], 'm', lazy.function(app_or_group('music', MUSIC_PLAYER))), # noqa - - # Screenshots - Key([], 'Print', lazy.function(screenshot())), # noqa - Key(['control'], 'Print', lazy.spawn('deepin-screenshot')), # noqa -] - -for i in 'asdfuiop': - keys.append(Key([mod], i, lazy.function(go_to_group(i)))) # noqa - keys.append(Key([mod, 'shift'], i, lazy.window.togroup(i))) # noqa - -mouse = [ - Drag([mod], "Button1", lazy.window.set_position_floating(), - start=lazy.window.get_position()), - Drag([mod, 'control'], "Button1", lazy.window.set_size_floating(), - start=lazy.window.get_size()), -] diff --git a/dot_config/qtile/old_configs/sweenu/util/__main__.py b/dot_config/qtile/old_configs/sweenu/util/__main__.py deleted file mode 100644 index b455da1..0000000 --- a/dot_config/qtile/old_configs/sweenu/util/__main__.py +++ /dev/null @@ -1,23 +0,0 @@ -from functools import wraps -from subprocess import run, PIPE -from typing import Callable, Any - -import parse - - -def qtile_func(func: Callable[..., Any]) -> Callable[..., Any]: - """ - This decorator makes a function suitable to be used as a parameter for - `lazy.function()` by making the wrapped function return a function that - takes the qtile instance as first parameter. - """ - @wraps(func) - def wrapper(*args, **kwargs): - def f(qtile): - func(*args, **kwargs) - return f - return wrapper - - -def notify(summary: str, body: str, urgency: str='normal') -> None: - run(['notify-send', '-u', urgency, summary, body]) diff --git a/dot_config/qtile/old_configs/sweenu/util/backlight.py b/dot_config/qtile/old_configs/sweenu/util/backlight.py deleted file mode 100644 index c197b19..0000000 --- a/dot_config/qtile/old_configs/sweenu/util/backlight.py +++ /dev/null @@ -1,50 +0,0 @@ -from subprocess import run, PIPE -from typing import Optional - -from pynput import mouse - -from . import qtile_func - -class Backlight: - def __init__(self, ctrl: Optional[str]=None) -> None: - self.command = ['xbacklight'] - if ctrl: - self.command += ['-ctrl', ctrl] - - def _get_brightness(self) -> int: - return int(run(self.command + ['-get'], stdout=PIPE).stdout) - - def _set_brightness(self, percentage: int) -> None: - run(self.command + [f'-set', str(percentage)]) - - @qtile_func - def change_backlight(self, action: str) -> None: - """ - Increase or decrease bightness. - Takes 'dec' or 'inc' as parameter. Goes 1% percent at a time from - 1% to 40% and 10% at a time from 40% to 100%. - """ - brightness = self._get_brightness() - if brightness != 1 or action != 'dec': - if (brightness > 49 and action == 'dec') \ - or (brightness > 39 and action == 'inc'): - run(self.command + [f'-{action}', '10', '-fps', '10']) - else: - run(self.command + [f'-{action}', '1']) - - @qtile_func - def turn_off_screen(self, screen_offset: int) -> None: - """ - Turn off the laptop's screen. - Use xset if there is only one screen, else, set backlight to - zero. In both case, moving the mouse will turn on the screen. - """ - current_brightness = self._get_brightness() - self._set_brightness(0) - - def on_move(x: int, y: int): - if x > screen_offset: - self._set_brightness(current_brightness) - raise mouse.Listener.StopException - - mouse.Listener(on_move=on_move).start() diff --git a/dot_config/qtile/old_configs/sweenu/util/monitor.py b/dot_config/qtile/old_configs/sweenu/util/monitor.py deleted file mode 100644 index fe4542a..0000000 --- a/dot_config/qtile/old_configs/sweenu/util/monitor.py +++ /dev/null @@ -1,24 +0,0 @@ -from subprocess import run -from pathlib import Path -from typing import Optional - -from libqtile.log_utils import logger -from libqtile.xcbq import Monitor - -from .backlight import Backlight - - -Side = str # one of 'left-of', 'right-of', 'above', 'below' or 'same-as' - - -def enable_monitor(monitor: Monitor, primary: bool=False, side: Optional[Side]=None, - relative_monitor: Optional[Monitor]=None) -> None: - command = ['xrandr', '--output', monitor.name, '--auto'] - if primary: - command += ['--primary'] - if side: - if not relative_monitor: - raise Exception('Need a monitor to be relative to') - command += ['--{}'.format(side), relative_monitor.name] - run(command) - logger.info(f'Running command: {" ".join(command)}') diff --git a/dot_config/qtile/old_configs/sweenu/util/screenshot.py b/dot_config/qtile/old_configs/sweenu/util/screenshot.py deleted file mode 100644 index c689f81..0000000 --- a/dot_config/qtile/old_configs/sweenu/util/screenshot.py +++ /dev/null @@ -1,16 +0,0 @@ -from time import time -from pathlib import Path -from subprocess import run, PIPE - -from . import qtile_func - -@qtile_func -def screenshot(save: bool=True, copy: bool=True) -> None: - shot = run(['maim'], stdout=PIPE) - if save: - path = Path.home() / 'Pictures' - path /= f'screenshot_{str(int(time() * 100))}.png' - with open(path, 'wb') as sc: - sc.write(shot.stdout) - if copy: - run('xclip -sel clip -t image/png'.split(), input=shot.stdout) diff --git a/dot_config/qtile/old_configs/sweenu/util/soundcard.py b/dot_config/qtile/old_configs/sweenu/util/soundcard.py deleted file mode 100644 index 63c3cae..0000000 --- a/dot_config/qtile/old_configs/sweenu/util/soundcard.py +++ /dev/null @@ -1,79 +0,0 @@ -from subprocess import run, PIPE - -import parse - -from . import qtile_func, notify - -class SoundCard(): - def __init__(self, primary_card_name): - self.primary_card = primary_card_name - - def get_current_sink(self): - cp = run(['pactl', 'info'], stdout=PIPE) - output = cp.stdout.decode('utf-8') - return parse.search('Default Sink: {}\n', output)[0] - - def list_sinks(self): - """Generator that yields for each sink, the sink and card name.""" - cp = run(['pactl', 'list', 'sinks'], stdout=PIPE) - output = cp.stdout.decode('utf-8') - for sink in output.split('\nSink'): - sink_name = parse.search('Name: {}\n', sink)[0] - card_name = parse.search('alsa.card_name = "{}"', sink)[0] - yield sink_name, card_name - - def set_new_sink(self, sink_card_tuple): - run(['pactl', 'set-default-sink', sink_card_tuple[0]]) - - def list_sink_inputs(self): - cp = run(['pactl', 'list', 'short', 'sink-inputs'], stdout=PIPE) - output = cp.stdout.decode('utf-8') - return {line.split()[0] for line in output.split('\n') if line} - - def move_sink_input(self, name, new_sink): - run(['pactl', 'move-sink-input', name, new_sink]) - - def get_current_profile(self): - cp = run(['pactl', 'list', 'cards'], stdout=PIPE) - cp = run(['grep', 'Active'], stdout=PIPE, input=cp.stdout) - - return 'hdmi' if b'hdmi' in cp.stdout else 'analog' - - def set_profile(self, profile): - cmd = f'output:{profile}-stereo+input:analog-stereo' - run(['pactl', 'set-card-profile', self.primary_card, cmd]) - - @qtile_func - def change_sink(self, direction): - sinks = list(self.list_sinks()) - - # get the index of the tuple containing the current default sink - current_sink = self.get_current_sink() - for index, tup in enumerate(sinks): - if current_sink in tup: - default_sink_index = index - break - - if direction == 'next': - new_sink = sinks[default_sink_index - 1] - elif direction == 'prev': - new_sink = sinks[(default_sink_index + 1) % len(sinks)] - - self.set_new_sink(new_sink) - notify('Sound Card', new_sink[1]) - - # move current sink inputs, if any, to the new default sink - sink_inputs = self.list_sink_inputs() - if sink_inputs: - for sink_input in sink_inputs: - self.move_sink_input(sink_input, new_sink[0]) - - @qtile_func - def swap_profile(self): - profile = self.get_current_profile() - if profile == 'analog': - self.set_profile('hdmi') - notify('Sound Profile', 'HDMI') - elif profile == 'hdmi': - self.set_profile('analog') - notify('Sound Profile', 'Analog') diff --git a/dot_config/qtile/old_configs/sweenu/widgets.py b/dot_config/qtile/old_configs/sweenu/widgets.py deleted file mode 100644 index 8ff287e..0000000 --- a/dot_config/qtile/old_configs/sweenu/widgets.py +++ /dev/null @@ -1,9 +0,0 @@ -import subprocess - -from libqtile import widget - - -class CheckUpdates(widget.CheckUpdates): - def __init__(self, **config): - super().__init__(**config) - self.cmd_dict.update({'Arch': ('pikaur -Sup', 0)}) diff --git a/dot_config/qtile/screens.py b/dot_config/qtile/screens.py deleted file mode 100644 index 4789a26..0000000 --- a/dot_config/qtile/screens.py +++ /dev/null @@ -1,5 +0,0 @@ -from libqtile.config import Screen - -from bars import top - -screens = [Screen(top=top)] diff --git a/dot_config/qtile/scripts/executable_autostart.sh b/dot_config/qtile/scripts/executable_autostart.sh deleted file mode 100644 index 6f2e081..0000000 --- a/dot_config/qtile/scripts/executable_autostart.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash - -function run { - if ! pgrep "$1"; then - "$@" & - fi -} - -setxkbmap -layout de - -run nm-applet -run xfce4-power-manager -run blueberry-tray -run picom -run volumeicon -# run deadd-notification-center - -run /usr/bin/lxqt-policykit-agent -run nitrogen --restore diff --git a/dot_config/qtile/themes/ayu-dark.json b/dot_config/qtile/themes/ayu-dark.json deleted file mode 100644 index d48ac7f..0000000 --- a/dot_config/qtile/themes/ayu-dark.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "black": "#01060e", - "red": "#ea6c73", - "green": "#91b362", - "yellow": "#f9af4f", - "blue": "#53bdfa", - "purple": "#fae994", - "cyan": "#90e1c6", - "white": "#c7c7c7", - "background": "#brb1ad", - "foreground": "#0a0e14" -} \ No newline at end of file diff --git a/dot_config/qtile/themes/dracula.json b/dot_config/qtile/themes/dracula.json deleted file mode 100644 index 49d79d1..0000000 --- a/dot_config/qtile/themes/dracula.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "black": "#21222c", - "red": "#ff5555", - "green": "#50fa7b", - "yellow": "#ffcb6b", - "blue": "#82aaff", - "purple": "#c792ea", - "cyan": "#8be9fd", - "white": "#f8f8f2", - "background": "#212121", - "foreground": "#f8f8f2" -} \ No newline at end of file diff --git a/dot_config/qtile/themes/hopscotch.json b/dot_config/qtile/themes/hopscotch.json deleted file mode 100644 index 4fcf47b..0000000 --- a/dot_config/qtile/themes/hopscotch.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "black": "#322931", - "red": "#dd464c", - "green": "#8fc13e", - "yellow": "#fdcc59", - "blue": "#1290bf", - "purple": "#c85e7c", - "cyan": "#149b93", - "white": "#b9b5b8", - "background": "#322931", - "foreground": "#b9b5b8" -} diff --git a/dot_config/qtile/themes/material-darker.json b/dot_config/qtile/themes/material-darker.json deleted file mode 100644 index fa6db4a..0000000 --- a/dot_config/qtile/themes/material-darker.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "black": "#000000", - "red": "#ff5370", - "green": "#c3e88d", - "yellow": "#ffcb6b", - "blue": "#82aaff", - "purple": "#c792ea", - "cyan": "#89ddff", - "white": "#ffffff", - "background": "#212121", - "foreground": "#eeffff" -} \ No newline at end of file diff --git a/dot_config/qtile/themes/nord.json b/dot_config/qtile/themes/nord.json deleted file mode 100644 index f6b8731..0000000 --- a/dot_config/qtile/themes/nord.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "black": "#3b4252", - "red": "#bf616a", - "green": "#a3be8c", - "yellow": "#ebcb8b", - "blue": "#81a1c1", - "purple": "#b48ead", - "cyan": "#88c0d0", - "white": "#e5e9f0", - "background": "#2e3440", - "foreground": "#d8dee9" -} diff --git a/dot_config/qtile/themes/one-dark.json b/dot_config/qtile/themes/one-dark.json deleted file mode 100644 index c70a4a2..0000000 --- a/dot_config/qtile/themes/one-dark.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "black": "#131613", - "red": "#e06c75", - "green": "#98c379", - "yellow": "#d19a66", - "blue": "#61afef", - "purple": "#c678dd", - "cyan": "#56b6c2", - "white": "#abb2bf", - "background": "#282c34", - "foreground": "#abb2bf" -} diff --git a/dot_config/qtile/themes/operator.json b/dot_config/qtile/themes/operator.json deleted file mode 100644 index 468f1fd..0000000 --- a/dot_config/qtile/themes/operator.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "black": "#5a5a5a", - "red": "#ca372d", - "green": "#4d7b3a", - "yellow": "#d4d697", - "blue": "#4387cf", - "purple": "#b86cb4", - "cyan": "#72d5c6", - "white": "#ced4cd", - "background": "#191919", - "foreground": "#c3cac2" -} \ No newline at end of file diff --git a/dot_config/qtile/themes/royal.json b/dot_config/qtile/themes/royal.json deleted file mode 100644 index f34f19a..0000000 --- a/dot_config/qtile/themes/royal.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "black": "#241f2b", - "red": "#91284c", - "green": "#23801c", - "yellow": "#b49d27", - "blue": "#6580b0", - "purple": "#674d96", - "cyan": "#8aaabe", - "white": "#524966", - "background": "#100815", - "foreground": "#514968" -} \ No newline at end of file diff --git a/dot_config/qtile/themes/seashells.json b/dot_config/qtile/themes/seashells.json deleted file mode 100644 index 930fcaf..0000000 --- a/dot_config/qtile/themes/seashells.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "black": "#17384c", - "red": "#d15123", - "green": "#027c9b", - "yellow": "#fca02f", - "blue": "#1e4950", - "purple": "#68d4f1", - "cyan": "#50a3b5", - "white": "#deb88d", - "background": "#09141b", - "foreground": "#deb88d" -} \ No newline at end of file diff --git a/dot_config/qtile/themes/smyck.json b/dot_config/qtile/themes/smyck.json deleted file mode 100644 index a08c684..0000000 --- a/dot_config/qtile/themes/smyck.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "black": "#000000", - "red": "#b84131", - "green": "#7da900", - "yellow": "#c4a500", - "blue": "#62a3c4", - "purple": "#ba8acc", - "cyan": "#207383", - "white": "#a1a1a1", - "background": "#1b1b1b", - "foreground": "#f7f7f7" -} \ No newline at end of file diff --git a/dot_config/qtile/themes/spacedust.json b/dot_config/qtile/themes/spacedust.json deleted file mode 100644 index 00976f7..0000000 --- a/dot_config/qtile/themes/spacedust.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "black": "#6e5346", - "red": "#e35b00", - "green": "#5cab96", - "yellow": "#e3cd7b", - "blue": "#0f548b", - "purple": "#e35b00", - "cyan": "#06afc7", - "white": "#f0f1ce", - "background": "#0a1e24", - "foreground": "#ecf0c1" -} \ No newline at end of file diff --git a/dot_config/qtile/themes/spacegray.json b/dot_config/qtile/themes/spacegray.json deleted file mode 100644 index a243554..0000000 --- a/dot_config/qtile/themes/spacegray.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "black": "#000000", - "red": "#b04b57", - "green": "#87b379", - "yellow": "#e5c179", - "blue": "#7d8fa4", - "purple": "#a47996", - "cyan": "#85a7a5", - "white": "#b3b8c3", - "background": "#20242d", - "foreground": "#b3b8c3" -} \ No newline at end of file diff --git a/dot_config/qtile/themes/square.json b/dot_config/qtile/themes/square.json deleted file mode 100644 index 28da9a4..0000000 --- a/dot_config/qtile/themes/square.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "black": "#050505", - "red": "#e9897c", - "green": "#b6377d", - "yellow": "#ecebbe", - "blue": "#a9cdeb", - "purple": "#75507b", - "cyan": "#c9caec", - "white": "#f2f2f2", - "background": "#1a1a1a", - "foreground": "#acacab" -} \ No newline at end of file diff --git a/dot_config/qtile/themes/tomorrow-nb.json b/dot_config/qtile/themes/tomorrow-nb.json deleted file mode 100644 index 1f4416a..0000000 --- a/dot_config/qtile/themes/tomorrow-nb.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "black": "#000000", - "red": "#d54e53", - "green": "#b9ca4a", - "yellow": "#e7c547", - "blue": "#7aa6da", - "purple": "#c397d8", - "cyan": "#70c0b1", - "white": "#ffffff", - "background": "#000000", - "foreground": "#eaeaea" -} \ No newline at end of file diff --git a/dot_config/starship.toml b/dot_config/starship.toml deleted file mode 100644 index 31eebd9..0000000 --- a/dot_config/starship.toml +++ /dev/null @@ -1,8 +0,0 @@ -add_newline = false - -format = """$env_var $all""" - -[env_var.DISTROICON] -format = '[$env_value](white)' -variable = "DISTROICON" -disabled = false diff --git a/dot_config/zsh-abbr/private_user-abbreviations b/dot_config/zsh-abbr/private_user-abbreviations deleted file mode 100644 index b6e2458..0000000 --- a/dot_config/zsh-abbr/private_user-abbreviations +++ /dev/null @@ -1,8 +0,0 @@ -abbr -g "g"="git" -abbr -g "git m"="git checkout main" -abbr -g "git rei"="git rebase -i" -abbr -g "git reim"="git rebase -i main" -abbr -g "git ri"="git rebase -i" -abbr "m"="git checkout main" -abbr "rei"="git rebase -i" -abbr "reim"="git rebase -i main" diff --git a/dot_config/zsh/dot_zsh_plugins.txt b/dot_config/zsh/dot_zsh_plugins.txt index 2767945..34dc74b 100644 --- a/dot_config/zsh/dot_zsh_plugins.txt +++ b/dot_config/zsh/dot_zsh_plugins.txt @@ -1,6 +1,3 @@ -# lscolors -trapd00r/LS_COLORS - # ohmyzsh getantidote/use-omz ohmyzsh/ohmyzsh path:lib @@ -12,6 +9,7 @@ ohmyzsh/ohmyzsh path:plugins/fzf ohmyzsh/ohmyzsh path:plugins/ssh-agent # utility plugins +trapd00r/LS_COLORS 3v1n0/zsh-bash-completions-fallback mroth/evalcache zpm-zsh/colorize From b111001de30ad9a0e8e60b211403874b2a971a6f Mon Sep 17 00:00:00 2001 From: eeleater Date: Fri, 16 Aug 2024 00:07:37 +0200 Subject: [PATCH 41/97] updated antidote in prep for usage on laptop --- dot_config/zsh/dot_zshrc.tmpl | 8 ++++++-- dot_config/zsh/files/aliases.zsh | 9 +++++++++ dot_config/zsh/files/evalstuff.zsh | 5 ----- dot_config/zsh/files/functions.zsh | 20 -------------------- 4 files changed, 15 insertions(+), 27 deletions(-) delete mode 100644 dot_config/zsh/files/evalstuff.zsh delete mode 100644 dot_config/zsh/files/functions.zsh diff --git a/dot_config/zsh/dot_zshrc.tmpl b/dot_config/zsh/dot_zshrc.tmpl index c6ca66d..a577fb1 100644 --- a/dot_config/zsh/dot_zshrc.tmpl +++ b/dot_config/zsh/dot_zshrc.tmpl @@ -24,10 +24,14 @@ source "$XDG_DATA_HOME"/antidote/antidote.zsh zstyle ':antidote:bundle' use-friendly-names 'yes' antidote load +# load programs +_evalcache zoxide init --cmd cd zsh +_evalcache atuin init zsh +_evalcache navi widget zsh +_evalcache direnv hook zsh + # source files -source "$ZDOTDIR"/files/evalstuff.zsh source "$ZDOTDIR"/files/aliases.zsh -source "$ZDOTDIR"/files/functions.zsh # completion files source "$ZDOTDIR"/files/sshcomp.zsh diff --git a/dot_config/zsh/files/aliases.zsh b/dot_config/zsh/files/aliases.zsh index c5bcaf0..3f0c27a 100644 --- a/dot_config/zsh/files/aliases.zsh +++ b/dot_config/zsh/files/aliases.zsh @@ -19,3 +19,12 @@ if (( ${+commands[nvim]} )); then alias vim="nvim"; fi alias peda="gdb -iex 'source /usr/share/peda/peda.py' --nh -q" alias gef="gdb -iex 'source /usr/share/gef/gef.py' --nh -q" alias pwndbg="gdb -iex 'source /usr/share/pwndbg/gdbinit.py' --nh -q" + +# ranger as cli file manager +run_ranger () { + echo + ranger < $TTY + zle redisplay +} +zle -N run_ranger +bindkey '^f' run_ranger diff --git a/dot_config/zsh/files/evalstuff.zsh b/dot_config/zsh/files/evalstuff.zsh deleted file mode 100644 index 10e3509..0000000 --- a/dot_config/zsh/files/evalstuff.zsh +++ /dev/null @@ -1,5 +0,0 @@ -# evalstuff -_evalcache zoxide init --cmd cd zsh -_evalcache atuin init zsh -_evalcache navi widget zsh -_evalcache direnv hook zsh diff --git a/dot_config/zsh/files/functions.zsh b/dot_config/zsh/files/functions.zsh deleted file mode 100644 index 1fbf928..0000000 --- a/dot_config/zsh/files/functions.zsh +++ /dev/null @@ -1,20 +0,0 @@ -pet_select () { - BUFFER=$(pet search --query "$LBUFFER") - CURSOR=$#BUFFER - zle redisplay -} -zle -N pet_select -bindkey '^s' pet_select - -prev () { - PREV=$(fc -lrn | head -n 1) - sh -c "pet new $(printf %q "$PREV")" -} - -run_ranger () { - echo - ranger < $TTY - zle redisplay -} -zle -N run_ranger -bindkey '^f' run_ranger From ce6152613c7772c59aaedfdb3ee552592658a15e Mon Sep 17 00:00:00 2001 From: eeleater Date: Fri, 16 Aug 2024 00:19:33 +0200 Subject: [PATCH 42/97] updated antidote in prep for usage on laptop --- dot_config/zsh/files/sshcomp.zsh | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/dot_config/zsh/files/sshcomp.zsh b/dot_config/zsh/files/sshcomp.zsh index 799786b..00ace8a 100644 --- a/dot_config/zsh/files/sshcomp.zsh +++ b/dot_config/zsh/files/sshcomp.zsh @@ -11,14 +11,6 @@ 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.*' '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)"$( Date: Mon, 19 Aug 2024 08:24:01 +0200 Subject: [PATCH 43/97] changed ssh completion somewhat --- dot_config/zsh/files/sshcomp.zsh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dot_config/zsh/files/sshcomp.zsh b/dot_config/zsh/files/sshcomp.zsh index 00ace8a..632ce03 100644 --- a/dot_config/zsh/files/sshcomp.zsh +++ b/dot_config/zsh/files/sshcomp.zsh @@ -7,8 +7,8 @@ zstyle ':completion:*:(scp|sshfs|rsync):*' group-order users files all-files hos zstyle ':completion:*:(ssh|mosh):*' group-order users hosts-domain hosts-host users hosts-ipaddr 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-host' ignored-patterns '*(.|:)*' loopback localhost broadcasthost 'ip6-*' +zstyle ':completion:*:(ssh|scp|sshfs|mosh|rsync):*:hosts-domain' ignored-patterns '<->.<->.<->.<->' '^[-[:alnum:]]##(.[-[:alnum:]]##)##' '*@*' '*.eeleater.org' zstyle ':completion:*:(ssh|scp|sshfs|mosh|rsync):*:hosts-ipaddr' ignored-patterns '^(<->.<->.<->.<->|(|::)([[:xdigit:].]##:(#c,2))##(|%*))' '127.*' '255.255.255.255' '::1' 'fe80::*' 'ff02::*' [ -r ~/.ssh/known_hosts ] && _ssh_hosts=(${${${${(f)"$(<$HOME/.ssh/known_hosts)"}:#[\|]*}%%\ *}%%,*}) || _ssh_hosts=() From a2bd1ac7b1c09bbb1c57a71d9c87f33171293678 Mon Sep 17 00:00:00 2001 From: eeleater Date: Mon, 19 Aug 2024 09:51:34 +0200 Subject: [PATCH 44/97] updated antidote --- dot_config/topgrade.toml.tmpl | 2 +- dot_config/zsh/dot_zshenv.tmpl | 4 ++-- dot_config/zsh/dot_zshrc.tmpl | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dot_config/topgrade.toml.tmpl b/dot_config/topgrade.toml.tmpl index 1098f6a..7a5d46c 100644 --- a/dot_config/topgrade.toml.tmpl +++ 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", "dotnet", "flatpak", "shell", "snap", "firmware", "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", "sheldon", "clam_av_db"] # Skip Notify skip_notify = true diff --git a/dot_config/zsh/dot_zshenv.tmpl b/dot_config/zsh/dot_zshenv.tmpl index c409fc4..ce579b8 100644 --- a/dot_config/zsh/dot_zshenv.tmpl +++ b/dot_config/zsh/dot_zshenv.tmpl @@ -60,8 +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" }} +{{- if eq .chezmoi.osRelease.id "endeavouros" }} export DIFFPROG='meld' -{{ end }} +{{- 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 a577fb1..c92092d 100644 --- a/dot_config/zsh/dot_zshrc.tmpl +++ b/dot_config/zsh/dot_zshrc.tmpl @@ -2,12 +2,14 @@ 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 # options -setopt NO_CLOBBER INTERACTIVE_COMMENTS HASH_EXECUTABLES_ONLY NUMERIC_GLOB_SORT +setopt NO_CLOBBER unsetopt FLOW_CONTROL # deduplicate path typeset -U path PATH +{{- if eq .chezmoi.osRelease.id "endeavouros" }} path+=("$XDG_DATA_HOME"/JetBrains/Toolbox/scripts) # jetbrains toolbox +{{- end }} path+=("$HOME"/.local/bin) # local bin # startup banner @@ -32,8 +34,6 @@ _evalcache direnv hook zsh # source files source "$ZDOTDIR"/files/aliases.zsh - -# completion files source "$ZDOTDIR"/files/sshcomp.zsh # local overrides From aa0d6058332eb90c7b7a722a5443e41a2eccb4b7 Mon Sep 17 00:00:00 2001 From: Nikolas Weger Date: Tue, 20 Aug 2024 08:07:14 +0200 Subject: [PATCH 45/97] added kubernetes server to topgrade --- dot_config/topgrade.toml.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dot_config/topgrade.toml.tmpl b/dot_config/topgrade.toml.tmpl index 7a5d46c..3c9b9d4 100644 --- a/dot_config/topgrade.toml.tmpl +++ b/dot_config/topgrade.toml.tmpl @@ -24,7 +24,7 @@ skip_notify = true {{- if eq .chezmoi.hostname "pxm" }} remote_topgrades = ["docker", "kali", "mail"] {{- else }} -remote_topgrades = ["pxm", "web", "infra"] +remote_topgrades = ["pxm", "web", "infra", "kube"] {{- end }} # Arguments to pass SSH when upgrading remote systems From 0a6161e933e7d9f9b02e85584ffd1fa54f3e4766 Mon Sep 17 00:00:00 2001 From: eeleater Date: Wed, 21 Aug 2024 22:13:17 +0200 Subject: [PATCH 46/97] updated antidote --- dot_config/zsh/dot_zshrc.tmpl | 1 - 1 file changed, 1 deletion(-) diff --git a/dot_config/zsh/dot_zshrc.tmpl b/dot_config/zsh/dot_zshrc.tmpl index c92092d..dad47ec 100644 --- a/dot_config/zsh/dot_zshrc.tmpl +++ b/dot_config/zsh/dot_zshrc.tmpl @@ -29,7 +29,6 @@ antidote load # load programs _evalcache zoxide init --cmd cd zsh _evalcache atuin init zsh -_evalcache navi widget zsh _evalcache direnv hook zsh # source files From d2b2840b29c072dde7bba3e27c0e06da4a5cb0d5 Mon Sep 17 00:00:00 2001 From: eeleater Date: Wed, 21 Aug 2024 23:08:24 +0200 Subject: [PATCH 47/97] updated antidote --- dot_config/zsh/dot_zsh_plugins.txt | 1 + dot_config/zsh/dot_zshrc.tmpl | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dot_config/zsh/dot_zsh_plugins.txt b/dot_config/zsh/dot_zsh_plugins.txt index 34dc74b..51ccb1c 100644 --- a/dot_config/zsh/dot_zsh_plugins.txt +++ b/dot_config/zsh/dot_zsh_plugins.txt @@ -12,6 +12,7 @@ ohmyzsh/ohmyzsh path:plugins/ssh-agent trapd00r/LS_COLORS 3v1n0/zsh-bash-completions-fallback mroth/evalcache +QuarticCat/zsh-smartcache zpm-zsh/colorize twopizza9621536/zsh-eza fdellwing/zsh-bat diff --git a/dot_config/zsh/dot_zshrc.tmpl b/dot_config/zsh/dot_zshrc.tmpl index dad47ec..248942a 100644 --- a/dot_config/zsh/dot_zshrc.tmpl +++ b/dot_config/zsh/dot_zshrc.tmpl @@ -27,9 +27,9 @@ zstyle ':antidote:bundle' use-friendly-names 'yes' antidote load # load programs -_evalcache zoxide init --cmd cd zsh -_evalcache atuin init zsh -_evalcache direnv hook zsh +smartcache eval zoxide init --cmd cd zsh +smartcache eval atuin init zsh +smartcache eval direnv hook zsh # source files source "$ZDOTDIR"/files/aliases.zsh From f6452473219a76a616039d68370ec3b4cf1ff676 Mon Sep 17 00:00:00 2001 From: eeleater Date: Thu, 22 Aug 2024 11:11:28 +0200 Subject: [PATCH 48/97] updated antidote --- dot_config/zsh/dot_zsh_plugins.txt | 2 +- dot_config/zsh/files/aliases.zsh | 26 +++++++++++++++++++++++--- dot_local/bin/executable_joke | 4 ++++ 3 files changed, 28 insertions(+), 4 deletions(-) diff --git a/dot_config/zsh/dot_zsh_plugins.txt b/dot_config/zsh/dot_zsh_plugins.txt index 51ccb1c..b67bf66 100644 --- a/dot_config/zsh/dot_zsh_plugins.txt +++ b/dot_config/zsh/dot_zsh_plugins.txt @@ -13,7 +13,7 @@ trapd00r/LS_COLORS 3v1n0/zsh-bash-completions-fallback mroth/evalcache QuarticCat/zsh-smartcache -zpm-zsh/colorize +unixorn/warhol.plugin.zsh twopizza9621536/zsh-eza fdellwing/zsh-bat amyreese/zsh-titles diff --git a/dot_config/zsh/files/aliases.zsh b/dot_config/zsh/files/aliases.zsh index 3f0c27a..d23562c 100644 --- a/dot_config/zsh/files/aliases.zsh +++ b/dot_config/zsh/files/aliases.zsh @@ -1,6 +1,3 @@ -# temp fix for eza -alias ls='eza -F -gh --group-directories-first --git --git-ignore --icons --color-scale all --hyperlink' - alias grep='rg' alias find='fd' @@ -20,6 +17,21 @@ alias peda="gdb -iex 'source /usr/share/peda/peda.py' --nh -q" alias gef="gdb -iex 'source /usr/share/gef/gef.py' --nh -q" alias pwndbg="gdb -iex 'source /usr/share/pwndbg/gdbinit.py' --nh -q" +# add previous command to pet +function prev() { + PREV=$(fc -lrn | head -n 1) + sh -c "pet new `printf %q "$PREV"`" +} + +# select from pet snippets +function pet-select() { + BUFFER=$(pet search --query "$LBUFFER") + CURSOR=$#BUFFER + zle redisplay +} +zle -N pet-select +bindkey '^s' pet-select + # ranger as cli file manager run_ranger () { echo @@ -28,3 +40,11 @@ run_ranger () { } zle -N run_ranger bindkey '^f' run_ranger + +function ss() { + command grc --colour=auto ss "$@" +} + +function gi() { + curl -sLw "\n" "https://www.toptal.com/developers/gitignore/api/$@" +} diff --git a/dot_local/bin/executable_joke b/dot_local/bin/executable_joke index 248c9fa..d8502e7 100644 --- a/dot_local/bin/executable_joke +++ b/dot_local/bin/executable_joke @@ -17,4 +17,8 @@ case "$1" in echo -n "Daily Hackerquote: " awk 'NR=='$((1 + RANDOM % $lines ))'{print;exit}' "$file" ;; +"fact") + echo "Daily Facts:" + curl -s 'https://randomfactgenerator.net/' | awk -v RS='' '/
/{gsub(/.*
/,""); print "- " $0}' + ;; esac From be8b4ff00bf914e8ae083e0a77d8bf9aad40691d Mon Sep 17 00:00:00 2001 From: eeleater Date: Wed, 11 Sep 2024 15:31:35 +0200 Subject: [PATCH 49/97] updated antidote --- dot_config/topgrade.toml.tmpl | 4 ++++ dot_config/zsh/dot_zshenv.tmpl | 1 + 2 files changed, 5 insertions(+) diff --git a/dot_config/topgrade.toml.tmpl b/dot_config/topgrade.toml.tmpl index 3c9b9d4..aba3f76 100644 --- a/dot_config/topgrade.toml.tmpl +++ b/dot_config/topgrade.toml.tmpl @@ -3,7 +3,11 @@ #assume_yes = true # Disable specific steps - same options as the command line flag +{{- if 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 diff --git a/dot_config/zsh/dot_zshenv.tmpl b/dot_config/zsh/dot_zshenv.tmpl index ce579b8..6b5d4d3 100644 --- a/dot_config/zsh/dot_zshenv.tmpl +++ b/dot_config/zsh/dot_zshenv.tmpl @@ -40,6 +40,7 @@ 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 From 9cbe200c92cffd079e6190383a26001e7c2beb93 Mon Sep 17 00:00:00 2001 From: eeleater Date: Fri, 13 Sep 2024 11:35:43 +0200 Subject: [PATCH 50/97] removed docker vm from vm host --- dot_config/topgrade.toml.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dot_config/topgrade.toml.tmpl b/dot_config/topgrade.toml.tmpl index aba3f76..5082ce3 100644 --- a/dot_config/topgrade.toml.tmpl +++ b/dot_config/topgrade.toml.tmpl @@ -26,7 +26,7 @@ skip_notify = true # List of remote machines with Topgrade installed on them {{- if eq .chezmoi.hostname "pxm" }} -remote_topgrades = ["docker", "kali", "mail"] +remote_topgrades = ["kali", "mail"] {{- else }} remote_topgrades = ["pxm", "web", "infra", "kube"] {{- end }} From 7197e4c27ce3a893b9122575e73b7ea932efe4b4 Mon Sep 17 00:00:00 2001 From: eeleater Date: Tue, 24 Sep 2024 14:28:05 +0200 Subject: [PATCH 51/97] set zellij to autostart on ssh connection --- dot_config/zsh/dot_zsh_plugins.txt | 1 + dot_config/zsh/dot_zshenv.tmpl | 1 - dot_config/zsh/dot_zshrc.tmpl | 6 ++++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dot_config/zsh/dot_zsh_plugins.txt b/dot_config/zsh/dot_zsh_plugins.txt index b67bf66..486a195 100644 --- a/dot_config/zsh/dot_zsh_plugins.txt +++ b/dot_config/zsh/dot_zsh_plugins.txt @@ -18,6 +18,7 @@ twopizza9621536/zsh-eza fdellwing/zsh-bat amyreese/zsh-titles Aloxaf/fzf-tab +#https://git.eeleater.org/eeleater/zsh-auto-notify-ntfy-integration # other plugins urbainvaes/fzf-marks diff --git a/dot_config/zsh/dot_zshenv.tmpl b/dot_config/zsh/dot_zshenv.tmpl index 6b5d4d3..53a8c15 100644 --- a/dot_config/zsh/dot_zshenv.tmpl +++ b/dot_config/zsh/dot_zshenv.tmpl @@ -51,7 +51,6 @@ export PYTHONSTARTUP=/etc/python/pythonrc # stuff export ZELLIJ_AUTO_ATTACH=true export ZELLIJ_AUTO_EXIT=true -export TERMINALNAME=$(fastfetch --pipe -s Terminal 2>/dev/null | awk '{print $2}') 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' diff --git a/dot_config/zsh/dot_zshrc.tmpl b/dot_config/zsh/dot_zshrc.tmpl index 248942a..80ca7f6 100644 --- a/dot_config/zsh/dot_zshrc.tmpl +++ b/dot_config/zsh/dot_zshrc.tmpl @@ -1,6 +1,8 @@ -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 +{{- 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 From 62a7bcc139f5b14867f3d773adf43cae1d9413ab Mon Sep 17 00:00:00 2001 From: eeleater Date: Tue, 24 Sep 2024 14:37:34 +0200 Subject: [PATCH 52/97] updated antidote --- dot_config/zsh/dot_zsh_plugins.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dot_config/zsh/dot_zsh_plugins.txt b/dot_config/zsh/dot_zsh_plugins.txt index 486a195..314da6e 100644 --- a/dot_config/zsh/dot_zsh_plugins.txt +++ b/dot_config/zsh/dot_zsh_plugins.txt @@ -11,18 +11,18 @@ ohmyzsh/ohmyzsh path:plugins/ssh-agent # utility plugins trapd00r/LS_COLORS 3v1n0/zsh-bash-completions-fallback -mroth/evalcache QuarticCat/zsh-smartcache unixorn/warhol.plugin.zsh twopizza9621536/zsh-eza fdellwing/zsh-bat amyreese/zsh-titles Aloxaf/fzf-tab -#https://git.eeleater.org/eeleater/zsh-auto-notify-ntfy-integration # other plugins urbainvaes/fzf-marks +{{- if eq .chezmoi.osRelease.id "endeavouros" }} sobolevn/wakatime-zsh-plugin +{{- end }} laggardkernel/zsh-thefuck MichaelAquilina/zsh-you-should-use asdf-vm/asdf From b19c47e1462c6f94f531d27cb677e159ce83b40b Mon Sep 17 00:00:00 2001 From: eeleater Date: Tue, 24 Sep 2024 14:39:05 +0200 Subject: [PATCH 53/97] updated antidote --- dot_config/zsh/dot_zsh_plugins.txt | 33 ------------------------------ 1 file changed, 33 deletions(-) delete mode 100644 dot_config/zsh/dot_zsh_plugins.txt diff --git a/dot_config/zsh/dot_zsh_plugins.txt b/dot_config/zsh/dot_zsh_plugins.txt deleted file mode 100644 index 314da6e..0000000 --- a/dot_config/zsh/dot_zsh_plugins.txt +++ /dev/null @@ -1,33 +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 -{{- if eq .chezmoi.osRelease.id "endeavouros" }} -sobolevn/wakatime-zsh-plugin -{{- end }} -laggardkernel/zsh-thefuck -MichaelAquilina/zsh-you-should-use -asdf-vm/asdf - -# fish like (load last) -zsh-users/zsh-completions path:src kind:fpath -zsh-users/zsh-autosuggestions -zdharma-continuum/fast-syntax-highlighting From 9d21258b7bba585ae4f975f1ed6a1351f8f62125 Mon Sep 17 00:00:00 2001 From: eeleater Date: Tue, 24 Sep 2024 14:46:04 +0200 Subject: [PATCH 54/97] updated antidote --- dot_config/zsh/dot_zsh_plugins.txt.tmpl | 33 +++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 dot_config/zsh/dot_zsh_plugins.txt.tmpl diff --git a/dot_config/zsh/dot_zsh_plugins.txt.tmpl b/dot_config/zsh/dot_zsh_plugins.txt.tmpl new file mode 100644 index 0000000..314da6e --- /dev/null +++ b/dot_config/zsh/dot_zsh_plugins.txt.tmpl @@ -0,0 +1,33 @@ +# 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 eq .chezmoi.osRelease.id "endeavouros" }} +sobolevn/wakatime-zsh-plugin +{{- end }} +laggardkernel/zsh-thefuck +MichaelAquilina/zsh-you-should-use +asdf-vm/asdf + +# fish like (load last) +zsh-users/zsh-completions path:src kind:fpath +zsh-users/zsh-autosuggestions +zdharma-continuum/fast-syntax-highlighting From fd47b9e9696853ecd841d3368c72b3313ee7684f Mon Sep 17 00:00:00 2001 From: eeleater Date: Fri, 27 Sep 2024 19:01:08 +0200 Subject: [PATCH 55/97] added two scripts for zellij --- dot_local/bin/executable_zellijCreateLayout | 8 ++++++++ dot_local/bin/executable_zellijList | 10 ++++++++++ 2 files changed, 18 insertions(+) create mode 100644 dot_local/bin/executable_zellijCreateLayout create mode 100644 dot_local/bin/executable_zellijList diff --git a/dot_local/bin/executable_zellijCreateLayout b/dot_local/bin/executable_zellijCreateLayout new file mode 100644 index 0000000..c5f252a --- /dev/null +++ b/dot_local/bin/executable_zellijCreateLayout @@ -0,0 +1,8 @@ +#!/usr/bin/env bash +set -euo pipefail +ZJ_LAYOUT_DIR=$(zellij setup --check | grep "LAYOUT DIR" - | grep -o '".*"' - | tr -d '"') + +if [[ -d "${ZJ_LAYOUT_DIR}" ]]; then + ZJ_LAYOUT="$(fd --type file . "${ZJ_LAYOUT_DIR}" | sed 's|.*/||' | fzf || exit)" + zellij --layout "${ZJ_LAYOUT}" +fi diff --git a/dot_local/bin/executable_zellijList b/dot_local/bin/executable_zellijList new file mode 100644 index 0000000..5608f72 --- /dev/null +++ b/dot_local/bin/executable_zellijList @@ -0,0 +1,10 @@ +#!/usr/bin/env bash +ZJ_SESSIONS=$(zellij list-sessions) +NO_SESSIONS=$(echo "${ZJ_SESSIONS}" | wc -l) + +if [ "${NO_SESSIONS}" -ge 2 ]; then + zellij attach \ + "$(echo "${ZJ_SESSIONS}" | fzf)" +else + zellij attach -c +fi From 41cec2dfa6d24aa62533a30dbc39ab26a0164e50 Mon Sep 17 00:00:00 2001 From: eeleater Date: Sun, 29 Sep 2024 20:36:15 +0200 Subject: [PATCH 56/97] updated zellij scripts --- dot_config/zsh/dot_zshrc.tmpl | 1 + dot_local/bin/executable_installOhMyPosh | 0 dot_local/bin/executable_updateOhMyPosh | 0 dot_local/bin/executable_zellijList | 2 +- 4 files changed, 2 insertions(+), 1 deletion(-) mode change 100755 => 100644 dot_local/bin/executable_installOhMyPosh mode change 100755 => 100644 dot_local/bin/executable_updateOhMyPosh diff --git a/dot_config/zsh/dot_zshrc.tmpl b/dot_config/zsh/dot_zshrc.tmpl index 80ca7f6..9c129b9 100644 --- a/dot_config/zsh/dot_zshrc.tmpl +++ b/dot_config/zsh/dot_zshrc.tmpl @@ -32,6 +32,7 @@ antidote load 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 diff --git a/dot_local/bin/executable_installOhMyPosh b/dot_local/bin/executable_installOhMyPosh old mode 100755 new mode 100644 diff --git a/dot_local/bin/executable_updateOhMyPosh b/dot_local/bin/executable_updateOhMyPosh old mode 100755 new mode 100644 diff --git a/dot_local/bin/executable_zellijList b/dot_local/bin/executable_zellijList index 5608f72..cc16b0f 100644 --- a/dot_local/bin/executable_zellijList +++ b/dot_local/bin/executable_zellijList @@ -4,7 +4,7 @@ NO_SESSIONS=$(echo "${ZJ_SESSIONS}" | wc -l) if [ "${NO_SESSIONS}" -ge 2 ]; then zellij attach \ - "$(echo "${ZJ_SESSIONS}" | fzf)" + "$(echo "${ZJ_SESSIONS}" | fzf | cut -d' ' -f1)" else zellij attach -c fi From 887b73a6c588534f77349fc753d4224e6b8dd5e4 Mon Sep 17 00:00:00 2001 From: eeleater Date: Mon, 30 Sep 2024 07:29:21 +0200 Subject: [PATCH 57/97] remove asdf, add mise --- dot_config/zsh/dot_zsh_plugins.txt.tmpl | 1 - 1 file changed, 1 deletion(-) diff --git a/dot_config/zsh/dot_zsh_plugins.txt.tmpl b/dot_config/zsh/dot_zsh_plugins.txt.tmpl index 314da6e..4765d73 100644 --- a/dot_config/zsh/dot_zsh_plugins.txt.tmpl +++ b/dot_config/zsh/dot_zsh_plugins.txt.tmpl @@ -25,7 +25,6 @@ sobolevn/wakatime-zsh-plugin {{- end }} laggardkernel/zsh-thefuck MichaelAquilina/zsh-you-should-use -asdf-vm/asdf # fish like (load last) zsh-users/zsh-completions path:src kind:fpath From e5eb6ae909c45d3417705e38da98171781eff7bb Mon Sep 17 00:00:00 2001 From: Nikolas Weger Date: Wed, 2 Oct 2024 10:25:09 +0200 Subject: [PATCH 58/97] fixed zshrc on other systems, mise not installed --- dot_config/zsh/dot_zshrc.tmpl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dot_config/zsh/dot_zshrc.tmpl b/dot_config/zsh/dot_zshrc.tmpl index 9c129b9..2324a24 100644 --- a/dot_config/zsh/dot_zshrc.tmpl +++ b/dot_config/zsh/dot_zshrc.tmpl @@ -11,6 +11,7 @@ unsetopt FLOW_CONTROL typeset -U path PATH {{- if 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 @@ -32,7 +33,9 @@ antidote load smartcache eval zoxide init --cmd cd zsh smartcache eval atuin init zsh smartcache eval direnv hook zsh +{{- if eq .chezmoi.osRelease.id "endeavouros" }} smartcache eval mise activate zsh +{{- end }} # source files source "$ZDOTDIR"/files/aliases.zsh From a262841172a9f08be2dffb2f668a235eb56ebc8d Mon Sep 17 00:00:00 2001 From: Nikolas Weger Date: Wed, 2 Oct 2024 10:28:10 +0200 Subject: [PATCH 59/97] fixed zshenv editor export --- dot_config/zsh/dot_zshenv.tmpl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dot_config/zsh/dot_zshenv.tmpl b/dot_config/zsh/dot_zshenv.tmpl index 53a8c15..e226ea0 100644 --- a/dot_config/zsh/dot_zshenv.tmpl +++ b/dot_config/zsh/dot_zshenv.tmpl @@ -44,7 +44,11 @@ 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 From 7bb3c1e96ef2e9952fc5768fd1318c49b491febf Mon Sep 17 00:00:00 2001 From: eeleater Date: Fri, 4 Oct 2024 01:46:37 +0200 Subject: [PATCH 60/97] added findfile function --- dot_config/zsh/files/aliases.zsh | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/dot_config/zsh/files/aliases.zsh b/dot_config/zsh/files/aliases.zsh index d23562c..62eb2bd 100644 --- a/dot_config/zsh/files/aliases.zsh +++ b/dot_config/zsh/files/aliases.zsh @@ -24,22 +24,22 @@ function prev() { } # select from pet snippets -function pet-select() { +function petselect() { BUFFER=$(pet search --query "$LBUFFER") CURSOR=$#BUFFER zle redisplay } -zle -N pet-select -bindkey '^s' pet-select +zle -N petselect +bindkey '^s' petselect # ranger as cli file manager -run_ranger () { +function runranger() { echo ranger < $TTY zle redisplay } -zle -N run_ranger -bindkey '^f' run_ranger +zle -N runranger +bindkey '^f' runranger function ss() { command grc --colour=auto ss "$@" @@ -48,3 +48,16 @@ function ss() { function gi() { curl -sLw "\n" "https://www.toptal.com/developers/gitignore/api/$@" } + +function findfile() { + local search + if test "$1" = "--update"; then + sudo updatedb + shift + search=$1 + else + search=$1 + fi + + locate "$PWD*$search*" +} From 80f53863a252ce20045768813562a5f17382c0ec Mon Sep 17 00:00:00 2001 From: eeleater Date: Sun, 6 Oct 2024 13:02:53 +0200 Subject: [PATCH 61/97] dot_local/bin/executable_joke aktualisiert --- dot_local/bin/executable_joke | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dot_local/bin/executable_joke b/dot_local/bin/executable_joke index d8502e7..ce83e1a 100644 --- a/dot_local/bin/executable_joke +++ b/dot_local/bin/executable_joke @@ -2,7 +2,7 @@ case "$1" in "dad") - joke=$(/usr/bin/curl -sH "Accept: text/plain" 'https://icanhazdadjoke.com/') + joke=$(curl -sH "Accept: text/plain" 'https://icanhazdadjoke.com/') echo "Daily Dad Joke: $joke" ;; "bofh") From e7322f20a94e43954c520dbb15fb434750b7bf44 Mon Sep 17 00:00:00 2001 From: Nikolas Weger Date: Wed, 23 Oct 2024 12:14:13 +0200 Subject: [PATCH 62/97] removed infra from remote topgrades, because it is now nixos --- dot_config/topgrade.toml.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dot_config/topgrade.toml.tmpl b/dot_config/topgrade.toml.tmpl index 5082ce3..bc9efb4 100644 --- a/dot_config/topgrade.toml.tmpl +++ b/dot_config/topgrade.toml.tmpl @@ -28,7 +28,7 @@ skip_notify = true {{- if eq .chezmoi.hostname "pxm" }} remote_topgrades = ["kali", "mail"] {{- else }} -remote_topgrades = ["pxm", "web", "infra", "kube"] +remote_topgrades = ["pxm", "web", "kube"] # "infra", {{- end }} # Arguments to pass SSH when upgrading remote systems From 2eb1adeed6ee7f55a886c4bdefc62f70f69b094f Mon Sep 17 00:00:00 2001 From: Nikolas Weger Date: Wed, 23 Oct 2024 12:15:24 +0200 Subject: [PATCH 63/97] fixed zellij layout script --- dot_local/bin/executable_zellijCreateLayout | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dot_local/bin/executable_zellijCreateLayout b/dot_local/bin/executable_zellijCreateLayout index c5f252a..c867981 100644 --- a/dot_local/bin/executable_zellijCreateLayout +++ b/dot_local/bin/executable_zellijCreateLayout @@ -3,6 +3,6 @@ set -euo pipefail ZJ_LAYOUT_DIR=$(zellij setup --check | grep "LAYOUT DIR" - | grep -o '".*"' - | tr -d '"') if [[ -d "${ZJ_LAYOUT_DIR}" ]]; then - ZJ_LAYOUT="$(fd --type file . "${ZJ_LAYOUT_DIR}" | sed 's|.*/||' | fzf || exit)" + ZJ_LAYOUT="$ZJ_LAYOUT_DIR/$(fd --type file . "${ZJ_LAYOUT_DIR}" | sed 's|.*/||' | fzf || exit)" zellij --layout "${ZJ_LAYOUT}" fi From 01a037cdcccf7049b13f6b39decc34020018aa72 Mon Sep 17 00:00:00 2001 From: Nikolas Weger Date: Wed, 6 Nov 2024 11:51:59 +0100 Subject: [PATCH 64/97] updated oh-my-posh script because --version is no longer valid --- dot_local/bin/executable_updateOhMyPosh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dot_local/bin/executable_updateOhMyPosh b/dot_local/bin/executable_updateOhMyPosh index 8af14c4..ed0ca60 100644 --- a/dot_local/bin/executable_updateOhMyPosh +++ b/dot_local/bin/executable_updateOhMyPosh @@ -1,6 +1,6 @@ #!/bin/bash newestVersion="$(curl -sL https://api.github.com/repos/JanDeDobbeleer/oh-my-posh/releases/latest | jq -r '.name')" -localVersion="v$(oh-my-posh --version)" +localVersion="v$(oh-my-posh version)" tmpFile="$(mktemp -u)" test "$newestVersion" != "$localVersion" && { From 58bb07fa67fc55a4f15454d21bcd9ac3f2a03479 Mon Sep 17 00:00:00 2001 From: Nikolas Weger Date: Mon, 11 Nov 2024 08:45:58 +0100 Subject: [PATCH 65/97] fixed keybind for fzfmarks, collision with zellij --- dot_config/zsh/dot_zshenv.tmpl | 1 + 1 file changed, 1 insertion(+) diff --git a/dot_config/zsh/dot_zshenv.tmpl b/dot_config/zsh/dot_zshenv.tmpl index e226ea0..640d574 100644 --- a/dot_config/zsh/dot_zshenv.tmpl +++ b/dot_config/zsh/dot_zshenv.tmpl @@ -64,6 +64,7 @@ export HISTSIZE=$(( 1.2 * SAVEHIST )) export ZSH_CACHE_DIR="$XDG_CACHE_HOME"/zsh export HISTFILE="$ZSH_CACHE_DIR"/history export GPG_TTY="$TTY" +export FZF_MARKS_JUMP='^m' {{- if eq .chezmoi.osRelease.id "endeavouros" }} export DIFFPROG='meld' {{- end }} From 5411399bf592feb17fcd8d90dcf13f1f9da19e88 Mon Sep 17 00:00:00 2001 From: Nikolas Weger Date: Mon, 11 Nov 2024 08:47:28 +0100 Subject: [PATCH 66/97] fixed keybind for fzfmarks, collision with zellij --- dot_config/zsh/dot_zshenv.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dot_config/zsh/dot_zshenv.tmpl b/dot_config/zsh/dot_zshenv.tmpl index 640d574..dee55bc 100644 --- a/dot_config/zsh/dot_zshenv.tmpl +++ b/dot_config/zsh/dot_zshenv.tmpl @@ -64,7 +64,7 @@ export HISTSIZE=$(( 1.2 * SAVEHIST )) export ZSH_CACHE_DIR="$XDG_CACHE_HOME"/zsh export HISTFILE="$ZSH_CACHE_DIR"/history export GPG_TTY="$TTY" -export FZF_MARKS_JUMP='^m' +export FZF_MARKS_JUMP='^j' {{- if eq .chezmoi.osRelease.id "endeavouros" }} export DIFFPROG='meld' {{- end }} From 9d6e70836f4a11122c23507865e96b5cbee32dbd Mon Sep 17 00:00:00 2001 From: eeleater Date: Sun, 17 Nov 2024 23:16:08 +0100 Subject: [PATCH 67/97] workaround not needed, fixed in zellij --- dot_config/zsh/dot_zshenv.tmpl | 1 - 1 file changed, 1 deletion(-) diff --git a/dot_config/zsh/dot_zshenv.tmpl b/dot_config/zsh/dot_zshenv.tmpl index dee55bc..e226ea0 100644 --- a/dot_config/zsh/dot_zshenv.tmpl +++ b/dot_config/zsh/dot_zshenv.tmpl @@ -64,7 +64,6 @@ export HISTSIZE=$(( 1.2 * SAVEHIST )) export ZSH_CACHE_DIR="$XDG_CACHE_HOME"/zsh export HISTFILE="$ZSH_CACHE_DIR"/history export GPG_TTY="$TTY" -export FZF_MARKS_JUMP='^j' {{- if eq .chezmoi.osRelease.id "endeavouros" }} export DIFFPROG='meld' {{- end }} From 4901b0dc881574366ecece04b2311fbf9ce3fb44 Mon Sep 17 00:00:00 2001 From: eeleater Date: Sun, 17 Nov 2024 23:23:17 +0100 Subject: [PATCH 68/97] workaround not needed, fixed in zellij --- dot_config/zsh/dot_zshenv.tmpl | 1 + 1 file changed, 1 insertion(+) diff --git a/dot_config/zsh/dot_zshenv.tmpl b/dot_config/zsh/dot_zshenv.tmpl index e226ea0..70c27ec 100644 --- a/dot_config/zsh/dot_zshenv.tmpl +++ b/dot_config/zsh/dot_zshenv.tmpl @@ -64,6 +64,7 @@ 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 eq .chezmoi.osRelease.id "endeavouros" }} export DIFFPROG='meld' {{- end }} From 572e061f63da734ddc23c55d01084131f65370d9 Mon Sep 17 00:00:00 2001 From: eeleater Date: Sat, 23 Nov 2024 00:38:31 +0100 Subject: [PATCH 69/97] new theme and font for kitty --- dot_config/kitty/current-theme.conf | 104 +++++++++++++++++++--------- dot_config/kitty/kitty.conf | 5 +- 2 files changed, 74 insertions(+), 35 deletions(-) diff --git a/dot_config/kitty/current-theme.conf b/dot_config/kitty/current-theme.conf index 627ba40..572c643 100644 --- a/dot_config/kitty/current-theme.conf +++ b/dot_config/kitty/current-theme.conf @@ -1,35 +1,75 @@ # vim:ft=kitty -## name: Dracula -## author: Keegan Carruthers-Smith +## name: citylights +## author: 食無魚 ## license: MIT -## upstream: https://raw.githubusercontent.com/dracula/kitty/master/dracula.conf +## upstream: https://raw.githubusercontent.com/liuyinz/dotfile/master/common/kitty/citylights.conf +## blurb: Theme for Kitty inspired by https://citylights.xyz/ -foreground #f8f8f2 -background #282a36 -selection_foreground #ffffff -selection_background #44475a -url_color #8be9fd -color0 #21222c -color8 #6272a4 -color1 #ff5555 -color9 #ff6e6e -color2 #50fa7b -color10 #69ff94 -color3 #f1fa8c -color11 #ffffa5 -color4 #bd93f9 -color12 #d6acff -color5 #ff79c6 -color13 #ff92df -color6 #8be9fd -color14 #a4ffff -color7 #f8f8f2 -color15 #ffffff -cursor #f8f8f2 -cursor_text_color background -active_tab_foreground #282a36 -active_tab_background #f8f8f2 -inactive_tab_foreground #282a36 -inactive_tab_background #6272a4 -mark1_foreground #282a36 -mark1_background #ff5555 +# The basic colors +foreground #a0b3c5 +background #1d252c +selection_foreground #1d252c +selection_background #a0b3c5 + +# Cursor colors +cursor #a0b3c5 +cursor_text_color #1d252c + +# URL +url_color #5ec4ff + +# kitty window border colors +active_border_color #a0b3c5 +inactive_border_color #62686e + +# OS Window titlebar colors +wayland_titlebar_color #1d252c +macos_titlebar_color #1d252c + +# Tab bar colors +active_tab_foreground #1d252c +active_tab_background #a0b3c5 +inactive_tab_foreground #a0b3c5 +inactive_tab_background #1d252c + +# Colors for marks (marked text in the terminal) + +mark1_foreground #1d252c +mark1_background #8bd49c +mark2_foreground #1d252c +mark2_background #ebbf83 +mark3_foreground #1d252c +mark3_background #d95468 + +# The basic 16 colors +# black +color0 #1d252c +color8 #566c7d + +# red +color1 #d95468 +color9 #d95468 + +# green +color2 #8bd49c +color10 #8bd49c + +# yellow +color3 #ebbf83 +color11 #ebbf83 + +# blue +color4 #5ec4ff +color12 #5ec4ff + +# magenta +color5 #c06ece +color13 #c06ece + +# cyan +color6 #008b94 +color14 #70e1e8 + +# white +color7 #a0b3c5 +color15 #a0b3c5 diff --git a/dot_config/kitty/kitty.conf b/dot_config/kitty/kitty.conf index efa925e..fbfae85 100644 --- a/dot_config/kitty/kitty.conf +++ b/dot_config/kitty/kitty.conf @@ -4,12 +4,11 @@ copy_on_select no strip_trailing_spaces smart window_padding_width 5 enable_audio_bell no -shell_integration disabled # Fonts -font_family CommitMono Nerd Font +font_family 0xproto Nerd Font # BEGIN_KITTY_THEME -# Dracula +# citylights include current-theme.conf # END_KITTY_THEME From 9c0a4ea635614457304a7a8014a256038e42ad0c Mon Sep 17 00:00:00 2001 From: eeleater Date: Mon, 25 Nov 2024 00:57:12 +0100 Subject: [PATCH 70/97] fixed chezmoi on phone --- dot_config/topgrade.toml.tmpl | 2 +- dot_config/zsh/dot_zsh_plugins.txt.tmpl | 2 +- dot_config/zsh/dot_zshenv.tmpl | 2 +- dot_config/zsh/dot_zshrc.tmpl | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dot_config/topgrade.toml.tmpl b/dot_config/topgrade.toml.tmpl index bc9efb4..8d2f714 100644 --- a/dot_config/topgrade.toml.tmpl +++ b/dot_config/topgrade.toml.tmpl @@ -3,7 +3,7 @@ #assume_yes = true # Disable specific steps - same options as the command line flag -{{- if eq .chezmoi.osRelease.id "endeavouros" }} +{{- 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"] diff --git a/dot_config/zsh/dot_zsh_plugins.txt.tmpl b/dot_config/zsh/dot_zsh_plugins.txt.tmpl index 4765d73..7792877 100644 --- a/dot_config/zsh/dot_zsh_plugins.txt.tmpl +++ b/dot_config/zsh/dot_zsh_plugins.txt.tmpl @@ -20,7 +20,7 @@ Aloxaf/fzf-tab # other plugins urbainvaes/fzf-marks -{{- if eq .chezmoi.osRelease.id "endeavouros" }} +{{- if (and (eq .chezmoi.os "linux") (eq .chezmoi.osRelease.id "endeavouros")) }} sobolevn/wakatime-zsh-plugin {{- end }} laggardkernel/zsh-thefuck diff --git a/dot_config/zsh/dot_zshenv.tmpl b/dot_config/zsh/dot_zshenv.tmpl index 70c27ec..5073114 100644 --- a/dot_config/zsh/dot_zshenv.tmpl +++ b/dot_config/zsh/dot_zshenv.tmpl @@ -65,7 +65,7 @@ export ZSH_CACHE_DIR="$XDG_CACHE_HOME"/zsh export HISTFILE="$ZSH_CACHE_DIR"/history export GPG_TTY="$TTY" unset FZF_MARKS_JUMP -{{- if eq .chezmoi.osRelease.id "endeavouros" }} +{{- 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" diff --git a/dot_config/zsh/dot_zshrc.tmpl b/dot_config/zsh/dot_zshrc.tmpl index 2324a24..20f9585 100644 --- a/dot_config/zsh/dot_zshrc.tmpl +++ b/dot_config/zsh/dot_zshrc.tmpl @@ -9,7 +9,7 @@ unsetopt FLOW_CONTROL # deduplicate path typeset -U path PATH -{{- if eq .chezmoi.osRelease.id "endeavouros" }} +{{- 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 }} @@ -20,7 +20,7 @@ potentialBanner=('joke bofh' 'joke dad' 'fastfetch') eval "$potentialBanner[$RANDOM%$#potentialBanner+1]" # antidote -{{- if eq .chezmoi.osRelease.id "endeavouros" }} +{{- 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 @@ -33,7 +33,7 @@ antidote load smartcache eval zoxide init --cmd cd zsh smartcache eval atuin init zsh smartcache eval direnv hook zsh -{{- if eq .chezmoi.osRelease.id "endeavouros" }} +{{- if (and (eq .chezmoi.os "linux") (eq .chezmoi.osRelease.id "endeavouros")) }} smartcache eval mise activate zsh {{- end }} From b0910ee44c582738f33e2fe3e88da922aa594b6b Mon Sep 17 00:00:00 2001 From: eeleater Date: Mon, 25 Nov 2024 01:40:08 +0100 Subject: [PATCH 71/97] 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, 571 insertions(+), 474 deletions(-) delete mode 100644 dot_config/kitty/themes/embark.conf delete mode 100644 dot_config/kitty/themes/penumbra.conf delete mode 100644 dot_config/sheldon/plugins.toml create mode 100644 realFiles/topgrade/laptop/topgrade create mode 100644 realFiles/topgrade/other/pxm/topgrade create mode 100644 realFiles/topgrade/other/topgrade create mode 100644 realFiles/zsh/laptop/zsh_plugins create mode 100644 realFiles/zsh/laptop/zshenv create mode 100644 realFiles/zsh/laptop/zshrc create mode 100644 realFiles/zsh/other/zsh_plugins create mode 100644 realFiles/zsh/other/zshenv create mode 100644 realFiles/zsh/other/zshrc diff --git a/dot_config/kitty/themes/embark.conf b/dot_config/kitty/themes/embark.conf deleted file mode 100644 index aa45826..0000000 --- a/dot_config/kitty/themes/embark.conf +++ /dev/null @@ -1,53 +0,0 @@ -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 deleted file mode 100644 index 81e91cd..0000000 --- a/dot_config/kitty/themes/penumbra.conf +++ /dev/null @@ -1,91 +0,0 @@ -# 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 deleted file mode 100644 index 72c9e62..0000000 --- a/dot_config/sheldon/plugins.toml +++ /dev/null @@ -1,72 +0,0 @@ -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 8d2f714..3fa10c5 100644 --- a/dot_config/topgrade.toml.tmpl +++ b/dot_config/topgrade.toml.tmpl @@ -1,106 +1,7 @@ -[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 +{{- 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 -}} diff --git a/dot_config/zsh/dot_zsh_plugins.txt.tmpl b/dot_config/zsh/dot_zsh_plugins.txt.tmpl index 7792877..5635336 100644 --- a/dot_config/zsh/dot_zsh_plugins.txt.tmpl +++ b/dot_config/zsh/dot_zsh_plugins.txt.tmpl @@ -1,32 +1,5 @@ -# 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 +{{- if (or (eq .chezmoi.hostname "himiko") (eq .chezmoi.hostname "wegerpc")) -}} +{{- include "realFiles/zsh/laptop/zsh_plugins" -}} +{{- else -}} +{{- include "realFiles/zsh/other/zsh_plugins" -}} +{{- end -}} diff --git a/dot_config/zsh/dot_zshenv.tmpl b/dot_config/zsh/dot_zshenv.tmpl index 5073114..7b5b0ff 100644 --- a/dot_config/zsh/dot_zshenv.tmpl +++ b/dot_config/zsh/dot_zshenv.tmpl @@ -1,72 +1,5 @@ -# 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" +{{- if (or (eq .chezmoi.hostname "himiko") (eq .chezmoi.hostname "wegerpc")) -}} +{{- include "realFiles/zsh/laptop/zshenv" -}} +{{- else -}} +{{- include "realFiles/zsh/other/zshenv" -}} +{{- end -}} diff --git a/dot_config/zsh/dot_zshrc.tmpl b/dot_config/zsh/dot_zshrc.tmpl index 20f9585..8f09f20 100644 --- a/dot_config/zsh/dot_zshrc.tmpl +++ b/dot_config/zsh/dot_zshrc.tmpl @@ -1,48 +1,5 @@ -{{- 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")" +{{- if (or (eq .chezmoi.hostname "himiko") (eq .chezmoi.hostname "wegerpc")) -}} +{{- include "realFiles/zsh/laptop/zshrc" -}} +{{- else -}} +{{- include "realFiles/zsh/other/zshrc" -}} +{{- end -}} diff --git a/realFiles/topgrade/laptop/topgrade b/realFiles/topgrade/laptop/topgrade new file mode 100644 index 0000000..649ef6b --- /dev/null +++ b/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 diff --git a/realFiles/topgrade/other/pxm/topgrade b/realFiles/topgrade/other/pxm/topgrade new file mode 100644 index 0000000..093bb0e --- /dev/null +++ b/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 diff --git a/realFiles/topgrade/other/topgrade b/realFiles/topgrade/other/topgrade new file mode 100644 index 0000000..437ba7f --- /dev/null +++ b/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 diff --git a/realFiles/zsh/laptop/zsh_plugins b/realFiles/zsh/laptop/zsh_plugins new file mode 100644 index 0000000..f7b6da3 --- /dev/null +++ b/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 diff --git a/realFiles/zsh/laptop/zshenv b/realFiles/zsh/laptop/zshenv new file mode 100644 index 0000000..6fd0c74 --- /dev/null +++ b/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" diff --git a/realFiles/zsh/laptop/zshrc b/realFiles/zsh/laptop/zshrc new file mode 100644 index 0000000..2ab83e6 --- /dev/null +++ b/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")" diff --git a/realFiles/zsh/other/zsh_plugins b/realFiles/zsh/other/zsh_plugins new file mode 100644 index 0000000..18c7017 --- /dev/null +++ b/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 diff --git a/realFiles/zsh/other/zshenv b/realFiles/zsh/other/zshenv new file mode 100644 index 0000000..ab286e6 --- /dev/null +++ b/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" diff --git a/realFiles/zsh/other/zshrc b/realFiles/zsh/other/zshrc new file mode 100644 index 0000000..bf99106 --- /dev/null +++ b/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")" From 36bb6c8e29fc0591c5356e397e68f0cac9c9ff59 Mon Sep 17 00:00:00 2001 From: eeleater Date: Mon, 25 Nov 2024 01:49:10 +0100 Subject: [PATCH 72/97] 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")" From 16dde8776abf723c6c1ec88096d8ccfe28346a90 Mon Sep 17 00:00:00 2001 From: eeleater Date: Mon, 25 Nov 2024 01:49:26 +0100 Subject: [PATCH 73/97] revert 9c0a4ea635614457304a7a8014a256038e42ad0c revert fixed chezmoi on phone --- dot_config/topgrade.toml.tmpl | 2 +- dot_config/zsh/dot_zsh_plugins.txt.tmpl | 2 +- dot_config/zsh/dot_zshenv.tmpl | 2 +- dot_config/zsh/dot_zshrc.tmpl | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dot_config/topgrade.toml.tmpl b/dot_config/topgrade.toml.tmpl index 8d2f714..bc9efb4 100644 --- a/dot_config/topgrade.toml.tmpl +++ b/dot_config/topgrade.toml.tmpl @@ -3,7 +3,7 @@ #assume_yes = true # Disable specific steps - same options as the command line flag -{{- if (and (eq .chezmoi.os "linux") (eq .chezmoi.osRelease.id "endeavouros")) }} +{{- if 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"] diff --git a/dot_config/zsh/dot_zsh_plugins.txt.tmpl b/dot_config/zsh/dot_zsh_plugins.txt.tmpl index 7792877..4765d73 100644 --- a/dot_config/zsh/dot_zsh_plugins.txt.tmpl +++ b/dot_config/zsh/dot_zsh_plugins.txt.tmpl @@ -20,7 +20,7 @@ Aloxaf/fzf-tab # other plugins urbainvaes/fzf-marks -{{- if (and (eq .chezmoi.os "linux") (eq .chezmoi.osRelease.id "endeavouros")) }} +{{- if eq .chezmoi.osRelease.id "endeavouros" }} sobolevn/wakatime-zsh-plugin {{- end }} laggardkernel/zsh-thefuck diff --git a/dot_config/zsh/dot_zshenv.tmpl b/dot_config/zsh/dot_zshenv.tmpl index 5073114..70c27ec 100644 --- a/dot_config/zsh/dot_zshenv.tmpl +++ b/dot_config/zsh/dot_zshenv.tmpl @@ -65,7 +65,7 @@ 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")) }} +{{- 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" diff --git a/dot_config/zsh/dot_zshrc.tmpl b/dot_config/zsh/dot_zshrc.tmpl index 20f9585..2324a24 100644 --- a/dot_config/zsh/dot_zshrc.tmpl +++ b/dot_config/zsh/dot_zshrc.tmpl @@ -9,7 +9,7 @@ unsetopt FLOW_CONTROL # deduplicate path typeset -U path PATH -{{- if (and (eq .chezmoi.os "linux") (eq .chezmoi.osRelease.id "endeavouros")) }} +{{- if eq .chezmoi.osRelease.id "endeavouros" }} path+=("$XDG_DATA_HOME"/JetBrains/Toolbox/scripts) # jetbrains toolbox path+=("$XDG_DATA_HOME/mise/shims") # mise {{- end }} @@ -20,7 +20,7 @@ potentialBanner=('joke bofh' 'joke dad' 'fastfetch') eval "$potentialBanner[$RANDOM%$#potentialBanner+1]" # antidote -{{- if (and (eq .chezmoi.os "linux") (eq .chezmoi.osRelease.id "endeavouros")) }} +{{- if 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 @@ -33,7 +33,7 @@ antidote load 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")) }} +{{- if eq .chezmoi.osRelease.id "endeavouros" }} smartcache eval mise activate zsh {{- end }} From 862f5d119b238e21d44f3807ab503c4e8b548974 Mon Sep 17 00:00:00 2001 From: eeleater Date: Mon, 25 Nov 2024 01:51:23 +0100 Subject: [PATCH 74/97] redelete unneeded files --- dot_config/kitty/themes/embark.conf | 53 ---------------- dot_config/kitty/themes/penumbra.conf | 91 --------------------------- dot_config/sheldon/plugins.toml | 72 --------------------- 3 files changed, 216 deletions(-) delete mode 100644 dot_config/kitty/themes/embark.conf delete mode 100644 dot_config/kitty/themes/penumbra.conf delete mode 100644 dot_config/sheldon/plugins.toml diff --git a/dot_config/kitty/themes/embark.conf b/dot_config/kitty/themes/embark.conf deleted file mode 100644 index aa45826..0000000 --- a/dot_config/kitty/themes/embark.conf +++ /dev/null @@ -1,53 +0,0 @@ -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 deleted file mode 100644 index 81e91cd..0000000 --- a/dot_config/kitty/themes/penumbra.conf +++ /dev/null @@ -1,91 +0,0 @@ -# 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 deleted file mode 100644 index 72c9e62..0000000 --- a/dot_config/sheldon/plugins.toml +++ /dev/null @@ -1,72 +0,0 @@ -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"] From 65c7594d2956cbe2439fb7fd174d7a58799759cc Mon Sep 17 00:00:00 2001 From: eeleater Date: Tue, 26 Nov 2024 01:48:51 +0100 Subject: [PATCH 75/97] added yazi function and keybind --- dot_config/zsh/files/aliases.zsh | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dot_config/zsh/files/aliases.zsh b/dot_config/zsh/files/aliases.zsh index 62eb2bd..58307fe 100644 --- a/dot_config/zsh/files/aliases.zsh +++ b/dot_config/zsh/files/aliases.zsh @@ -41,6 +41,20 @@ function runranger() { zle -N runranger bindkey '^f' runranger +function yy() { + if [ -n "$YAZI_LEVEL" ]; then + exit + fi + + local tmp="$(mktemp -t "yazi-cwd.XXXXX")" + yazi "$@" --cwd-file="$tmp" + if cwd="$(cat -- "$tmp")" && [ -n "$cwd" ] && [ "$cwd" != "$PWD" ]; then + cd -- "$cwd" + fi + rm -f -- "$tmp" +} +bindkey -s "^y" "yy\n" + function ss() { command grc --colour=auto ss "$@" } From b912fb35e808dab2089618f530f111ed690e9eec Mon Sep 17 00:00:00 2001 From: eeleater Date: Fri, 29 Nov 2024 17:13:55 +0100 Subject: [PATCH 76/97] fixed mise eval always getting cached --- dot_config/zsh/dot_zshrc.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dot_config/zsh/dot_zshrc.tmpl b/dot_config/zsh/dot_zshrc.tmpl index 2324a24..22100ac 100644 --- a/dot_config/zsh/dot_zshrc.tmpl +++ b/dot_config/zsh/dot_zshrc.tmpl @@ -34,7 +34,7 @@ smartcache eval zoxide init --cmd cd zsh smartcache eval atuin init zsh smartcache eval direnv hook zsh {{- if eq .chezmoi.osRelease.id "endeavouros" }} -smartcache eval mise activate zsh +eval "$(mise activate zsh)" {{- end }} # source files From 683e7dc4ad489fa3264d5bd170e6f8b21afef046 Mon Sep 17 00:00:00 2001 From: eeleater Date: Sat, 30 Nov 2024 00:15:13 +0100 Subject: [PATCH 77/97] infra is back as ubuntu server --- dot_config/topgrade.toml.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dot_config/topgrade.toml.tmpl b/dot_config/topgrade.toml.tmpl index bc9efb4..f8f2b1d 100644 --- a/dot_config/topgrade.toml.tmpl +++ b/dot_config/topgrade.toml.tmpl @@ -28,7 +28,7 @@ skip_notify = true {{- if eq .chezmoi.hostname "pxm" }} remote_topgrades = ["kali", "mail"] {{- else }} -remote_topgrades = ["pxm", "web", "kube"] # "infra", +remote_topgrades = ["pxm", "web", "kube", "infra"] {{- end }} # Arguments to pass SSH when upgrading remote systems From d742874280e38ab88e840370cd1c183f543aa2c8 Mon Sep 17 00:00:00 2001 From: eeleater Date: Mon, 9 Dec 2024 09:15:23 +0100 Subject: [PATCH 78/97] add uptime server to topgrade remotes --- dot_config/topgrade.toml.tmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dot_config/topgrade.toml.tmpl b/dot_config/topgrade.toml.tmpl index f8f2b1d..0abc1ab 100644 --- a/dot_config/topgrade.toml.tmpl +++ b/dot_config/topgrade.toml.tmpl @@ -4,7 +4,7 @@ # Disable specific steps - same options as the command line flag {{- if 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"] +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", "nix"] {{- 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 }} @@ -28,7 +28,7 @@ skip_notify = true {{- if eq .chezmoi.hostname "pxm" }} remote_topgrades = ["kali", "mail"] {{- else }} -remote_topgrades = ["pxm", "web", "kube", "infra"] +remote_topgrades = ["pxm", "web", "kube", "infra", "uptime"] {{- end }} # Arguments to pass SSH when upgrading remote systems From f225beb9a09d3f202d305724146eec6cdc328651 Mon Sep 17 00:00:00 2001 From: Nikolas Weger Date: Tue, 10 Dec 2024 10:20:59 +0100 Subject: [PATCH 79/97] changed kitty theme back to dracula --- dot_config/kitty/current-theme.conf | 104 +++++++++------------------- dot_config/kitty/kitty.conf | 2 +- 2 files changed, 33 insertions(+), 73 deletions(-) diff --git a/dot_config/kitty/current-theme.conf b/dot_config/kitty/current-theme.conf index 572c643..627ba40 100644 --- a/dot_config/kitty/current-theme.conf +++ b/dot_config/kitty/current-theme.conf @@ -1,75 +1,35 @@ # vim:ft=kitty -## name: citylights -## author: 食無魚 +## name: Dracula +## author: Keegan Carruthers-Smith ## license: MIT -## upstream: https://raw.githubusercontent.com/liuyinz/dotfile/master/common/kitty/citylights.conf -## blurb: Theme for Kitty inspired by https://citylights.xyz/ +## upstream: https://raw.githubusercontent.com/dracula/kitty/master/dracula.conf -# The basic colors -foreground #a0b3c5 -background #1d252c -selection_foreground #1d252c -selection_background #a0b3c5 - -# Cursor colors -cursor #a0b3c5 -cursor_text_color #1d252c - -# URL -url_color #5ec4ff - -# kitty window border colors -active_border_color #a0b3c5 -inactive_border_color #62686e - -# OS Window titlebar colors -wayland_titlebar_color #1d252c -macos_titlebar_color #1d252c - -# Tab bar colors -active_tab_foreground #1d252c -active_tab_background #a0b3c5 -inactive_tab_foreground #a0b3c5 -inactive_tab_background #1d252c - -# Colors for marks (marked text in the terminal) - -mark1_foreground #1d252c -mark1_background #8bd49c -mark2_foreground #1d252c -mark2_background #ebbf83 -mark3_foreground #1d252c -mark3_background #d95468 - -# The basic 16 colors -# black -color0 #1d252c -color8 #566c7d - -# red -color1 #d95468 -color9 #d95468 - -# green -color2 #8bd49c -color10 #8bd49c - -# yellow -color3 #ebbf83 -color11 #ebbf83 - -# blue -color4 #5ec4ff -color12 #5ec4ff - -# magenta -color5 #c06ece -color13 #c06ece - -# cyan -color6 #008b94 -color14 #70e1e8 - -# white -color7 #a0b3c5 -color15 #a0b3c5 +foreground #f8f8f2 +background #282a36 +selection_foreground #ffffff +selection_background #44475a +url_color #8be9fd +color0 #21222c +color8 #6272a4 +color1 #ff5555 +color9 #ff6e6e +color2 #50fa7b +color10 #69ff94 +color3 #f1fa8c +color11 #ffffa5 +color4 #bd93f9 +color12 #d6acff +color5 #ff79c6 +color13 #ff92df +color6 #8be9fd +color14 #a4ffff +color7 #f8f8f2 +color15 #ffffff +cursor #f8f8f2 +cursor_text_color background +active_tab_foreground #282a36 +active_tab_background #f8f8f2 +inactive_tab_foreground #282a36 +inactive_tab_background #6272a4 +mark1_foreground #282a36 +mark1_background #ff5555 diff --git a/dot_config/kitty/kitty.conf b/dot_config/kitty/kitty.conf index fbfae85..fd92726 100644 --- a/dot_config/kitty/kitty.conf +++ b/dot_config/kitty/kitty.conf @@ -9,6 +9,6 @@ enable_audio_bell no font_family 0xproto Nerd Font # BEGIN_KITTY_THEME -# citylights +# Dracula include current-theme.conf # END_KITTY_THEME From 9f697505bc3cda6018944873c2268d1387446e60 Mon Sep 17 00:00:00 2001 From: Nikolas Weger Date: Mon, 16 Dec 2024 06:55:55 +0100 Subject: [PATCH 80/97] changed directory for override files --- dot_config/zsh/dot_zshrc.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dot_config/zsh/dot_zshrc.tmpl b/dot_config/zsh/dot_zshrc.tmpl index 22100ac..97baf62 100644 --- a/dot_config/zsh/dot_zshrc.tmpl +++ b/dot_config/zsh/dot_zshrc.tmpl @@ -42,7 +42,7 @@ source "$ZDOTDIR"/files/aliases.zsh source "$ZDOTDIR"/files/sshcomp.zsh # local overrides -for sourced in "$XDG_DATA_HOME"/zsh/files/*; do source $sourced; done +for sourced in "$XDG_DATA_HOME"/zsh/*; do source $sourced; done # theme eval "$(oh-my-posh init zsh --config="$XDG_CACHE_HOME/oh-my-posh/themes/emodipt-extend.omp.json")" From 238b8d95fd30b05bef211ff88c960e7bb5dc7cff Mon Sep 17 00:00:00 2001 From: eeleater Date: Fri, 3 Jan 2025 01:51:34 +0100 Subject: [PATCH 81/97] change omp config to web download --- dot_config/zsh/dot_zshrc.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dot_config/zsh/dot_zshrc.tmpl b/dot_config/zsh/dot_zshrc.tmpl index 97baf62..fd410d6 100644 --- a/dot_config/zsh/dot_zshrc.tmpl +++ b/dot_config/zsh/dot_zshrc.tmpl @@ -45,4 +45,4 @@ source "$ZDOTDIR"/files/sshcomp.zsh for sourced in "$XDG_DATA_HOME"/zsh/*; do source $sourced; done # theme -eval "$(oh-my-posh init zsh --config="$XDG_CACHE_HOME/oh-my-posh/themes/emodipt-extend.omp.json")" +eval "$(oh-my-posh init zsh --config="https://github.com/JanDeDobbeleer/oh-my-posh/blob/main/themes/emodipt-extend.omp.json")" From 2d95bf3e47d65e59ac0305403abc518b60228cb5 Mon Sep 17 00:00:00 2001 From: Nikolas Weger Date: Tue, 14 Jan 2025 09:50:36 +0100 Subject: [PATCH 82/97] changed kitty font size for hyprland on 4k screen --- dot_config/kitty/kitty.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/dot_config/kitty/kitty.conf b/dot_config/kitty/kitty.conf index fd92726..798ac0d 100644 --- a/dot_config/kitty/kitty.conf +++ b/dot_config/kitty/kitty.conf @@ -7,6 +7,7 @@ enable_audio_bell no # Fonts font_family 0xproto Nerd Font +font_size 13 # BEGIN_KITTY_THEME # Dracula From 8af793344492f5376a04166e3d0c83d7f53a197a Mon Sep 17 00:00:00 2001 From: eeleater Date: Wed, 26 Feb 2025 06:48:58 +0100 Subject: [PATCH 83/97] added path for composer global --- dot_config/zsh/dot_zshrc.tmpl | 1 + 1 file changed, 1 insertion(+) diff --git a/dot_config/zsh/dot_zshrc.tmpl b/dot_config/zsh/dot_zshrc.tmpl index fd410d6..2fc0b2c 100644 --- a/dot_config/zsh/dot_zshrc.tmpl +++ b/dot_config/zsh/dot_zshrc.tmpl @@ -12,6 +12,7 @@ typeset -U path PATH {{- if eq .chezmoi.osRelease.id "endeavouros" }} path+=("$XDG_DATA_HOME"/JetBrains/Toolbox/scripts) # jetbrains toolbox path+=("$XDG_DATA_HOME/mise/shims") # mise +path+=("$XDG_CONFIG_HOME"/composer/vendor/bin) # composer {{- end }} path+=("$HOME"/.local/bin) # local bin From 0c40dca11f917c8443340e0629addbc7fddbaa19 Mon Sep 17 00:00:00 2001 From: eeleater Date: Fri, 21 Mar 2025 12:33:43 +0100 Subject: [PATCH 84/97] added deployWebsite script, add new server to topgrade config --- dot_config/topgrade.toml.tmpl | 4 ++-- dot_local/bin/executable_deployWebsite | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 dot_local/bin/executable_deployWebsite diff --git a/dot_config/topgrade.toml.tmpl b/dot_config/topgrade.toml.tmpl index 0abc1ab..3dee6dd 100644 --- a/dot_config/topgrade.toml.tmpl +++ b/dot_config/topgrade.toml.tmpl @@ -6,7 +6,7 @@ {{- if 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", "nix"] {{- 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"] +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", "firmware"] {{- end }} # Skip Notify @@ -28,7 +28,7 @@ skip_notify = true {{- if eq .chezmoi.hostname "pxm" }} remote_topgrades = ["kali", "mail"] {{- else }} -remote_topgrades = ["pxm", "web", "kube", "infra", "uptime"] +remote_topgrades = ["pxm", "web", "kube", "kali", "uptime"] {{- end }} # Arguments to pass SSH when upgrading remote systems diff --git a/dot_local/bin/executable_deployWebsite b/dot_local/bin/executable_deployWebsite new file mode 100644 index 0000000..7cdcf0c --- /dev/null +++ b/dot_local/bin/executable_deployWebsite @@ -0,0 +1,7 @@ +#!/bin/bash + +cd "$HOME"/Dokumente/files/code/websites/zola/hook || exit + +zola build +scp -r public web:site +ssh web 'sudo rm -rf /srv/site; sudo mv site /srv' From 0d02d90080f6aa27390a04eb7cc5b2be12dcda25 Mon Sep 17 00:00:00 2001 From: eeleater Date: Mon, 24 Mar 2025 16:06:07 +0100 Subject: [PATCH 85/97] added new, better ssh functionality --- dot_config/zsh/dot_zsh_plugins.txt.tmpl | 1 + 1 file changed, 1 insertion(+) diff --git a/dot_config/zsh/dot_zsh_plugins.txt.tmpl b/dot_config/zsh/dot_zsh_plugins.txt.tmpl index 4765d73..f3ac34c 100644 --- a/dot_config/zsh/dot_zsh_plugins.txt.tmpl +++ b/dot_config/zsh/dot_zsh_plugins.txt.tmpl @@ -17,6 +17,7 @@ twopizza9621536/zsh-eza fdellwing/zsh-bat amyreese/zsh-titles Aloxaf/fzf-tab +sunlei/zsh-ssh # other plugins urbainvaes/fzf-marks From d310fd8f9b4d0e1f9bc4332dda4e492972bf8ccb Mon Sep 17 00:00:00 2001 From: eeleater Date: Mon, 24 Mar 2025 16:26:14 +0100 Subject: [PATCH 86/97] added new, better ssh functionality --- dot_config/zsh/dot_zshrc.tmpl | 2 +- dot_config/zsh/files/sshcomp.zsh | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dot_config/zsh/dot_zshrc.tmpl b/dot_config/zsh/dot_zshrc.tmpl index 2fc0b2c..ad4aedd 100644 --- a/dot_config/zsh/dot_zshrc.tmpl +++ b/dot_config/zsh/dot_zshrc.tmpl @@ -40,7 +40,7 @@ eval "$(mise activate zsh)" # source files source "$ZDOTDIR"/files/aliases.zsh -source "$ZDOTDIR"/files/sshcomp.zsh +#source "$ZDOTDIR"/files/sshcomp.zsh # local overrides for sourced in "$XDG_DATA_HOME"/zsh/*; do source $sourced; done diff --git a/dot_config/zsh/files/sshcomp.zsh b/dot_config/zsh/files/sshcomp.zsh index 632ce03..d7e8fd2 100644 --- a/dot_config/zsh/files/sshcomp.zsh +++ b/dot_config/zsh/files/sshcomp.zsh @@ -12,5 +12,10 @@ zstyle ':completion:*:(ssh|scp|sshfs|mosh|rsync):*:hosts-domain' ignored-pattern zstyle ':completion:*:(ssh|scp|sshfs|mosh|rsync):*:hosts-ipaddr' ignored-patterns '^(<->.<->.<->.<->|(|::)([[:xdigit:].]##:(#c,2))##(|%*))' '127.*' '255.255.255.255' '::1' 'fe80::*' 'ff02::*' [ -r ~/.ssh/known_hosts ] && _ssh_hosts=(${${${${(f)"$(<$HOME/.ssh/known_hosts)"}:#[\|]*}%%\ *}%%,*}) || _ssh_hosts=() -hosts=( "$_ssh_hosts[@]" ) +[ -r ~/.ssh/known_hosts_priv ] && _ssh_hosts_priv=(${${${${(f)"$(<$HOME/.ssh/known_hosts_priv)"}:#[\|]*}%%\ *}%%,*}) || _ssh_hosts_priv=() +[ -r ~/.ssh/known_hosts_work_ojs ] && _ssh_hosts_ojs=(${${${${(f)"$(<$HOME/.ssh/known_hosts_work_ojs)"}:#[\|]*}%%\ *}%%,*}) || _ssh_hosts_ojs=() +[ -r ~/.ssh/known_hosts_work_danrw ] && _ssh_hosts_work_danrw=(${${${${(f)"$(<$HOME/.ssh/known_hosts_work_danrw)"}:#[\|]*}%%\ *}%%,*}) || _ssh_hosts_work_danrw=() +[ -r ~/.ssh/known_hosts_misc ] && _ssh_hosts_work_misc=(${${${${(f)"$(<$HOME/.ssh/known_hosts_misc)"}:#[\|]*}%%\ *}%%,*}) || _ssh_hosts_work_misc=() +[ -r ~/.ssh/known_hosts_work_lzv ] && _ssh_hosts_work_lzv=(${${${${(f)"$(<$HOME/.ssh/known_hosts_work_lzv)"}:#[\|]*}%%\ *}%%,*}) || _ssh_hosts_work_lzv=() +hosts=( "$_ssh_hosts[@]" "$_ssh_hosts_priv[@]" "$_ssh_hosts_work_ojs[@]" "$_ssh_hosts_work_danrw[@]" "$_ssh_hosts_misc[@]" "$_ssh_hosts_work_lzv[@]" ) zstyle ':completion:*:hosts' hosts $hosts From 3b2f16d6b7b8b5d68236cb1cd6d29a3938959512 Mon Sep 17 00:00:00 2001 From: eeleater Date: Mon, 24 Mar 2025 17:24:38 +0100 Subject: [PATCH 87/97] fixed the long lines of the omp config --- dot_config/zsh/dot_zshrc.tmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dot_config/zsh/dot_zshrc.tmpl b/dot_config/zsh/dot_zshrc.tmpl index ad4aedd..df734b6 100644 --- a/dot_config/zsh/dot_zshrc.tmpl +++ b/dot_config/zsh/dot_zshrc.tmpl @@ -40,10 +40,10 @@ 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/*; do source $sourced; done # theme -eval "$(oh-my-posh init zsh --config="https://github.com/JanDeDobbeleer/oh-my-posh/blob/main/themes/emodipt-extend.omp.json")" +ompTheme="https://github.com/JanDeDobbeleer/oh-my-posh/blob/main/themes/emodipt-extend.omp.json" +eval "$(oh-my-posh init zsh --config="$ompTheme")" From 2098d0fc357a955532a5b15de81a1cee3179a1bf Mon Sep 17 00:00:00 2001 From: eeleater Date: Mon, 24 Mar 2025 17:25:46 +0100 Subject: [PATCH 88/97] removed unnecessary sshcomp.zsh --- dot_config/zsh/files/sshcomp.zsh | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 dot_config/zsh/files/sshcomp.zsh diff --git a/dot_config/zsh/files/sshcomp.zsh b/dot_config/zsh/files/sshcomp.zsh deleted file mode 100644 index d7e8fd2..0000000 --- a/dot_config/zsh/files/sshcomp.zsh +++ /dev/null @@ -1,21 +0,0 @@ -zstyle ':completion:*:(ssh|scp|sshfs|mosh|rsync):*' sort false -zstyle ':completion:*:(ssh|scp|sshfs|mosh|rsync):*' group-name '' -zstyle ':completion:*:(ssh|scp|sshfs|mosh|rsync):*' verbose yes - -zstyle ':completion:*:(ssh|scp|sshfs|mosh|rsync):*' tag-order 'hosts:-host:host hosts:-domain:domain hosts:-ipaddr:ip\ address *' -zstyle ':completion:*:(scp|sshfs|rsync):*' group-order users files all-files hosts-domain hosts-host hosts-ipaddr -zstyle ':completion:*:(ssh|mosh):*' group-order users hosts-domain hosts-host users hosts-ipaddr - -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-*' -zstyle ':completion:*:(ssh|scp|sshfs|mosh|rsync):*:hosts-domain' ignored-patterns '<->.<->.<->.<->' '^[-[:alnum:]]##(.[-[:alnum:]]##)##' '*@*' '*.eeleater.org' -zstyle ':completion:*:(ssh|scp|sshfs|mosh|rsync):*:hosts-ipaddr' ignored-patterns '^(<->.<->.<->.<->|(|::)([[:xdigit:].]##:(#c,2))##(|%*))' '127.*' '255.255.255.255' '::1' 'fe80::*' 'ff02::*' - -[ -r ~/.ssh/known_hosts ] && _ssh_hosts=(${${${${(f)"$(<$HOME/.ssh/known_hosts)"}:#[\|]*}%%\ *}%%,*}) || _ssh_hosts=() -[ -r ~/.ssh/known_hosts_priv ] && _ssh_hosts_priv=(${${${${(f)"$(<$HOME/.ssh/known_hosts_priv)"}:#[\|]*}%%\ *}%%,*}) || _ssh_hosts_priv=() -[ -r ~/.ssh/known_hosts_work_ojs ] && _ssh_hosts_ojs=(${${${${(f)"$(<$HOME/.ssh/known_hosts_work_ojs)"}:#[\|]*}%%\ *}%%,*}) || _ssh_hosts_ojs=() -[ -r ~/.ssh/known_hosts_work_danrw ] && _ssh_hosts_work_danrw=(${${${${(f)"$(<$HOME/.ssh/known_hosts_work_danrw)"}:#[\|]*}%%\ *}%%,*}) || _ssh_hosts_work_danrw=() -[ -r ~/.ssh/known_hosts_misc ] && _ssh_hosts_work_misc=(${${${${(f)"$(<$HOME/.ssh/known_hosts_misc)"}:#[\|]*}%%\ *}%%,*}) || _ssh_hosts_work_misc=() -[ -r ~/.ssh/known_hosts_work_lzv ] && _ssh_hosts_work_lzv=(${${${${(f)"$(<$HOME/.ssh/known_hosts_work_lzv)"}:#[\|]*}%%\ *}%%,*}) || _ssh_hosts_work_lzv=() -hosts=( "$_ssh_hosts[@]" "$_ssh_hosts_priv[@]" "$_ssh_hosts_work_ojs[@]" "$_ssh_hosts_work_danrw[@]" "$_ssh_hosts_misc[@]" "$_ssh_hosts_work_lzv[@]" ) -zstyle ':completion:*:hosts' hosts $hosts From 8f8e94aad4571bb16488bccf902fc5f2839bcde9 Mon Sep 17 00:00:00 2001 From: eeleater Date: Tue, 25 Mar 2025 06:42:45 +0100 Subject: [PATCH 89/97] add scanKeys function to wrap ssh-scankeys --- dot_config/zsh/files/aliases.zsh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dot_config/zsh/files/aliases.zsh b/dot_config/zsh/files/aliases.zsh index 58307fe..7b8f08a 100644 --- a/dot_config/zsh/files/aliases.zsh +++ b/dot_config/zsh/files/aliases.zsh @@ -75,3 +75,7 @@ function findfile() { locate "$PWD*$search*" } + +function scanKeys() { + ssh-keyscan $1 | grep -v '#' +} From 084b99c673f9401f0431d52c56459db5e88c81a2 Mon Sep 17 00:00:00 2001 From: eeleater Date: Tue, 25 Mar 2025 20:33:44 +0100 Subject: [PATCH 90/97] fixed the ssh plugin to only be loaded on laptop --- dot_config/zsh/dot_zsh_plugins.txt.tmpl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dot_config/zsh/dot_zsh_plugins.txt.tmpl b/dot_config/zsh/dot_zsh_plugins.txt.tmpl index f3ac34c..d9f6509 100644 --- a/dot_config/zsh/dot_zsh_plugins.txt.tmpl +++ b/dot_config/zsh/dot_zsh_plugins.txt.tmpl @@ -17,7 +17,9 @@ twopizza9621536/zsh-eza fdellwing/zsh-bat amyreese/zsh-titles Aloxaf/fzf-tab +{{- if eq .chezmoi.osRelease.id "endeavouros" }} sunlei/zsh-ssh +{{- end }} # other plugins urbainvaes/fzf-marks From c9dcf786215699a59254dbf53907de5e77998d53 Mon Sep 17 00:00:00 2001 From: eeleater Date: Fri, 28 Mar 2025 17:46:17 +0100 Subject: [PATCH 91/97] disabled helm and certbot in topgrade --- dot_config/topgrade.toml.tmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dot_config/topgrade.toml.tmpl b/dot_config/topgrade.toml.tmpl index 3dee6dd..966d159 100644 --- a/dot_config/topgrade.toml.tmpl +++ b/dot_config/topgrade.toml.tmpl @@ -4,9 +4,9 @@ # Disable specific steps - same options as the command line flag {{- if 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", "nix"] +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", "helm", "certbot", "nix"] {{- else }} -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", "firmware"] +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", "helm", "certbot", "firmware"] {{- end }} # Skip Notify From 4f189ca9471d730a8a0c8249214722a96072fc2a Mon Sep 17 00:00:00 2001 From: eeleater Date: Fri, 28 Mar 2025 17:47:17 +0100 Subject: [PATCH 92/97] disabled bun in topgrade --- dot_config/topgrade.toml.tmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dot_config/topgrade.toml.tmpl b/dot_config/topgrade.toml.tmpl index 966d159..4764ea6 100644 --- a/dot_config/topgrade.toml.tmpl +++ b/dot_config/topgrade.toml.tmpl @@ -4,9 +4,9 @@ # Disable specific steps - same options as the command line flag {{- if 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", "helm", "certbot", "nix"] +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", "helm", "certbot", "bun", "nix"] {{- else }} -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", "helm", "certbot", "firmware"] +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", "helm", "certbot", "bun", "firmware"] {{- end }} # Skip Notify From f87806f09baf52e94aedd0cffd2a3c18d3afa70f Mon Sep 17 00:00:00 2001 From: eeleater Date: Fri, 28 Mar 2025 17:48:10 +0100 Subject: [PATCH 93/97] disabled bun packages in topgrade --- dot_config/topgrade.toml.tmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dot_config/topgrade.toml.tmpl b/dot_config/topgrade.toml.tmpl index 4764ea6..f02ec95 100644 --- a/dot_config/topgrade.toml.tmpl +++ b/dot_config/topgrade.toml.tmpl @@ -4,9 +4,9 @@ # Disable specific steps - same options as the command line flag {{- if 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", "helm", "certbot", "bun", "nix"] +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", "helm", "certbot", "bun", "bun_packages", "nix"] {{- else }} -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", "helm", "certbot", "bun", "firmware"] +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", "helm", "certbot", "bun", "bun_packages", "firmware"] {{- end }} # Skip Notify From 4cf0731971e0681f1b989d89ca730f373c683cc7 Mon Sep 17 00:00:00 2001 From: eeleater Date: Thu, 3 Apr 2025 07:19:10 +0200 Subject: [PATCH 94/97] fixed scp completion --- dot_config/zsh/dot_zshrc.tmpl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dot_config/zsh/dot_zshrc.tmpl b/dot_config/zsh/dot_zshrc.tmpl index df734b6..efd7fc4 100644 --- a/dot_config/zsh/dot_zshrc.tmpl +++ b/dot_config/zsh/dot_zshrc.tmpl @@ -38,6 +38,10 @@ smartcache eval direnv hook zsh eval "$(mise activate zsh)" {{- end }} +{{- if eq .chezmoi.osRelease.id "endeavouros" }} +zstyle ':completion:*:(scp|sftp|rsh|rsync):*' hosts ${=${${(f)"$(cat ~/.ssh/known_hosts/{default,priv,work/*}(|2)(N) /dev/null)"}%%[# ]*}//,/ } +{{- end }} + # source files source "$ZDOTDIR"/files/aliases.zsh From 9900b3495a276542b850f76cc6b36c0be303e67e Mon Sep 17 00:00:00 2001 From: Nikolas Weger Date: Fri, 4 Apr 2025 08:05:19 +0200 Subject: [PATCH 95/97] disabled jetbrains in topgrade --- dot_config/topgrade.toml.tmpl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dot_config/topgrade.toml.tmpl b/dot_config/topgrade.toml.tmpl index f02ec95..604d1aa 100644 --- a/dot_config/topgrade.toml.tmpl +++ b/dot_config/topgrade.toml.tmpl @@ -1,12 +1,13 @@ + [misc] # Don't ask for confirmations #assume_yes = true # Disable specific steps - same options as the command line flag {{- if 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", "helm", "certbot", "bun", "bun_packages", "nix"] +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", "helm", "certbot", "bun", "bun_packages", "jet_brains_toolbox", "nix"] {{- else }} -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", "helm", "certbot", "bun", "bun_packages", "firmware"] +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", "helm", "certbot", "bun", "bun_packages", "jet_brains_toolbox", "firmware"] {{- end }} # Skip Notify From bfaf29559c06316e84938d87415da9039b283c06 Mon Sep 17 00:00:00 2001 From: eeleater Date: Tue, 15 Apr 2025 10:11:04 +0200 Subject: [PATCH 96/97] removed some vms from vm host --- dot_config/topgrade.toml.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dot_config/topgrade.toml.tmpl b/dot_config/topgrade.toml.tmpl index 604d1aa..c589131 100644 --- a/dot_config/topgrade.toml.tmpl +++ b/dot_config/topgrade.toml.tmpl @@ -27,7 +27,7 @@ skip_notify = true # List of remote machines with Topgrade installed on them {{- if eq .chezmoi.hostname "pxm" }} -remote_topgrades = ["kali", "mail"] +remote_topgrades = ["mail"] {{- else }} remote_topgrades = ["pxm", "web", "kube", "kali", "uptime"] {{- end }} From 9310ba2e04ef51c2e4a9d84f17590cbb9bb50727 Mon Sep 17 00:00:00 2001 From: Nikolas Weger Date: Tue, 15 Apr 2025 11:57:08 +0200 Subject: [PATCH 97/97] fixed theme in omp --- dot_config/zsh/dot_zshrc.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dot_config/zsh/dot_zshrc.tmpl b/dot_config/zsh/dot_zshrc.tmpl index efd7fc4..5f633bc 100644 --- a/dot_config/zsh/dot_zshrc.tmpl +++ b/dot_config/zsh/dot_zshrc.tmpl @@ -49,5 +49,5 @@ source "$ZDOTDIR"/files/aliases.zsh for sourced in "$XDG_DATA_HOME"/zsh/*; do source $sourced; done # theme -ompTheme="https://github.com/JanDeDobbeleer/oh-my-posh/blob/main/themes/emodipt-extend.omp.json" +ompTheme="https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/refs/heads/main/themes/emodipt-extend.omp.json" eval "$(oh-my-posh init zsh --config="$ompTheme")"