Update .config/kitty/current-theme.conf

Update .config/kitty/kitty.conf
Update .config/zsh/env.zsh
Update .config/zsh/rc.zsh
Add .local/share/zsh/env.zsh
This commit is contained in:
eeleater 2022-12-08 18:31:13 +01:00
parent 1095eaec35
commit ac8d78a35a
5 changed files with 82 additions and 121 deletions

View file

@ -1,80 +1,32 @@
# vim:ft=kitty
# 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.
## name: Catppuccin-Mocha
## author: Pocco81 (https://github.com/Pocco81)
## license: MIT
## upstream: https://github.com/catppuccin/kitty/blob/main/mocha.conf
## blurb: Soothing pastel theme for the high-spirited!
# 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
# The basic colors
foreground #CDD6F4
background #1E1E2E
selection_foreground #1E1E2E
selection_background #F5E0DC
# Tab Bar
# Cursor colors
cursor #F5E0DC
cursor_text_color #1E1E2E
# URL underline color when hovering with mouse
url_color #F5E0DC
# Kitty window border colors
active_border_color #B4BEFE
inactive_border_color #6C7086
bell_border_color #F9E2AF
# OS Window titlebar colors
wayland_titlebar_color system
macos_titlebar_color system
# Tab bar colors
active_tab_foreground #11111B
active_tab_background #CBA6F7
inactive_tab_foreground #CDD6F4
inactive_tab_background #181825
tab_bar_background #11111B
# Colors for marks (marked text in the terminal)
mark1_foreground #1E1E2E
mark1_background #B4BEFE
mark2_foreground #1E1E2E
mark2_background #CBA6F7
mark3_foreground #1E1E2E
mark3_background #74C7EC
# The 16 terminal colors
# black
color0 #45475A
color8 #585B70
# red
color1 #F38BA8
color9 #F38BA8
# green
color2 #A6E3A1
color10 #A6E3A1
# yellow
color3 #F9E2AF
color11 #F9E2AF
# blue
color4 #89B4FA
color12 #89B4FA
# magenta
color5 #F5C2E7
color13 #F5C2E7
# cyan
color6 #94E2D5
color14 #94E2D5
# white
color7 #BAC2DE
color15 #A6ADC8
active_tab_foreground #282c34
active_tab_background #979eab
inactive_tab_foreground #abb2bf
inactive_tab_background #282c34

View file

@ -10,6 +10,6 @@ shell_integration enabled
font_family FiraCode Nerd Font
# BEGIN_KITTY_THEME
# Catppuccin-Mocha
# One Dark
include current-theme.conf
# END_KITTY_THEME

View file

@ -11,15 +11,23 @@ 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_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
# system xdg stuff
export XDG_DATA_DIRS=/usr/local/share:/usr/share
export XDG_CONFIG_DIRS=/etc/xdg
# moved from home folder
# cache stuff
# cache files
export NUGET_PACKAGES="$XDG_CACHE_HOME"/NuGetPackages
export ZSH_EVALCACHE_DIR="$XDG_CACHE_HOME"/evalcache
# config stuff
# config files
export NBRC_PATH="$XDG_CONFIG_HOME"/nbrc
export FZF_MARKS_FILE="$XDG_CONFIG_HOME"/fzfmarks
export DOCKER_CONFIG="$XDG_CONFIG_HOME"/docker
@ -27,14 +35,21 @@ 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 STARSHIP_CONFIG_DIR="$XDG_CONFIG_HOME"/starship
export STARSHIP_CONFIG="$STARSHIP_CONFIG_DIR"/config.toml
export SHELDON_CONFIG_DIR="$XDG_CONFIG_HOME"/sheldon
export SHELDON_CONFIG_FILE="$SHELDON_CONFIG_DIR"/plugins.toml
export SHELDON_LOCK_FILE="$SHELDON_CONFIG_DIR"/plugins.lock
# data stuff
# 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 SHELDON_DATA_DIR="$XDG_DATA_HOME"/sheldon
export SHELDON_CLONE_DIR="$SHELDON_DATA_DIR"/repos
export SHELDON_DOWNLOAD_DIR="$SHELDON_DATA_DIR"/downloads
# gpg
#export GNUPGHOME="$XDG_DATA_HOME"/gnupg
@ -44,28 +59,20 @@ export GPG_TTY="$TTY"
export OATH_EMAIL="nikolasweger@googlemail.com"
export OATH_KEY="CF8884FDBBEBD52ED12C9CBAAA591DF04F25A9EA"
# man and less
export MANPAGER="sh -c 'col -bx | bat -l man -p'"
# less, editor, visual
export LESSHISTFILE="$XDG_STATE_HOME"/less/history
# editor and visual
export EDITOR=nvim
export VISUAL=kate
# sheldon
export SHELDON_CONFIG_DIR="$XDG_CONFIG_HOME"/sheldon
export SHELDON_DATA_DIR="$XDG_DATA_HOME"/sheldon
export SHELDON_CONFIG_FILE="$SHELDON_CONFIG_DIR"/plugins.toml
export SHELDON_LOCK_FILE="$SHELDON_CONFIG_DIR"/plugins.lock
export SHELDON_CLONE_DIR="$SHELDON_DATA_DIR"/repos
export SHELDON_DOWNLOAD_DIR="$SHELDON_DATA_DIR"/downloads
# starship
export STARSHIP_CONFIG="$STARSHIP_CONFIG_DIR"/config.toml
# zellij
export ZELLIJ_AUTO_ATTACH=true
export ZELLIJ_AUTO_EXIT=true
export VISUAL="subl -w"
# stuff
export TERMINALNAME=$(fastfetch --pipe | grep -i terminal: | awk '{print $2}')
export ZELLIJ_AUTO_ATTACH=true
export ZELLIJ_AUTO_EXIT=true
export TERMINALNAME=$(fastfetch --pipe 2>/dev/null | grep -i terminal: | awk '{print $2}')
# zsh specific
export HISTSIZE=1048576
export SAVEHIST=1048576
export HISTFILE="$XDG_CACHE_HOME"/zsh/history
# local
source "$XDG_DATA_HOME"/zsh/env.zsh

