From 1095eaec35bc0f9cea7333f79c23c6bfd2bfa5b5 Mon Sep 17 00:00:00 2001 From: eeleater Date: Mon, 28 Nov 2022 00:25:55 +0100 Subject: [PATCH] Add .config/alacritty/alacritty.yml Update .config/kitty/current-theme.conf Update .config/kitty/kitty.conf Update .config/zsh/env.zsh Update .config/zsh/rc.zsh Add .config/zsh/.zprofile Add .config/zsh/zprofile.zsh --- dot_config/alacritty/alacritty.yml | 162 ++++++++++++++++++++++++++++ dot_config/kitty/current-theme.conf | 92 ++++++++++------ dot_config/kitty/kitty.conf | 7 +- dot_config/zsh/env.zsh | 21 +++- dot_config/zsh/rc.zsh | 18 ++-- dot_config/zsh/symlink_dot_zprofile | 1 + dot_config/zsh/zprofile.zsh | 0 7 files changed, 258 insertions(+), 43 deletions(-) create mode 100755 dot_config/alacritty/alacritty.yml create mode 100644 dot_config/zsh/symlink_dot_zprofile create mode 100644 dot_config/zsh/zprofile.zsh diff --git a/dot_config/alacritty/alacritty.yml b/dot_config/alacritty/alacritty.yml new file mode 100755 index 0000000..5947a3a --- /dev/null +++ b/dot_config/alacritty/alacritty.yml @@ -0,0 +1,162 @@ +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/kitty/current-theme.conf b/dot_config/kitty/current-theme.conf index f48ac3d..2533db7 100644 --- a/dot_config/kitty/current-theme.conf +++ b/dot_config/kitty/current-theme.conf @@ -1,50 +1,80 @@ # vim:ft=kitty -## name: Nord -## author: Connor Holyday -## license: MIT -## upstream: https://raw.githubusercontent.com/connorholyday/nord-kitty/master/nord.conf -## blurb: An arctic, north-bluish clean and elegant Kitty theme. -# Nord Colorscheme for Kitty -# Based on: -# - https://gist.github.com/marcusramberg/64010234c95a93d953e8c79fdaf94192 -# - https://github.com/arcticicestudio/nord-hyper +## 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! -foreground #D8DEE9 -background #2E3440 -selection_foreground #000000 -selection_background #FFFACD -url_color #0087BD -cursor #81A1C1 + + +# The basic colors +foreground #CDD6F4 +background #1E1E2E +selection_foreground #1E1E2E +selection_background #F5E0DC + +# 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 #3B4252 -color8 #4C566A +color0 #45475A +color8 #585B70 # red -color1 #BF616A -color9 #BF616A +color1 #F38BA8 +color9 #F38BA8 # green -color2 #A3BE8C -color10 #A3BE8C +color2 #A6E3A1 +color10 #A6E3A1 # yellow -color3 #EBCB8B -color11 #EBCB8B +color3 #F9E2AF +color11 #F9E2AF # blue -color4 #81A1C1 -color12 #81A1C1 +color4 #89B4FA +color12 #89B4FA # magenta -color5 #B48EAD -color13 #B48EAD +color5 #F5C2E7 +color13 #F5C2E7 # cyan -color6 #88C0D0 -color14 #8FBCBB +color6 #94E2D5 +color14 #94E2D5 # white -color7 #E5E9F0 -color15 #ECEFF4 +color7 #BAC2DE +color15 #A6ADC8 diff --git a/dot_config/kitty/kitty.conf b/dot_config/kitty/kitty.conf index c227797..50c951f 100644 --- a/dot_config/kitty/kitty.conf +++ b/dot_config/kitty/kitty.conf @@ -4,13 +4,12 @@ copy_on_select no strip_trailing_spaces smart window_padding_width 5 enable_audio_bell no -shell_integration no-rc +shell_integration enabled # Fonts font_family FiraCode Nerd Font - # BEGIN_KITTY_THEME -# Nord +# Catppuccin-Mocha include current-theme.conf -# END_KITTY_THEME \ No newline at end of file +# END_KITTY_THEME diff --git a/dot_config/zsh/env.zsh b/dot_config/zsh/env.zsh index 5b39ee3..b92844a 100644 --- a/dot_config/zsh/env.zsh +++ b/dot_config/zsh/env.zsh @@ -1,6 +1,11 @@ # 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 @@ -20,6 +25,8 @@ 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 STARSHIP_CONFIG_DIR="$XDG_CONFIG_HOME"/starship # data stuff export XCURSOR_PATH=/usr/share/icons:"$XDG_DATA_HOME"/icons @@ -27,10 +34,16 @@ 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 # gpg +#export GNUPGHOME="$XDG_DATA_HOME"/gnupg export GPG_TTY="$TTY" +# oath +export OATH_EMAIL="nikolasweger@googlemail.com" +export OATH_KEY="CF8884FDBBEBD52ED12C9CBAAA591DF04F25A9EA" + # man and less export MANPAGER="sh -c 'col -bx | bat -l man -p'" export LESSHISTFILE="$XDG_STATE_HOME"/less/history @@ -48,5 +61,11 @@ export SHELDON_CLONE_DIR="$SHELDON_DATA_DIR"/repos export SHELDON_DOWNLOAD_DIR="$SHELDON_DATA_DIR"/downloads # starship -export STARSHIP_CONFIG_DIR="$XDG_CONFIG_HOME"/starship export STARSHIP_CONFIG="$STARSHIP_CONFIG_DIR"/config.toml + +# zellij +export ZELLIJ_AUTO_ATTACH=true +export ZELLIJ_AUTO_EXIT=true + +# stuff +export TERMINALNAME=$(fastfetch --pipe | grep -i terminal: | awk '{print $2}') diff --git a/dot_config/zsh/rc.zsh b/dot_config/zsh/rc.zsh index 3dce65b..be10cd1 100644 --- a/dot_config/zsh/rc.zsh +++ b/dot_config/zsh/rc.zsh @@ -1,11 +1,12 @@ +if test $(hostname) = "kali.hbz184-11"; 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 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. -# Initialization code that may require console input (password prompts, [y/n] -# confirmations, etc.) must go above this block; everything else may go below. 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 @@ -39,7 +40,7 @@ source /usr/share/ohmyzsh/lib/key-bindings.zsh source /usr/share/ohmyzsh/plugins/systemd/systemd.plugin.zsh source /usr/share/ohmyzsh/plugins/fzf/fzf.plugin.zsh -# plugins (own) +# plugins (arch) source /usr/share/doc/find-the-command/ftc.zsh source /usr/share/zsh/plugins/fzf-tab/fzf-tab.zsh source /usr/share/zsh/plugins/fzf-marks/fzf-marks.zsh @@ -47,8 +48,11 @@ source /usr/share/zsh/plugins/evalcache/evalcache.zsh source /usr/share/zsh/plugins/colorize/colorize.zsh source /usr/share/zsh/plugins/titles/titles.zsh source /usr/share/zsh/plugins/thefuck/thefuck.zsh -source /usr/share/zsh/plugins/forgit/forgit.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 + +# plugins (self) source /home/weger/.config/zsh/distroicon.zsh source /home/weger/.config/zsh/transfer.zsh @@ -64,11 +68,11 @@ eval "$(keychain --dir "$XDG_CACHE_HOME/keychain" --eval --quiet id_rsa)" #themes source /usr/share/zsh/themes/powerlevel10k/powerlevel10k.zsh-theme #_evalcache starship init zsh -#_evalcache oh-my-posh init zsh +#_evalcache oh-my-posh init zsh --config /usr/share/oh-my-posh/themes/kali.omp.json # aliases -alias ls='exa' -alias l='exa -al --color=always --group-directories-first' +alias ls='exa --icons --color=always' +alias l='ls -al --group-directories-first' alias cat='bat' alias cd='z' alias grep='rg' diff --git a/dot_config/zsh/symlink_dot_zprofile b/dot_config/zsh/symlink_dot_zprofile new file mode 100644 index 0000000..fc78fe4 --- /dev/null +++ b/dot_config/zsh/symlink_dot_zprofile @@ -0,0 +1 @@ +zprofile.zsh diff --git a/dot_config/zsh/zprofile.zsh b/dot_config/zsh/zprofile.zsh new file mode 100644 index 0000000..e69de29