From 62ea83b28b1dbb8f46937d73023173bcf2c346b9 Mon Sep 17 00:00:00 2001 From: eeleater Date: Sun, 11 Aug 2024 23:15:51 +0200 Subject: [PATCH] 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.