diff --git a/deploy.sh b/deploy.sh index 60c842e..77b6e99 100755 --- a/deploy.sh +++ b/deploy.sh @@ -17,8 +17,9 @@ echo " " case ${shell} in bash) - cp -rfv ./home/.bashrc-bloated ~/.bashrc - cp -rfv ./home/.bash_profile ~/.bash_profile + cp -rfv ./home/.bashrc-bloated ~/.bashrc + cp -rfv ./home/.bash_profile ~/.bash_profile + cp -rfv ./home/.local/share/bash/ ~/.local/share/bash/ ;; zsh) cp -rfv ./home/.bashrc ~/.bashrc @@ -61,17 +62,17 @@ case ${server} in cp -rfv ./home/.config/wayfire.ini ~/.config/wayfire.ini ;; x11) - cp -rfv ./home/.config/bsp-layout/ ~/.config/bsp-layout/ - cp -rfv ./home/.config/bspwm/ ~/.config/bspwm/ - cp -rfv ./home/.config/dunst/ ~/.config/dunst/ - cp -rfv ./home/.config/kitty/ ~/.config/kitty/ - cp -rfv ./home/.config/polybar/ ~/.config/polybar/ - cp -rfv ./home/.config/rofi/ ~/.config/rofi/ - cp -rfv ./home/.config/spectrwm/ ~/.config/spectrwm/ - cp -rfv ./home/.config/sxhkd/ ~/.config/sxhkd/ - cp -rfv ./home/.config/X11/ ~/.config/X11/ - cp -rfv ./home/.config/greenclip.cfg ~/.config/greenclip.cfg - cp -rfv ./home/.config/picom.conf ~/.config/picom.conf + cp -rfv ./home/.config/bsp-layout/ ~/.config/bsp-layout/ + cp -rfv ./home/.config/bspwm/ ~/.config/bspwm/ + cp -rfv ./home/.config/dunst/ ~/.config/dunst/ + cp -rfv ./home/.config/kitty/ ~/.config/kitty/ + cp -rfv ./home/.config/polybar/ ~/.config/polybar/ + cp -rfv ./home/.config/rofi/ ~/.config/rofi/ + cp -rfv ./home/.config/spectrwm/ ~/.config/spectrwm/ + cp -rfv ./home/.config/sxhkd/ ~/.config/sxhkd/ + cp -rfv ./home/.config/X11/ ~/.config/X11/ + cp -rfv ./home/.config/greenclip.toml ~/.config/greenclip.toml + cp -rfv ./home/.config/picom.conf ~/.config/picom.conf ;; *) exit ;; diff --git a/home/.bashrc b/home/.bashrc index 589f0d0..cd90906 100644 --- a/home/.bashrc +++ b/home/.bashrc @@ -3,7 +3,7 @@ # a minimal approach when bash is not a default shell export BASH_COMPLETION_USER_DIR="$HOME/.local/share/bash" -export HISTFILE="$HOME/.local/share/bash/bash_history" +export HISTFILE="$BASH_COMPLETION_USER_DIR/bash_history" # ________ _______________ # __ ___/______ /__ /___(_)_____________ ________ diff --git a/home/.bashrc-bloated b/home/.bashrc-bloated index e061267..30921e3 100644 --- a/home/.bashrc-bloated +++ b/home/.bashrc-bloated @@ -12,8 +12,8 @@ export XDG_CACHE_HOME=$HOME/.cache export XDG_DATA_HOME=$HOME/.local/share export XDG_DATA_DIRS=$HOME/.local/share/flatpak/exports/share:/var/lib/flatpak/exports/share:/usr/local/share:/usr/share # alternate paths -export HISTFILE="$XDG_DATA_HOME/bash/bash_history" export BASH_COMPLETION_USER_DIR="$XDG_DATA_HOME/bash" +export HISTFILE="$BASH_COMPLETION_USER_DIR/bash_history" export LESSHISTFILE=- export MOST_INITFILE=$XDG_CONFIG_HOME/mostrc export GTK2_RC_FILES=$XDG_CONFIG_HOME/gtk-2.0/gtkrc @@ -87,8 +87,6 @@ export _ZO_RESOLVE_SYMLINKS=1 # export _ZL_INT_SORT=1 # export _ZL_ROOT_MARKERS=".git,.svn,.hg,.root,package.json,.projectile,.pro" # export RANGER_ZLUA="$HOME/.local/share/bash/z.lua" -# Basher -export BASHER_ROOT="$HOME/.local/share/bash/basher" # nodenv export NODENV_ROOT="$HOME/.local/share/nodenv" # pyenv @@ -366,7 +364,7 @@ then fi # PATH -export PATH=$HOME/.local/bin:$HOME/.local/bin/fzf:$HOME/.local/share/bash/basher/bin:$NODENV_ROOT/bin:$PYENV_ROOT/bin:$POETRY_HOME/bin:$CARGO_HOME/bin:$GOPATH/bin:$NPM_CONFIG_PREFIX/bin:$PATH +export PATH=$HOME/.local/bin:$HOME/.local/bin/fzf:$NODENV_ROOT/bin:$PYENV_ROOT/bin:$POETRY_HOME/bin:$CARGO_HOME/bin:$GOPATH/bin:$NPM_CONFIG_PREFIX/bin:$PATH # _________________ # ___ |__ /__(_)_____ ________ @@ -384,7 +382,6 @@ alias mv="mv -vi" alias rm="rm -vr" alias mkdir="mkdir -pv" alias no="grep -viP" -# alias latest_pkg="expac --timefmt='%Y-%m-%d %T' '%l\t%n' | sort | tail -n 30" alias yarn="yarn --use-yarnrc $XDG_CONFIG_HOME/yarn/config" alias tmux="TERM=screen-256color tmux" alias startx="startx $HOME/.config/X11/xinitrc" @@ -503,24 +500,6 @@ extract() { done } -# update Basher -basher_update() { - pushd $HOME/.local/share/bash/basher >/dev/null || exit - git pull - echo -e "\e[01;34mFinished updating Basher\e[0m" - popd >/dev/null || exit -} - -# upgrade Basher's packages -basherpacks_update() { - packages=$(basher list) - for pack in $packages - do - echo -e "\e[01;34mUpgrading $pack\e[0m" - basher upgrade "$pack" >/dev/null 2>&1 - done -} - # nnn with cd on quit if command -v nnn >/dev/null; then alias ncp="cat ${NNN_SEL:-${XDG_CONFIG_HOME:-$HOME/.config}/nnn/.selection} | tr '\0' '\n'" @@ -568,27 +547,6 @@ tt() { command tt /tmp/tt.txt } -# ________ ______ -# ___ __ )_____ __________ /______________ -# __ __ | __ `/_ ___/_ __ \ _ \_ ___/ -# _ /_/ // /_/ /_(__ )_ / / / __/ / -# /_____/ \__,_/ /____/ /_/ /_/\___//_/ -# -# Install Basher if missing -if [[ ! -d $HOME/.local/share/bash/basher ]]; then - git clone https://github.com/basherpm/basher.git $HOME/.local/share/bash/basher -fi -eval "$(basher init - bash)" -# Plugins -# [[ -d $HOME/.local/share/bash/basher/cellar/packages/kazhala/dotbare ]] || basher install kazhala/dotbare -[[ -d $HOME/.local/share/bash/basher/cellar/packages/wfxr/forgit ]] || basher install wfxr/forgit -[[ -d $HOME/.local/share/bash/basher/cellar/packages/holman/spark ]] || basher install holman/spark -[[ -d $HOME/.local/share/bash/basher/cellar/packages/unixorn/git-extra-commands ]] || basher install unixorn/git-extra-commands - -# Plugins' init -# include kazhala/dotbare dotbare.plugin.bash && _dotbare_completion_cmd -include wfxr/forgit forgit.plugin.sh - # ________ _______________ # __ ___/______ /__ /___(_)_____________ ________ # _____ \_ _ \ __/ __/_ /__ __ \_ __ `/_ ___/ @@ -702,10 +660,30 @@ shopt -s checkwinsize shopt -s expand_aliases shopt -s histappend -# this is overkilled but it works conveniently -[[ -d $HOME/.local/share/bash/basher/cellar/packages/junegunn/fzf ]] || basher install junegunn/fzf -include junegunn/fzf shell/key-bindings.bash -include junegunn/fzf shell/completion.bash +export PS2="\[\e[1;31m\]> " + +# ______________ _____ +# ___ __ \__ /___ ________ ___(_)______________ +# __ /_/ /_ /_ / / /_ __ `/_ /__ __ \_ ___/ +# _ ____/_ / / /_/ /_ /_/ /_ / _ / / /(__ ) +# /_/ /_/ \__,_/ _\__, / /_/ /_/ /_//____/ +# /____/ +# forgit +if [ ! -f "$BASH_COMPLETION_USER_DIR/plugins/forgit.plugin.bash" ]; then + curl -fLo $BASH_COMPLETION_USER_DIR/plugins/forgit.plugin.bash https://github.com/wfxr/forgit/raw/master/forgit.plugin.zsh +fi +source $BASH_COMPLETION_USER_DIR/plugins/forgit.plugin.sh + +# If I don't want starship +# source $BASH_COMPLETION_USER_DIR/plugins/prompt.bash + +# fzf +if [ ! -f "$BASH_COMPLETION_USER_DIR/plugins/fzf-completion.bash" ] || [ ! -f "$BASH_COMPLETION_USER_DIR/plugins/fzf-bindings.bash" ]; then + curl -fLo $BASH_COMPLETION_USER_DIR/plugins/fzf-completion.bash https://github.com/junegunn/fzf/raw/master/shell/completion.bash + curl -fLo $BASH_COMPLETION_USER_DIR/plugins/fzf-bindings.bash https://github.com/junegunn/fzf/raw/master/shell/key-bindings.bash +fi +source $BASH_COMPLETION_USER_DIR/plugins/fzf-completion.bash +source $BASH_COMPLETION_USER_DIR/plugins/fzf-bindings.bash export FZF_COMPLETION_OPTS='-x' # Use fd instead of find for fzf_completion @@ -724,68 +702,4 @@ _fzf_setup_completion dir tree # ^X^R bind "$(bind -s | grep '^"\\C-r"' | sed 's/"/"\\C-x/' | sed 's/"$/\\C-m"/')" -# ________ _____ -# ___ __ \___________________ _____________ /_ -# __ /_/ /_ ___/ __ \_ __ `__ \__ __ \ __/ -# _ ____/_ / / /_/ / / / / / /_ /_/ / /_ -# /_/ /_/ \____//_/ /_/ /_/_ .___/\__/ -# /_/ -# -# get current branch in git repo -parse_git_branch() { - BRANCH=$(git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/') - if [ ! "${BRANCH}" = "" ] - then - STAT=$(parse_git_dirty) - echo "${BRANCH}${STAT}" - else - echo "" - fi -} - -# get current status of git repo -parse_git_dirty() { - status=$(git status 2>&1 | tee) - dirty=$(echo -n "${status}" 2> /dev/null | grep "modified:" &> /dev/null; echo "$?") - untracked=$(echo -n "${status}" 2> /dev/null | grep "Untracked files" &> /dev/null; echo "$?") - ahead=$(echo -n "${status}" 2> /dev/null | grep "Your branch is ahead of" &> /dev/null; echo "$?") - newfile=$(echo -n "${status}" 2> /dev/null | grep "new file:" &> /dev/null; echo "$?") - renamed=$(echo -n "${status}" 2> /dev/null | grep "renamed:" &> /dev/null; echo "$?") - deleted=$(echo -n "${status}" 2> /dev/null | grep "deleted:" &> /dev/null; echo "$?") - bits='' - if [ "${ahead}" = "0" ]; then - bits="*${bits}" - fi - if [ "${renamed}" = "0" ]; then - bits=">${bits}" - fi - if [ "${newfile}" = "0" ]; then - bits="+${bits}" - fi - if [ "${untracked}" = "0" ]; then - bits="?${bits}" - fi - if [ "${deleted}" = "0" ]; then - bits="x${bits}" - fi - if [ "${dirty}" = "0" ]; then - bits="!${bits}" - fi - if [ ! "${bits}" = "" ]; then - echo " ${bits}" - else - echo "" - fi -} - -# Prompt -export PS1="\[$(tput bold)\]\[$(tput setaf 1)\]╭─[\[$(tput setaf 3)\]\u\[$(tput setaf 2)\]@\[$(tput setaf 4)\]\h \$(if [[ \$? == 0 ]]; then echo \"\[$(tput setaf 2)\]\342\234\223\"; else echo \"\[$(tput setaf 1)\]\342\234\227\"; fi)\[$(tput setaf 1)\]] \[$(tput setaf 5)\]\w \[$(tput setaf 2)\]\`parse_git_branch\`\n\[$(tput setaf 1)\]╰\[$(tput sgr0)\] " -export PS2="\[\e[1;31m\]> " - -# _________ __________ -# __ ____/__________________ /___(_)_____________ _ -# _ / __ __ ___/ _ \ _ \ __/_ /__ __ \_ __ `/ -# / /_/ / _ / / __/ __/ /_ _ / _ / / / /_/ / -# \____/ /_/ \___/\___/\__/ /_/ /_/ /_/_\__, / -# /____/ $HOME/.local/bin/bunny diff --git a/home/.config/amfora/config.toml b/home/.config/amfora/config.toml index 865240d..9861b89 100644 --- a/home/.config/amfora/config.toml +++ b/home/.config/amfora/config.toml @@ -36,6 +36,7 @@ http = 'qutebrowser' # Any URL that will accept a query string can be put here search = "gemini://gus.guru/search" +# search = "gemini://geminispace.info/search" # Whether colors will be used in the terminal color = true diff --git a/home/.config/bottom/bottom.toml b/home/.config/bottom/bottom.toml index e5ddd5a..d5fb530 100644 --- a/home/.config/bottom/bottom.toml +++ b/home/.config/bottom/bottom.toml @@ -1,75 +1,41 @@ -# Do something +# Config file for bottom + [flags] + hide_avg_cpu = true + dot_marker = true + rate = 1000 + left_legend = true + current_usage = true + group_processes = true + case_sensitive = false + whole_word = false + regex = false + show_disabled_data = false + temperature_type = "c" + default_time_value = 60000 + time_delta = 15000 + default_widget_type = "proc" + default_widget_count = 1 + basic = false + use_old_network_legend = false + hide_table_count = false -# Hide avg_cpu (doesn't work though) -hide_avg_cpu = true - -dot_marker = true - -rate = 1000 - -left_legend = true - -current_usage = true - -group_processes = true - -case_sensitive = false - -whole_word = false - -regex = false - -show_disabled_data = false - -temperature_type = "c" - -default_time_value = 60000 - -time_delta = 15000 - -default_widget_type = "proc" - -default_widget_count = 1 - -basic = false - -use_old_network_legend = false - -hide_table_count = false - -# Colors [colors] - -table_header_color="LightBlue" - -widget_title_color="White" - -avg_cpu_color="Red" - -cpu_core_colors=["LightMagenta", "LightYellow", "White", "LightGreen", "LightBlue", "LightRed", "Cyan", "Yellow"] - -ram_color="Green" - -swap_color="Yellow" - -rx_color="Green" - -tx_color="Yellow" - -border_color="Blue" - -highlighted_border_color="Green" - -text_color="Gray" - -selected_text_color="Black" - -selected_bg_color="LightBlue" - -graph_color="Blue" - -battery_colors = ["red", "yellow", "yellow", "green", "green", "green"] + table_header_color="LightBlue" + widget_title_color="White" + avg_cpu_color="Red" + cpu_core_colors=["LightMagenta", "LightYellow", "White", "LightGreen", "LightBlue", "LightRed", "Cyan", "Yellow"] + ram_color="Green" + swap_color="Yellow" + rx_color="Green" + tx_color="Yellow" + border_color="Blue" + highlighted_border_color="Green" + text_color="Gray" + selected_text_color="Black" + selected_bg_color="LightBlue" + graph_color="Blue" + battery_colors = ["red", "yellow", "yellow", "green", "green", "green"] # The default widget layout: #[[row]] diff --git a/home/.config/fish/conf.d/aliases.fish b/home/.config/fish/conf.d/aliases.fish index a284e0b..bfcda25 100644 --- a/home/.config/fish/conf.d/aliases.fish +++ b/home/.config/fish/conf.d/aliases.fish @@ -16,7 +16,6 @@ alias mv='mv -vi' alias rm='rm -vr' alias mkdir='mkdir -pv' abbr no 'grep -viP' -# abbr latest_pkg "expac --timefmt='%Y-%m-%d %T' '%l\t%n' | sort | tail -n 30" alias yarn='yarn --use-yarnrc $HOME/.config/yarn/config' abbr tmux 'TERM=screen-256color command tmux' # colorizing diff --git a/home/.config/greenclip.cfg b/home/.config/greenclip.cfg deleted file mode 100644 index 6ecbdbd..0000000 --- a/home/.config/greenclip.cfg +++ /dev/null @@ -1,9 +0,0 @@ -Config { - maxHistoryLength = 1000, - historyPath = "~/.cache/greenclip/history", - staticHistoryPath = "~/.cache/greenclip/staticHistory", - imageCachePath = "/tmp/greenclip/", - usePrimarySelectionAsInput = False, - blacklistedApps = [], - trimSpaceFromSelection = True -} diff --git a/home/.config/greenclip.toml b/home/.config/greenclip.toml new file mode 100644 index 0000000..777ff20 --- /dev/null +++ b/home/.config/greenclip.toml @@ -0,0 +1,13 @@ +[greenclip] + history_file = "~/.cache/greenclip.history" + max_history_length = 1000 + max_selection_size_bytes = 0 + trim_space_from_selection = true + use_primary_selection_as_input = false + blacklisted_applications = [] + enable_image_support = true + # path without ending / will generate mktemp directory at the prefix location + image_cache_directory = "/tmp/greenclip" + staticHistory = [ + '''¯\_(ツ)_/¯''', +] diff --git a/home/.config/nvim/general/basic-settings.vim b/home/.config/nvim/general/basic-settings.vim index 70e0f76..6ec9750 100644 --- a/home/.config/nvim/general/basic-settings.vim +++ b/home/.config/nvim/general/basic-settings.vim @@ -1,9 +1,3 @@ -" ______ _____ -" ___ /_______ __________(_)______ -" __ __ \ __ `/_ ___/_ /_ ___/ -" _ /_/ / /_/ /_(__ )_ / / /__ -" /_.___/\__,_/ /____/ /_/ \___/ -" syntax on filetype indent plugin on if &term =~ '256color' diff --git a/home/.config/nvim/plugin/keybindings.vim b/home/.config/nvim/plugin/keybindings.vim index a5693c0..61f2edd 100644 --- a/home/.config/nvim/plugin/keybindings.vim +++ b/home/.config/nvim/plugin/keybindings.vim @@ -1,10 +1,3 @@ -" ______ ______ _____ _________ -" ___ /___________ ____ /____(_)____________ /_______ -" __ //_/ _ \_ / / /_ __ \_ /__ __ \ __ /__ ___/ -" _ ,< / __/ /_/ /_ /_/ / / _ / / / /_/ / _(__ ) -" /_/|_| \___/_\__, / /_.___//_/ /_/ /_/\__,_/ /____/ -" /____/ -" " Better escape inoremap jk inoremap kj diff --git a/home/.config/nvim/vim-plug/vim-plug.vim b/home/.config/nvim/vim-plug/vim-plug.vim index c7ea6da..e234d47 100644 --- a/home/.config/nvim/vim-plug/vim-plug.vim +++ b/home/.config/nvim/vim-plug/vim-plug.vim @@ -1,10 +1,3 @@ -" _____ ______ -" ___ ____(_)______ ___ ___________ /___ ________ _ -" __ | / /_ /__ __ `__ \_______ __ \_ /_ / / /_ __ `/ -" __ |/ /_ / _ / / / / //___/_ /_/ / / / /_/ /_ /_/ / -" _____/ /_/ /_/ /_/ /_/ _ .___//_/ \__,_/ _\__, / -" /_/ /____/ -" " Install vim-plug if missing if empty(glob('$HOME/.local/share/nvim/site/autoload/plug.vim')) silent !curl -fLo $HOME/.local/share/nvim/site/autoload/plug.vim --create-dirs diff --git a/home/.config/polybar/nord/config.ini b/home/.config/polybar/nord/config.ini index 2dfe5df..fc83d44 100644 --- a/home/.config/polybar/nord/config.ini +++ b/home/.config/polybar/nord/config.ini @@ -1,10 +1,3 @@ -; ________ ______ ______ -; ___ __ \________ /____ ____ /_______ ________ -; __ /_/ / __ \_ /__ / / /_ __ \ __ `/_ ___/ -; _ ____// /_/ / / _ /_/ /_ /_/ / /_/ /_ / -; /_/ \____//_/ _\__, / /_.___/\__,_/ /_/ -; /____/ - [bar/mainbar] background = #2e3440 font-0 = "Iosevka Nerd Font:style=Regular:size=12:antialias=true;3" diff --git a/home/.config/polybar/onedark/config.ini b/home/.config/polybar/onedark/config.ini index c0d592c..e214796 100644 --- a/home/.config/polybar/onedark/config.ini +++ b/home/.config/polybar/onedark/config.ini @@ -1,10 +1,3 @@ -; ________ ______ ______ -; ___ __ \________ /____ ____ /_______ ________ -; __ /_/ / __ \_ /__ / / /_ __ \ __ `/_ ___/ -; _ ____// /_/ / / _ /_/ /_ /_/ / /_/ /_ / -; /_/ \____//_/ _\__, / /_.___/\__,_/ /_/ -; /____/ -; [bar/mainbar] background = #282c34 font-0 = "Iosevka Nerd Font:style=Regular:size=12:antialias=true;2" diff --git a/home/.config/qutebrowser/base16-nord.py b/home/.config/qutebrowser/base16-nord.py index ae6dfb0..92ece26 100644 --- a/home/.config/qutebrowser/base16-nord.py +++ b/home/.config/qutebrowser/base16-nord.py @@ -1,9 +1,3 @@ -# _____ __ _________ -# ___ | / /__________________ / -# __ |/ /_ __ \_ ___/ __ / -# _ /| / / /_/ / / / /_/ / -# /_/ |_/ \____//_/ \__,_/ -# # base16-qutebrowser (https://github.com/theova/base16-qutebrowser) # Base16 qutebrowser template by theova # Nord scheme by arcticicestudio diff --git a/home/.config/qutebrowser/base16-onedark.py b/home/.config/qutebrowser/base16-onedark.py index db38bd9..abfb0e2 100644 --- a/home/.config/qutebrowser/base16-onedark.py +++ b/home/.config/qutebrowser/base16-onedark.py @@ -1,9 +1,3 @@ -# _______ ________ ______ -# __ __ \______________ __ \_____ __________ /__ -# _ / / /_ __ \ _ \_ / / / __ `/_ ___/_ //_/ -# / /_/ /_ / / / __/ /_/ // /_/ /_ / _ ,< -# \____/ /_/ /_/\___//_____/ \__,_/ /_/ /_/|_| -# # base16-qutebrowser (https://github.com/theova/base16-qutebrowser) # Base16 qutebrowser template by theova # OneDark scheme by Lalit Magant (http://github.com/tilal6991) diff --git a/home/.config/ranger/rc.conf b/home/.config/ranger/rc.conf index 5307138..a013a02 100644 --- a/home/.config/ranger/rc.conf +++ b/home/.config/ranger/rc.conf @@ -1,12 +1,4 @@ # =================================================================== -# ________ -# ___ __ \_____ ______________ _____________ -# __ /_/ / __ `/_ __ \_ __ `/ _ \_ ___/ -# _ _, _// /_/ /_ / / / /_/ // __/ / -# /_/ |_| \__,_/ /_/ /_/_\__, / \___//_/ -# /____/ -# -# =================================================================== # == Options # =================================================================== diff --git a/home/.config/spectrwm/spectrwm-nord.conf b/home/.config/spectrwm/spectrwm-nord.conf index 16297b8..fb14087 100644 --- a/home/.config/spectrwm/spectrwm-nord.conf +++ b/home/.config/spectrwm/spectrwm-nord.conf @@ -1,10 +1,3 @@ -# ________ _____ -# __ ___/____________________ /__________ ________ ___ -# _____ \___ __ \ _ \ ___/ __/_ ___/_ | /| / /_ __ `__ \ -# ____/ /__ /_/ / __/ /__ / /_ _ / __ |/ |/ /_ / / / / / -# /____/ _ .___/\___/\___/ \__/ /_/ ____/|__/ /_/ /_/ /_/ -# /_/ -# # General config workspace_limit = 10 focus_mode = default diff --git a/home/.config/spectrwm/spectrwm-onedark.conf b/home/.config/spectrwm/spectrwm-onedark.conf index d41a980..b07fc4e 100644 --- a/home/.config/spectrwm/spectrwm-onedark.conf +++ b/home/.config/spectrwm/spectrwm-onedark.conf @@ -1,10 +1,3 @@ -# ________ _____ -# __ ___/____________________ /__________ ________ ___ -# _____ \___ __ \ _ \ ___/ __/_ ___/_ | /| / /_ __ `__ \ -# ____/ /__ /_/ / __/ /__ / /_ _ / __ |/ |/ /_ / / / / / -# /____/ _ .___/\___/\___/ \__/ /_/ ____/|__/ /_/ /_/ /_/ -# /_/ -# # General config workspace_limit = 10 focus_mode = default diff --git a/home/.config/starship.toml b/home/.config/starship.toml index 951cb71..fb182da 100644 --- a/home/.config/starship.toml +++ b/home/.config/starship.toml @@ -2,12 +2,6 @@ add_newline = false scan_timeout = 20 format = "$all" -# __________ _________ -# ___ |_ | / /_ ___/ -# __ /| |_ | /| / /_____ \ -# _ ___ |_ |/ |/ / ____/ / -# /_/ |_|___/|__/ /____/ -# [aws] symbol = " " style = "bold yellow" @@ -18,12 +12,6 @@ disabled = true ap-southeast-2 = "au" us-east-1 = "va" -# ________ __________ -# ___ __ )_____ __ /__ /_________________ __ -# __ __ | __ `/ __/ __/ _ \_ ___/_ / / / -# _ /_/ // /_/ // /_ / /_ / __/ / _ /_/ / -# /_____/ \__,_/ \__/ \__/ \___//_/ _\__, / -# /____/ [battery] full_symbol = "🔋" charging_symbol = " " @@ -41,12 +29,6 @@ style = "bold red" threshold = 20 style = "bold yellow" -# ______________ _____ -# __ ____/__ /_______ _____________ ________ /_____________ -# _ / __ __ \ __ `/_ ___/ __ `/ ___/ __/ _ \_ ___/ -# / /___ _ / / / /_/ /_ / / /_/ // /__ / /_ / __/ / -# \____/ /_/ /_/\__,_/ /_/ \__,_/ \___/ \__/ \___//_/ -# [character] success_symbol = "[❯](bold green)" error_symbol = "[✗](bold red)" @@ -54,24 +36,12 @@ vicmd_symbol = "[❮](bold green)" format = "$symbol " disabled = false -# ______________ ___ ______ -# __ ____/__ |/ /_____ ___ /______ -# _ / __ /|_/ /_ __ `/_ //_/ _ \ -# / /___ _ / / / / /_/ /_ ,< / __/ -# \____/ /_/ /_/ \__,_/ /_/|_| \___/ -# [cmake] symbol = "喝" style = "bold blue" format = "via [$symbol$version]($style) " disabled = false -# _________ __________ -# ______ /___ ______________ __ /___(_)____________ -# _ __ /_ / / /_ ___/ __ `/ __/_ /_ __ \_ __ \ -# / /_/ / / /_/ /_ / / /_/ // /_ _ / / /_/ / / / / -# \__,_/ \__,_/ /_/ \__,_/ \__/ /_/ \____//_/ /_/ -# [cmd_duration] min_time = 1000 show_milliseconds = false @@ -79,12 +49,6 @@ style = "bold yellow" format = "took [$duration]($style) " disabled = false -# _________ _________ -# __ ____/__________________ /_____ _ -# _ / _ __ \_ __ \ __ /_ __ `/ -# / /___ / /_/ / / / / /_/ / / /_/ / -# \____/ \____//_/ /_/\__,_/ \__,_/ -# [conda] truncation_length = 1 symbol = "🐍 " @@ -93,36 +57,18 @@ format = "[$symbol$environment]($style) " ignore_base = true disabled = false -# _________ _____ ______ -# __ ____/___________ __________ /______ ___ / -# _ / __ ___/_ / / /_ ___/ __/ __ `/_ / -# / /___ _ / _ /_/ /_(__ )/ /_ / /_/ /_ / -# \____/ /_/ _\__, / /____/ \__/ \__,_/ /_/ -# /____/ [crystal] symbol = "🔮 " style = "bold red" format = "via [$symbol$version]($style) " disabled = true -# ________ _____ -# ___ __ \_____ _________ /_ -# __ / / / __ `/_ ___/ __/ -# _ /_/ // /_/ /_ / / /_ -# /_____/ \__,_/ /_/ \__/ -# [dart] symbol = "🔰 " style = "bold blue" format = "via [$symbol$version]($style) " disabled = true -# _____________ _____ -# ___ __ \__(_)___________________ /__________________ __ -# __ / / /_ /__ ___/ _ \ ___/ __/ __ \_ ___/_ / / / -# _ /_/ /_ / _ / / __/ /__ / /_ / /_/ / / _ /_/ / -# /_____/ /_/ /_/ \___/\___/ \__/ \____//_/ _\__, / -# /____/ [directory] truncation_length = 5 truncate_to_repo = true @@ -136,12 +82,6 @@ style = "bold cyan" format = "[$path]($style)[$read_only]($read_only_style) " disabled = false -# ________ ______ -# ___ __ \______________ /______________ -# __ / / / __ \ ___/_ //_/ _ \_ ___/ -# _ /_/ // /_/ / /__ _ ,< / __/ / -# /_____/ \____/\___/ /_/|_| \___//_/ -# [docker_context] only_with_files = false symbol = "🐋 " @@ -149,12 +89,6 @@ style = "blue bold" format = "via [$symbol$context]($style) " disabled = false -# ________ _____ _____ -# ___ __ \_______ /______________ /_ -# __ / / / __ \ __/_ __ \ _ \ __/ -# _ /_/ // /_/ / /_ _ / / / __/ /_ -# /_____/ \____/\__/ /_/ /_/\___/\__/ -# [dotnet] heuristic = true symbol = "•NET " @@ -162,36 +96,18 @@ style = "bold blue" format = "via [$symbol$version( 🎯 $tfm)]($style) " disabled = true -# ___________________ _____ -# ___ ____/__ /__(_)___ ____(_)_______ -# __ __/ __ /__ /__ |/_/_ /__ ___/ -# _ /___ _ / _ / __> < _ / _ / -# /_____/ /_/ /_/ /_/|_| /_/ /_/ -# [elixir] symbol = "💧" style = "bold purple" format = "via [$symbol$version \\(OTP $otp_version\\)]($style) " disabled = true -# _______________ -# ___ ____/__ /______ ___ -# __ __/ __ /__ __ `__ \ -# _ /___ _ / _ / / / / / -# /_____/ /_/ /_/ /_/ /_/ -# [elm] symbol = "🌳 " style = "cyan bold" format = "via [$symbol$version]($style) " disabled = true -# __________ -# ___ ____/_________ __ ___ _______ ________ -# __ __/ __ __ \_ | / / __ | / / __ `/_ ___/ -# _ /___ _ / / /_ |/ / __ |/ // /_/ /_ / -# /_____/ /_/ /_/_____/___________/ \__,_/ /_/ -# _/_____/ [env_var] variable = "STARSHIP_SHELL" default = "sh" @@ -200,24 +116,12 @@ style = "bold dimmed white" format = "with [$symbol$env_value]($style) " disabled = true -# __________ ______ -# ___ ____/_________ /_____ ______________ _ -# __ __/ __ ___/_ /_ __ `/_ __ \_ __ `/ -# _ /___ _ / _ / / /_/ /_ / / / /_/ / -# /_____/ /_/ /_/ \__,_/ /_/ /_/_\__, / -# /____/ [erlang] symbol = " " style = "bold red" format = "via [$symbol$version]($style) " disabled = true -# _________ ______ _________ -# __ ____/________ /_________ _______ / -# _ / __ _ ___/_ /_ __ \ / / / __ / -# / /_/ / / /__ _ / / /_/ / /_/ // /_/ / -# \____/ \___/ /_/ \____/\__,_/ \__,_/ -# [gcloud] symbol = " " style = "bold blue" @@ -228,12 +132,6 @@ disabled = true us-central1 = "uc1" asia-northeast1 = "an1" -# __________________ -# __ ____/__(_)_ /_ -# _ / __ __ /_ __/ -# / /_/ / _ / / /_ -# \____/ /_/ \__/ -# [git_branch] truncation_length = 9223372036854775807 truncation_symbol = "…" @@ -276,36 +174,18 @@ style = "bold red" format = "[$all_status$ahead_behind]($style)" disabled = false -# _________ ______ -# __ ____/________ /_____ ______________ _ -# _ / __ _ __ \_ /_ __ `/_ __ \_ __ `/ -# / /_/ / / /_/ / / / /_/ /_ / / / /_/ / -# \____/ \____//_/ \__,_/ /_/ /_/_\__, / -# /____/ [golang] symbol = " " style = "bold cyan" format = "via [$symbol$version]($style) " disabled = false -# ______ __ ______ -# ___ / / /_______ /______ ___ -# __ /_/ /_ _ \_ /__ __ `__ \ -# _ __ / / __/ / _ / / / / / -# /_/ /_/ \___//_/ /_/ /_/ /_/ -# [helm] symbol = "⎈ " style = "bold white" format = "via [$symbol$version]($style) " disabled = true -# ______ __ _____ -# ___ / / /______________ /_____________ _______ ________ -# __ /_/ /_ __ \_ ___/ __/_ __ \ __ `/_ __ `__ \ _ \ -# _ __ / / /_/ /(__ )/ /_ _ / / / /_/ /_ / / / / / __/ -# /_/ /_/ \____//____/ \__/ /_/ /_/\__,_/ /_/ /_/ /_/\___/ -# [hostname] ssh_only = true trim_at = "" @@ -313,24 +193,12 @@ style = "bold dimmed green" format = "[$hostname]($style) in " disabled = false -# _________ -# ______ /_____ ___ _______ _ -# ___ _ /_ __ `/_ | / / __ `/ -# / /_/ / / /_/ /__ |/ // /_/ / -# \____/ \__,_/ _____/ \__,_/ -# [java] symbol = "☕" style = "red dimmed" format = "via [${symbol}${version}]($style) " disabled = false -# _________ ______ -# ______ /________ /_________ -# ___ _ /_ __ \_ __ \_ ___/ -# / /_/ / / /_/ / /_/ /(__ ) -# \____/ \____//_.___//____/ -# [jobs] threshold = 1 symbol = "✦" @@ -338,24 +206,12 @@ style = "bold yellow" format = "[$symbol$number]($style) " disabled = false -# _________ __________ -# ______ /___ ____ /__(_)_____ _ -# ___ _ /_ / / /_ /__ /_ __ `/ -# / /_/ / / /_/ /_ / _ / / /_/ / -# \____/ \__,_/ /_/ /_/ \__,_/ -# [julia] symbol = " " style = "bold purple" format = "via [$symbol$version]($style) " disabled = true -# ______ __ _______________ -# ___ //_/_______ /___ /__(_)______ -# __ ,< _ __ \ __/_ /__ /__ __ \ -# _ /| | / /_/ / /_ _ / _ / _ / / / -# /_/ |_| \____/\__/ /_/ /_/ /_/ /_/ -# [kotlin] kotlin_binary = "kotlin" symbol = "K " @@ -363,12 +219,6 @@ style = "bold blue" format = "via [$symbol($version )]($style)" disabled = true -# ______ __ ______ ______ _____ -# ___ //_/___ ____ /________________ /________ /_____________ -# __ ,< _ / / /_ __ \ _ \_ ___/_ __ \ _ \ __/ _ \_ ___/ -# _ /| | / /_/ /_ /_/ / __/ / _ /_/ / __/ /_ / __/(__ ) -# /_/ |_| \__,_/ /_.___/\___//_/ /_.___/\___/\__/ \___//____/ -# [kubernetes] namespace_spaceholder = "" symbol = "⛵ " @@ -379,21 +229,9 @@ disabled = true [kubernetes.context_aliases] "dev.local.cluster.k8s" = "dev" -# ___________ -# ___ /___(_)___________ -# __ / __ /__ __ \ _ \ -# _ /___ / _ / / / __/ -# /_____/_/ /_/ /_/\___/ -# [line_break] disabled = false -# ______ -# ___ / ____ _______ _ -# __ / _ / / / __ `/ -# _ /___/ /_/ // /_/ / -# /_____/\__,_/ \__,_/ -# [lua] lua_binary = "lua" symbol = " " @@ -401,13 +239,6 @@ style = "bold blue" format = "via [$symbol($version )]($style)" disabled = false -# ______ ___ -# ___ |/ /___________ _____________________ __ -# __ /|_/ /_ _ \_ __ `__ \ __ \_ ___/_ / / / -# _ / / / / __/ / / / / / /_/ / / _ /_/ / -# /_/ /_/ \___//_/ /_/ /_/\____//_/ _\__, / -# /____/ -# [memory_usage] threshold = 75 symbol = "🐏 " @@ -415,12 +246,6 @@ style = "bold dimmed white" format = "via $symbol [${ram}( | ${swap})]($style) " disabled = true -# ______ ___ _____ ______ -# ___ |/ /_____________________ ___________(_)_____ ___ / -# __ /|_/ /_ _ \_ ___/ ___/ / / /_ ___/_ /_ __ `/_ / -# _ / / / / __/ / / /__ / /_/ /_ / _ / / /_/ /_ / -# /_/ /_/ \___//_/ \___/ \__,_/ /_/ /_/ \__,_/ /_/ -# [hg_branch] truncation_length = 9223372036854775807 truncation_symbol = "..." @@ -429,24 +254,12 @@ style = "bold purple" format = "on [$symbol$branch]($style) " disabled = false -# _____ ______ -# ___ | / /__(_)______ ___ -# __ |/ /__ /__ __ `__ \ -# _ /| / _ / _ / / / / / -# /_/ |_/ /_/ /_/ /_/ /_/ -# [nim] symbol = "👑 " style = "bold yellow" format = "via [$symbol$version]($style) " disabled = true -# _____ ______ ______ ___________ -# ___ | / /__(_)___ __ __________ /_________ /__ / -# __ |/ /__ /__ |/_/________ ___/_ __ \ _ \_ /__ / -# _ /| / _ / __> < _/_____/(__ )_ / / / __/ / _ / -# /_/ |_/ /_/ /_/|_| /____/ /_/ /_/\___//_/ /_/ -# [nix_shell] symbol = " " impure_msg = "impure" @@ -455,12 +268,6 @@ style = "bold blue" format = "via [$symbol$state( \\($name\\))]($style) " disabled = false -# _____ __ _________ ________ -# ___ | / /___________ /__________(_)_______ -# __ |/ /_ __ \ __ /_ _ \____ /__ ___/ -# _ /| / / /_/ / /_/ / / __/___ / _(__ ) -# /_/ |_/ \____/\__,_/ \___/___ / /____/ -# /___/ [nodejs] symbol = " " style = "bold green" @@ -468,12 +275,6 @@ not_capable_style = "bold red" format = "via [$symbol$version]($style) " disabled = false -# ________ ______ -# ___ __ \_____ _________ /_______ _______ _____ -# __ /_/ / __ `/ ___/_ //_/ __ `/_ __ `/ _ \ -# _ ____// /_/ // /__ _ ,< / /_/ /_ /_/ // __/ -# /_/ \__,_/ \___/ /_/|_| \__,_/ _\__, / \___/ -# /____/ [package] display_private = true symbol = "📦 " @@ -481,49 +282,24 @@ style = "bold 208" format = "via [$symbol$version]($style) " disabled = false -# ________________ ______ -# __ __ \_ ____/_____ _______ ______ / -# _ / / / / _ __ `/_ __ `__ \_ / -# / /_/ // /___ / /_/ /_ / / / / / / -# \____/ \____/ \__,_/ /_/ /_/ /_//_/ -# [ocaml] symbol = "🐫 " style = "bold yellow" format = "via [$symbol$version]($style) " disabled = true -# ________ ______ -# ___ __ \______________ / -# __ /_/ / _ \_ ___/_ / -# _ ____// __/ / _ / -# /_/ \___//_/ /_/ -# [perl] symbol = "🐪 " style = "bold 149" format = "via [$symbol$version]($style) " disabled = false -# ______________ _________ -# ___ __ \__ / / /__ __ \ -# __ /_/ /_ /_/ /__ /_/ / -# _ ____/_ __ / _ ____/ -# /_/ /_/ /_/ /_/ -# [php] symbol = "🐘 " style = "147 bold" format = "via [$symbol$version]($style) " disabled = false -# ________ ___________ -# ___ __ \____ ___ /___ /______________ -# __ /_/ /_ / / / __/_ __ \ __ \_ __ \ -# _ ____/_ /_/ // /_ _ / / / /_/ / / / / -# /_/ _\__, / \__/ /_/ /_/\____//_/ /_/ -# /____/ -# [python] python_binary = "python3" pyenv_version_name = false @@ -534,36 +310,18 @@ style = "yellow bold" format = "via [${symbol}${pyenv_prefix}${version}( \\($virtualenv\\))]($style) " disabled = false -# ________ ______ -# ___ __ \___ ____ /______ __ -# __ /_/ / / / /_ __ \_ / / / -# _ _, _// /_/ /_ /_/ / /_/ / -# /_/ |_| \__,_/ /_.___/_\__, / -# /____/ [ruby] symbol = "💎 " style = "bold red" format = "via [$symbol$version]($style) " disabled = false -# ________ _____ -# ___ __ \___ __________ /_ -# __ /_/ / / / /_ ___/ __/ -# _ _, _// /_/ /_(__ )/ /_ -# /_/ |_| \__,_/ /____/ \__/ -# [rust] symbol = "🦀 " style = "bold red" format = "via [$symbol$version]($style) " disabled = false -# _____________ __________ _______ -# __ ___/__ / / /__ /__ | / /__ / -# _____ \__ /_/ /__ / __ | / /__ / -# ____/ /_ __ / _ /____ |/ / _ /___ -# /____/ /_/ /_/ /_____/____/ /_____/ -# [shlvl] threshold = 2 symbol = " " @@ -571,37 +329,18 @@ style = "bold yellow" format = "[$symbol$shlvl]($style) " disabled = true -# ____________ ______ __________ -# __ ___/__(_)_____________ ____ ____ /_____ __________(_)_ /_____ __ -# _____ \__ /__ __ \_ __ `/ / / /_ /_ __ `/_ ___/_ /_ __/_ / / / -# ____/ /_ / _ / / / /_/ // /_/ /_ / / /_/ /_ / _ / / /_ _ /_/ / -# /____/ /_/ /_/ /_/_\__, / \__,_/ /_/ \__,_/ /_/ /_/ \__/ _\__, / -# /____/ /____/ -# [singularity] symbol = " " style = "bold dimmed blue" format = "[$symbol\\[$env\\]]($style) " disabled = true -# ________ _________________ -# __ ___/__ ____(_)__ __/_ /_ -# _____ \__ | /| / /_ /__ /_ _ __/ -# ____/ /__ |/ |/ /_ / _ __/ / /_ -# /____/ ____/|__/ /_/ /_/ \__/ -# [swift] symbol = "ﯣ " style = "bold 202" format = "via [$symbol$version]($style) " disabled = true -# ____________ _____ -# __ ___/_ /______ __ /____ _________ -# _____ \_ __/ __ `/ __/ / / /_ ___/ -# ____/ // /_ / /_/ // /_ / /_/ /_(__ ) -# /____/ \__/ \__,_/ \__/ \__,_/ /____/ -# [status] symbol = "💣 " not_executable_symbol = "🚫" @@ -614,24 +353,12 @@ style = "bold red" format = "[$symbol$status]($style) " disabled = true -# ________ ________ -# ___ __/________________________ ___ __/___________________ ___ -# __ / _ _ \_ ___/_ ___/ __ `/_ /_ _ __ \_ ___/_ __ `__ \ -# _ / / __/ / _ / / /_/ /_ __/ / /_/ / / _ / / / / / -# /_/ \___//_/ /_/ \__,_/ /_/ \____//_/ /_/ /_/ /_/ -# [terraform] symbol = "ﯟ " style = "bold 105" format = "via [$symbol$version$workspace]($style) " disabled = true -# ____________ -# ___ __/__(_)______ ________ -# __ / __ /__ __ `__ \ _ \ -# _ / _ / _ / / / / / __/ -# /_/ /_/ /_/ /_/ /_/\___/ -# [time] use_12hr = false time_format = "%T" @@ -641,12 +368,6 @@ style = "bold yellow" format = "at 🕙 [$time]($style) " disabled = true -# _____ __ -# __ / / /_______________________________ _______ ________ -# _ / / /__ ___/ _ \_ ___/_ __ \ __ `/_ __ `__ \ _ \ -# / /_/ / _(__ )/ __/ / _ / / / /_/ /_ / / / / / __/ -# \____/ /____/ \___//_/ /_/ /_/\__,_/ /_/ /_/ /_/\___/ -# [username] show_always = false style_user = "bold yellow" @@ -654,37 +375,18 @@ style_root = "bold red" format = "[$user]($style) in " disabled = false -# ___ __ _____ -# __ | / /_____ _______ _____________ _________ /_ -# __ | / /_ __ `/_ __ `/_ ___/ __ `/_ __ \ __/ -# __ |/ / / /_/ /_ /_/ /_ / / /_/ /_ / / / /_ -# _____/ \__,_/ _\__, / /_/ \__,_/ /_/ /_/\__/ -# /____/ -# [vagrant] symbol = "⍱ " style = "cyan bold" format = "via [$symbol($version)]($style) " disabled = true -# __________ -# ___ /__(_)______ _ -# __ /__ /__ __ `/ -# _ /__ / _ /_/ / -# /____/_/ _\__, / -# /____/ [zig] symbol = "↯ " style = "bold yellow" format = "via [$symbol$version]($style) " disabled = false -# ________ _____ _____ -# ___ __ \___ ____________________________________(_)_________ /_ -# __ /_/ / / / /_ ___/ _ \_ ___/ ___/_ ___/_ /___ __ \ __/ -# _ ____// /_/ /_ / / __/(__ )/ /__ _ / _ / __ /_/ / /_ -# /_/ \__,_/ /_/ \___//____/ \___/ /_/ /_/ _ .___/\__/ -# /_/ [purescript] symbol = "<=> " style = "bold white" diff --git a/home/.config/vifm/vifmrc b/home/.config/vifm/vifmrc index d178b1f..b3e624f 100644 --- a/home/.config/vifm/vifmrc +++ b/home/.config/vifm/vifmrc @@ -1,9 +1,3 @@ -" ___ ______________ -" __ | / /__(_)__ __/______ ___ -" __ | / /__ /__ /_ __ __ `__ \ -" __ |/ / _ / _ __/ _ / / / / / -" _____/ /_/ /_/ /_/ /_/ /_/ -" " Command used to edit files in various contexts. The default is vim. " If you would like to use another vi clone such as Elvis or Vile " you will need to change this setting. diff --git a/home/.config/waybar/config b/home/.config/waybar/config index 631f269..7453d96 100644 --- a/home/.config/waybar/config +++ b/home/.config/waybar/config @@ -1,12 +1,3 @@ -// ================================================= -// ___ __ ______ -// __ | / /_____ _____ ____ /_______ ________ -// __ | /| / /_ __ `/_ / / /_ __ \ __ `/_ ___/ -// __ |/ |/ / / /_/ /_ /_/ /_ /_/ / /_/ /_ / -// ____/|__/ \__,_/ _\__, / /_.___/\__,_/ /_/ -// /____/ -// ================================================= - { // --------------------------------- diff --git a/home/.config/waybar/config-generic b/home/.config/waybar/config-generic index 4d477a5..a2dc3d9 100644 --- a/home/.config/waybar/config-generic +++ b/home/.config/waybar/config-generic @@ -1,12 +1,3 @@ -// ================================================= -// ___ __ ______ -// __ | / /_____ _____ ____ /_______ ________ -// __ | /| / /_ __ `/_ / / /_ __ \ __ `/_ ___/ -// __ |/ |/ / / /_/ /_ /_/ /_ /_/ / /_/ /_ / -// ____/|__/ \__,_/ _\__, / /_.___/\__,_/ /_/ -// /____/ -// ================================================= - { // --------------------------------- diff --git a/home/.config/zsh/.zshrc b/home/.config/zsh/.zshrc index af30560..2a1d88c 100644 --- a/home/.config/zsh/.zshrc +++ b/home/.config/zsh/.zshrc @@ -153,8 +153,6 @@ zinit light hlissner/zsh-autopair # Git thingy zinit light wfxr/forgit -# zinit light kazhala/dotbare -# zinit light unixorn/git-extra-commands # Abbreviations zinit light olets/zsh-abbr @@ -171,10 +169,4 @@ zinit light olets/zsh-abbr # Plugins' configurations source $ZDOTDIR/plugins.zsh -# _________ __________ -# __ ____/__________________ /___(_)_____________ _ -# _ / __ __ ___/ _ \ _ \ __/_ /__ __ \_ __ `/ -# / /_/ / _ / / __/ __/ /_ _ / _ / / / /_/ / -# \____/ /_/ \___/\___/\__/ /_/ /_/ /_/_\__, / -# /____/ $HOME/.local/bin/bunny diff --git a/home/.config/zsh/aliases.zsh b/home/.config/zsh/aliases.zsh index 277ab15..e4c2282 100644 --- a/home/.config/zsh/aliases.zsh +++ b/home/.config/zsh/aliases.zsh @@ -10,7 +10,6 @@ alias mv="mv -vi" alias rm="rm -vr" alias mkdir="mkdir -pv" alias no="grep -viP" -# alias latest_pkg="expac --timefmt='%Y-%m-%d %T' '%l\t%n' | sort | tail -n 30" alias yarn="yarn --use-yarnrc $HOME/.config/yarn/config" alias tmux="TERM=screen-256color tmux" # colorizing diff --git a/home/.local/share/bash/plugins/prompt.bash b/home/.local/share/bash/plugins/prompt.bash new file mode 100644 index 0000000..6512545 --- /dev/null +++ b/home/.local/share/bash/plugins/prompt.bash @@ -0,0 +1,50 @@ +#!/usr/bin/env bash + +# get current branch in git repo +parse_git_branch() { + BRANCH=$(git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/') + if [ ! "${BRANCH}" = "" ] + then + STAT=$(parse_git_dirty) + echo "${BRANCH}${STAT}" + else + echo "" + fi +} + +# get current status of git repo +parse_git_dirty() { + status=$(git status 2>&1 | tee) + dirty=$(echo -n "${status}" 2> /dev/null | grep "modified:" &> /dev/null; echo "$?") + untracked=$(echo -n "${status}" 2> /dev/null | grep "Untracked files" &> /dev/null; echo "$?") + ahead=$(echo -n "${status}" 2> /dev/null | grep "Your branch is ahead of" &> /dev/null; echo "$?") + newfile=$(echo -n "${status}" 2> /dev/null | grep "new file:" &> /dev/null; echo "$?") + renamed=$(echo -n "${status}" 2> /dev/null | grep "renamed:" &> /dev/null; echo "$?") + deleted=$(echo -n "${status}" 2> /dev/null | grep "deleted:" &> /dev/null; echo "$?") + bits='' + if [ "${ahead}" = "0" ]; then + bits="*${bits}" + fi + if [ "${renamed}" = "0" ]; then + bits=">${bits}" + fi + if [ "${newfile}" = "0" ]; then + bits="+${bits}" + fi + if [ "${untracked}" = "0" ]; then + bits="?${bits}" + fi + if [ "${deleted}" = "0" ]; then + bits="x${bits}" + fi + if [ "${dirty}" = "0" ]; then + bits="!${bits}" + fi + if [ ! "${bits}" = "" ]; then + echo " ${bits}" + else + echo "" + fi +} + +export PS1="\[$(tput bold)\]\[$(tput setaf 1)\]╭─[\[$(tput setaf 3)\]\u\[$(tput setaf 2)\]@\[$(tput setaf 4)\]\h \$(if [[ \$? == 0 ]]; then echo \"\[$(tput setaf 2)\]\342\234\223\"; else echo \"\[$(tput setaf 1)\]\342\234\227\"; fi)\[$(tput setaf 1)\]] \[$(tput setaf 5)\]\w \[$(tput setaf 2)\]\`parse_git_branch\`\n\[$(tput setaf 1)\]╰\[$(tput sgr0)\] " diff --git a/setup/greenclip.sh b/setup/greenclip.sh index f09df32..6340e83 100755 --- a/setup/greenclip.sh +++ b/setup/greenclip.sh @@ -1,6 +1,6 @@ #!/bin/sh -echo "Version of greenclip: " | tr -d '\n' # 3.4 +echo "Version of greenclip: " | tr -d '\n' # 4.0 read -r version curl -fLo greenclip https://github.com/erebe/greenclip/releases/download/${version}/greenclip