updates

4 files changed, 7 insertions, 221 deletions

diff --git a/fedora/.config/shell/aliasrc b/fedora/.config/shell/aliasrc
index 6b35701..7d9e652 100644
--- a/fedora/.config/shell/aliasrc
+++ b/fedora/.config/shell/aliasrc
@@ -58,6 +58,9 @@ alias pwdc='pwd | xclip -selection clipboard'
 # count
 alias countfiles="for t in files links directories; do echo \`find . -type \${t:0:1} | wc -l\` \$t; done 2> /dev/null"
 
+# cpu
+alias cpu="grep 'cpu ' /proc/stat | awk '{usage=(\$2+\$4)*100/(\$2+\$4+\$5)} END {print usage}' | awk '{printf(\"%.1f\n\", \$1)}'"
+
 # curl
 ialias curl='curl --silent --show-error'
 balias clh='curl localhost:'
@@ -225,10 +228,6 @@ alias mv="mv -i"
 alias ping="ping -c 10"
 alias ps="ps auxf"
 alias rm="rm -iv"
-alias svi="sudo vi"
-alias v="vim"
-alias vi="vim"
-alias vis="vim '+set si'"
 
 # move
 ialias mv='mv -iv'
@@ -236,19 +235,12 @@ ialias mv='mv -iv'
 # nginx
 alias ngx="cd /etc/nginx"
 
-# nvim
+# vim
 alias v='$EDITOR'
 alias v.='$EDITOR .'
 alias ve='$EDITOR -c enew'
-alias nv.='nvim .'
-alias nve='nvim -c enew'
-alias nts='NVIM_APPNAME=TheSiahxyz nvim'
-alias nav='NVIM_APPNAME=AstroNvim nvim'
-alias nlu='NVIM_APPNAME=LunarVim nvim'
-alias nlv='NVIM_APPNAME=LazyVim nvim'
-alias nnc='NVIM_APPNAME=NvChad nvim'
-alias snv='sudo nvim'
-alias vll='lastnvim -l'
+alias vis="$EDITOR '+set si'"
+alias vll='lastvim -l'
 alias vln='$EDITOR -c '\''execute "edit " . v:oldfiles[0] | normal ''0'\'
 
 # ports
@@ -362,7 +354,7 @@ alias -g C='| xclip -selection clipboard'
 alias -g Fj='| jq .'
 alias -g Fy='| yq .'
 alias -g Fx='| xmllint --format -'
-alias -g V='| nvim -'
+alias -g V='| vim -'
 
 # unzip
 alias uz='unzip'
diff --git a/fedora/.config/shell/bm-dirs b/fedora/.config/shell/bm-dirs
index 2afa0b0..72558e9 100644
--- a/fedora/.config/shell/bm-dirs
+++ b/fedora/.config/shell/bm-dirs
@@ -6,7 +6,6 @@ cac             ${XDG_CACHE_HOME:-${HOME}/.cache}
 cbc             ${XDG_CONFIG_HOME:-${HOME}/.config}/bash
 cfg             ${XDG_CONFIG_HOME:-${HOME}/.config}
 cgc             ${XDG_CONFIG_HOME:-${HOME}/.config}/git
-cnv             ${XDG_CONFIG_HOME:-${HOME}/.config}/nvim
 csh             ${XDG_CONFIG_HOME:-${HOME}/.config}/shell
 ctm             ${XDG_CONFIG_HOME:-${HOME}/.config}/tmux
 cts             ${XDG_CONFIG_HOME:-${HOME}/.config}/TheSiahxyz