View file

@ -1,4 +1,4 @@
if test $(hostname) = "kali.hbz184-11"; then unset ZDOTDIR; exec zsh; fi # fix distrobox
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 # don't autostart in kitty or konsole
#fastfetch
@ -6,28 +6,20 @@ bofh; echo " - BOFH"
#source /usr/share/zsh/plugins/hq/hq.zsh
#colorscript random
# Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.config/zsh/.zshrc.
if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then
source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
fi
# To customize prompt, run `p10k configure` or edit ~/.config/zsh/.p10k.zsh.
[[ ! -f ~/.config/zsh/.p10k.zsh ]] || source ~/.config/zsh/.p10k.zsh
# Powerlevel10k - instant prompt and config
test -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" && source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
test -f "$XDG_CONFIG_HOME"/zsh/.p10k.zsh && source "$XDG_CONFIG_HOME"/zsh/.p10k.zsh # p10k configure
# ensure zsh cache folder exists
mkdir -p "$XDG_CACHE_HOME/zsh" &>/dev/null
mkdir -p "$XDG_CACHE_HOME"/zsh &>/dev/null
# compinit
autoload -Uz compinit
compinit -d "$XDG_CACHE_HOME"/zsh/compdump
autoload -Uz compinit; compinit -d "$XDG_CACHE_HOME"/zsh/compdump
# autosuggestions
source /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh
# history
export SAVEHIST=1048576
export HISTSIZE=1048576
export HISTFILE="$XDG_CACHE_HOME/zsh/history"
setopt inc_append_history
# libraries
@ -51,6 +43,8 @@ source /usr/share/zsh/plugins/thefuck/thefuck.zsh
source /usr/share/zsh/plugins/forgit/forgit.plugin.zsh
source /usr/share/zsh/plugins/ysu/ysu.zsh
source /usr/share/zsh/plugins/oath/oath.zsh
source /usr/share/zsh/plugins/exa/exa.zsh
source /usr/share/zsh/plugins/bat/bat.zsh
# plugins (self)
source /home/weger/.config/zsh/distroicon.zsh
@ -63,7 +57,7 @@ _evalcache atuin init zsh
_evalcache navi widget zsh
_evalcache direnv hook zsh
source /opt/asdf-vm/asdf.sh
eval "$(keychain --dir "$XDG_CACHE_HOME/keychain" --eval --quiet id_rsa)"
eval "$(keychain --dir "$XDG_CACHE_HOME"/keychain --eval --quiet id_rsa)"
#themes
source /usr/share/zsh/themes/powerlevel10k/powerlevel10k.zsh-theme
@ -71,9 +65,6 @@ source /usr/share/zsh/themes/powerlevel10k/powerlevel10k.zsh-theme
#_evalcache oh-my-posh init zsh --config /usr/share/oh-my-posh/themes/kali.omp.json
# aliases
alias ls='exa --icons --color=always'
alias l='ls -al --group-directories-first'
alias cat='bat'
alias cd='z'
alias grep='rg'
alias find='fd'
@ -84,8 +75,6 @@ alias cp='cp -i'
alias mv='mv -i'
# misc aliases
alias tree='tree -a -I .git'
alias https='http --default-scheme=https'
alias termbin="nc termbin.com 9999"
alias ktheme='kitty +kitten themes --reload-in=all'
alias wget='wget --hsts-file="$XDG_DATA_HOME"/wget-hsts'
@ -96,6 +85,10 @@ 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
# use known_hosts for completion
zstyle -e ':completion:*:(ssh|scp|sftp|rsh|rsync):hosts' hosts 'reply=(${=${${(f)"$(cat {/etc/ssh_,~/.ssh/known_}hosts(|2)(N) /dev/null)"}%%[# ]*}//,/ })'

View file

@ -0,0 +1,9 @@
-----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBYa3JCTlYrMUlEY0tST1JP
b2lrRHhiRWVYMXZNU21pKytERWVlNW9QaW1nCmxYUXAwQndRdEN6bm9Bc3YwRXZY
TFNqMEZ1bklaNEdqK1E0Z1ZFdWJhRncKLS0tIFpTMm10c2NoVE5BdW50aEtHREFn
bXhBeDgxZFVDRXF2S3hhcEl3NTBxcFEKnn/nmWlTovRjja3JqJBWeDP6reESd65f
4pDGeXmeN+VVSezUIlSzg16yjqSb+xDer9TZHgXLNtARaLDZzUAFtBGNbWiSE9d/
Eo062Fr0qo2Eld2N2kTe+6X5OONY99orIV42dvm1KhMvhwldxfOOOXRwplLjfiiB
RYpoD8gt6nOzixjxSMBJA9exdu8c1II8jt9n58zpSstj
-----END AGE ENCRYPTED FILE-----