diff --git a/fedora/.config/shell/profile b/fedora/.config/shell/profile
deleted file mode 100644
index 677943a..0000000
--- a/fedora/.config/shell/profile
+++ /dev/null
@@ -1,151 +0,0 @@
-###################################################
-### --- PROFILE --- ###
-###################################################
-[ "$(tty)" = "/dev/tty1" ] && set -e # Exit immediately if a command exits with a non-zero status.
-
-###################################################
-### --- ENV PATH --- ###
-###################################################
-# Add all directories in each subdirectory to $PATH
-export PATH="$PATH:$(find ~/.local/bin -path '*/.git*' -prune -o \( -type f -o -type l \) -perm -u=x -exec dirname {} \; | sort -u | paste -sd ':' -)"
-export PATH="$PATH:$(find ~/.local/share/.password-store -type d -name '.extensions' | paste -sd ':' -)"
-command -v asdf >/dev/null 2>&1 && export PATH="$PATH:$(find -L ~/.local/share/asdf/installs -name bin -type d -print 2>/dev/null | sort -u | paste -s -d ':' -)"
-command -v npm >/dev/null 2>&1 && export PATH="$PATH:$(find -L ~/.local/share/npm -name bin -type d -print 2>/dev/null | sort -u | paste -s -d ':' -)"
-
-unsetopt PROMPT_SP 2>/dev/null
-
-###################################################
-### --- DEFAULT PROGRAMS --- ###
-###################################################
-export EDITOR="nvim"
-export EDITOR2="vim"
-# export FILE_MANAGER="lf $(lf -version)"
-export KEYTIMEOUT=10
-export SUDO_EDITOR=$EDITOR
-export TERM="xterm-256color"
-export VISUAL=$EDITOR
-
-###################################################
-### --- XDG ENV PATHES --- ###
-###################################################
-### --- XDG DEFAULT --- ###
-export XDG_CACHE_HOME="$HOME/.cache"
-export XDG_CONFIG_HOME="$HOME/.config"
-export XDG_DATA_HOME="$HOME/.local/share"
-export XDG_STATE_HOME="$HOME/.local/state"
-
-### --- XDG CUSTOMS --- ###
-export XDG_DOTFILES_DIR="$HOME/.dotfiles"
-export XDG_SCRIPTS_HOME="$HOME/.local/bin"
-export XDG_SOURCES_HOME="$HOME/.local/src"
-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_PUBLICSHARE_DIR="$HOME/Public"
-export XDG_TEMPLATES_DIR="$HOME/Templates"
-export XDG_VIDEOS_DIR="$HOME/Videos"
-
-###################################################
-### --- DEFAULT ENV PATHES FOR ALL PROGRAMS --- ###
-###################################################
-### --- ANDROID --- ###
-export ANDROID_SDK_HOME="$XDG_CONFIG_HOME/android"
-
-### --- ANSIBLE --- ###
-export ANSIBLE_CONFIG="$XDG_CONFIG_HOME/ansible/ansible.cfg"
-
-### --- BAT --- ###
-export BAT_CONFIG_PATH="$XDG_CONFIG_HOME/bat/config"
-
-### --- CARGO --- ###
-export CARGO_HOME="$XDG_DATA_HOME/cargo"
-
-### --- DICS --- ###
-export DICS="/usr/share/stardict/dic/"
-
-### --- ELECTRUM --- ###
-export ELECTRUMDIR="$XDG_DATA_HOME/electrum"
-
-### --- HISTORY --- ###
-export HISTFILE="$XDG_DATA_HOME/history/sh_history"
-
-### --- INPUTRC --- ###
-export INPUTRC="$XDG_CONFIG_HOME/shell/inputrc"
-
-### --- JAVA --- ###
-export AWT_TOOLKIT="MToolkit wmname LG3D" # May have to install wmname
-export _JAVA_AWT_WM_NONREPARENTING=1      # Fix for Java applications in dwm
-
-### --- MANPAGER --- ###
-([ -x "$(command -v batcat)" ] || [ -x "$(command -v batman)" ]) && {
-  export MANPAGER="sh -c 'col -bx | bat -l man -p'"
-  export MANROFFOPT="-c"
-} || {
-  export MANPAGER='less -s'
-  export LESS="R"
-  export LESS_TERMCAP_mb="$(printf '%b' '')"
-  export LESS_TERMCAP_md="$(printf '%b' '')"
-  export LESS_TERMCAP_me="$(printf '%b' '')"
-  export LESS_TERMCAP_so="$(printf '%b' '')"
-  export LESS_TERMCAP_se="$(printf '%b' '')"
-  export LESS_TERMCAP_us="$(printf '%b' '')"
-  export LESS_TERMCAP_ue="$(printf '%b' '')"
-  export LESSOPEN="| lesspipe.sh %s"
-}
-
-### --- NPM --- ###
-export NPM_CONFIG_USERCONFIG="~/.config/npm/.npmrc"
-
-### --- NVM --- ###
-export NVM_DIR="$XDG_CONFIG_HOME/nvm"
-
-### --- PASSWORD STORE --- ###
-export PASSWORD_STORE_DIR="$XDG_DATA_HOME/.password-store"
-export PASSWORD_STORE_CLIP_TIME=180   # Specifies the number of seconds to wait before restoring the clipboard, by default 45 seconds.
-# export PASSWORD_STORE_GENERATED_LENGTH=18   # by default 25.
-# export PASSWORD_STORE_CHARACTER_SET='ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!@#$%^&*()-_=+[]{};:,.<>?'
-# export PASSWORD_STORE_CHARACTER_SET_NO_SYMBOLS='ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!@#$%^&*()-_=+[]{};:,.<>?'
-export PASSWORD_STORE_ENABLE_EXTENSIONS="true"
-# export PASSWORD_STORE_EXTENSIONS_DIR="$PASSWORD_STORE_DIR/.extensions"
-# export BASH_COMPLETION_USER_DIR=$XDG_DATA_HOME/bash-completion/completions
-
-### --- POWERLEVEL10K --- ###
-export POWERLEVEL9K_INSTALLATION_DIR="/usr/share/zsh-theme-powerlevel10k"
-
-### --- PYTHON --- ###
-export PYTHONPYCACHEPREFIX=$XDG_CACHE_HOME/python
-export PYTHONSTARTUP="$XDG_CONFIG_HOME/python/pythonrc"
-
-### --- RUST --- ###
-export RUSTUP_HOME="$XDG_DATA_HOME/rustup"
-
-### --- SQLITE --- ###
-export SQLITE_HISTORY="$XDG_DATA_HOME/history/sqlite_history"
-
-### --- TMUX --- ###
-export TMUX_TMPDIR="$XDG_RUNTIME_DIR"
-
-### --- VIM --- ###
-# export GVIMINIT='let $MYGVIMRC = !has("nvim") ? "$XDG_CONFIG_HOME/vim/gvimrc" : "$XDG_CONFIG_HOME/nvim/init.lua" | so $MYGVIMRC'
-# export VIMINIT='let $MYVIMRC = !has("nvim") ? "$XDG_CONFIG_HOME/vim/vimrc" : "$XDG_CONFIG_HOME/nvim/init.lua" | so $MYVIMRC'
-
-### --- VIRTUAL ENVIRONMENT --- ###
-export WORKON_HOME="$XDG_DATA_HOME/venvs"
-
-### --- VISUAL STUDIO CODE --- ###
-export VSCODE_PORTABLE="$XDG_DATA_HOME/vscode"
-
-### --- WGET --- ###
-export WGETRC="$XDG_CONFIG_HOME/wget/wgetrc"
-
-### --- ZSH --- ###
-export ZDOTDIR="$XDG_CONFIG_HOME/zsh"
-export ZPLUGINDIR="$XDG_SCRIPTS_HOME/zsh"
-
-### --- SHORTCUTS --- ###
-[ ! -f "$XDG_CONFIG_HOME/shell/shortcutrc" ] && setsid -f shortcuts >/dev/null 2>&1
-
-### --- LAPTOP KEYMAP --- ###
-sudo -n loadkeys "$XDG_DATA_HOME/thesiah/ttymaps.kmap" 2>/dev/null
diff --git a/fedora/.config/shell/scripts.bash b/fedora/.config/shell/scripts.bash
deleted file mode 100644
index f257809..0000000
--- a/fedora/.config/shell/scripts.bash
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/bash
-
-###########################################################################################
-###########################################################################################
-### --- COMMAND OUTPUT --- ###
-alias ilco=insert_last_command_output
-insert_last_command_output() {
-    local last_cmd
-    last_cmd=$(history | tail -n 2 | head -n 1 | sed 's/^[ ]*[0-9]\+[ ]*//')
-    eval "$last_cmd"
-}
-
-###########################################################################################
-###########################################################################################
-### --- CREATE --- ###
-alias mc=mkcd
-mkcd() { mkdir -p "$1" && cd "$1" || return; }
-
-mkdt() {
-    mkdir -p "${1:+$1/}$(date +%F)"
-}
-
-###########################################################################################
-###########################################################################################
-### --- PASS --- ###
-pass_otp() { pass otp uri -q "$1"; }
-pass_otp_insert() { pass otp insert "$1"; }
-
-alias cpqr=pass_qr
-pass_qr() { qrencode -o "$1.png" -t png -Sv 40 < "$1.pgp"; }
-
-###########################################################################################
-###########################################################################################
-### --- STOW --- ###
-alias dstw=dotfiles_stw
-dotfiles_stw() {
-    "${XDG_DOTFILES_DIR:-${HOME}/.dotfiles}/$(whereami)/.local/bin/stw"
-}
-
-###########################################################################################
-###########################################################################################
-### --- SUDO --- ###
-pre_cmd() {
-    local prepend_command="$1"
-    local buffer="${READLINE_LINE:-}"
-
-    if [ -z "$buffer" ]; then
-        buffer=$(history | tail -n 2 | head -n 1 | sed 's/^[ ]*[0-9]\+[ ]*//')
-    fi
-
-    READLINE_LINE="$prepend_command $buffer"
-    READLINE_POINT=${#READLINE_LINE}
-}
-bind -x '"\es":pre_cmd sudo'