diff options
| -rwxr-xr-x | aliases.zsh | 10 | ||||
| -rwxr-xr-x | env.zsh | 7 | ||||
| -rwxr-xr-x | func.zsh | 30 | ||||
| -rw-r--r-- | gentoo.alias.zsh | 1 | ||||
| -rw-r--r-- | git.alias.zsh | 6 |
5 files changed, 30 insertions, 24 deletions
diff --git a/aliases.zsh b/aliases.zsh index 2a7da12..dd2583c 100755 --- a/aliases.zsh +++ b/aliases.zsh @@ -25,9 +25,9 @@ alias fm='ranger' alias cat="bat --plain --pager=never" # alias grep='grep --color=auto' -alias grep='rg -F' +alias grep='rg --no-heading --with-filename -F' alias mv='mv -v' -alias cp='cp --reflink=always -vr' +alias cp='cp --reflink=auto -vr' alias rm='trash -v' @@ -55,8 +55,8 @@ fi alias l='ls -l' alias ll='ls -l' alias la='ls -a' -alias lla='ls -la' -alias lah='ls -lah' +alias lla='ls -laa' +alias lah='ls -laah' alias lm='ls -m' alias lr='ls -R' alias lg='ls -l --group-directories-first' @@ -187,7 +187,6 @@ alias pwck='sudo pwck' #alias npm='sudo npm' alias npm='bun' alias npx='bunx' -alias emerge='sudo emerge' alias powerpill='sudo powerpill' alias timeshift='sudo timeshift' alias mount='sudo mount' @@ -196,6 +195,7 @@ alias umount='sudo umount' alias usermod='sudo usermod' alias useradd='sudo useradd' alias userdel='sudo userdel' +alias pacdiff='sudo -E pacdiff' # change perms alias chown='chown -v' alias getown='sudo chown -R $USER:$USER' @@ -3,6 +3,7 @@ ## export PNPM_HOME="$HOME/.local/share/pnpm" +export QML_IMPORT_PATH="/usr/lib/qt6/qml" export WINEPREFIX=/opt/windows.wine export PATH="$PNPM_HOME:$PATH" export PATH="$HOME/scripts:$PATH" @@ -10,8 +11,9 @@ export PATH="$HOME/scripts/bin:$PATH" export PATH="$PATH:$HOME/.local/bin" export PATH="$HOME/.cargo/bin:$PATH" export PATH="$PATH:/snap/bin" -export GPG_TTY="${TTY:-$(tty)}" -export SUDO_PROMPT="pass: " +export PATH="$PATH:$HOME/.cache/.bun/bin" +export PATH="$PATH:$HOME/go/bin" +export GPG_TTY="${TTY:-$(tty)}" export SUDO_PROMPT="pass: " export TERMINAL="kitty" export BROWSER="zen-browser" export VISUAL="nvim" @@ -35,6 +37,7 @@ export XDG_PICTURES_DIR="$HOME/Pictures" export XDG_VIDEOS_DIR="$HOME/Videos" export MANPAGER='nvim +Man! +"set nocul" +"set noshowcmd" +"set noruler" +"set noshowmode" +"set laststatus=0" +"set showtabline=0" +"set nonumber"' +export DIFFPROG='nvim -d' # export MANPAGER="lvim +Man" # if [ $(echo $MANPAGER | awk '{print $1}') = nvim ]; then @@ -131,11 +131,11 @@ function vim () { if [ ! "$@" ]; then if [ ! -w "$(pwd)" ]; then printf "Opening vim with sudo...\n" - sudo -E $HOME/.local/bin/lvim + sudo -E $EDITOR return else printf "Opening vim...\n" - $HOME/.local/bin/lvim + $EDITOR return fi fi @@ -152,7 +152,7 @@ function vim () { if [ ! -w "$(dirname $@)" ] then printf "Opening vim with sudo...\n" - sudo -E $HOME/.local/bin/lvim "$@" + sudo -E $EDITOR "$@" if [ ! -e "$@" ] then #printf "File \"$@\" is Empty, auto deleted...\n" @@ -163,7 +163,7 @@ function vim () { #elif [[ -e "$@" ]] else printf "Opening vim...\n" - $HOME/.local/bin/lvim "$@" + $EDITOR "$@" if [ ! -e "$@" ] then #printf "File \"$@\" is Empty, auto deleted...\n" @@ -183,11 +183,11 @@ function vim () { if [ ! -w "$@" ] then printf "Opening vim with sudo...\n" - sudo -E $HOME/.local/bin/lvim "$@" + sudo -E $EDITOR "$@" return elif [[ -e "$@" ]]; then printf "Opening vim...\n" - $HOME/.local/bin/lvim "$@" + $EDITOR "$@" return fi # if [ -e "$@" ] @@ -334,14 +334,14 @@ function ga () fi } -function gp () { - if [[ -n "${1+x}" ]]; then - git push -u origin $@ - else - git remote | xargs -L1 git push - fi - -} +# function gp () { +# if [[ -n "${1+x}" ]]; then +# git push -u origin $@ +# else +# git remote | xargs -L1 git push +# fi +# +# } function linuxcmd () { @@ -380,7 +380,7 @@ function path () function vimake () { if [ -e "Makefile" ]; then - lvim Makefile + $EDITOR Makefile else printf "No Makefile" fi diff --git a/gentoo.alias.zsh b/gentoo.alias.zsh index 006ca9c..61e1665 100644 --- a/gentoo.alias.zsh +++ b/gentoo.alias.zsh @@ -1,4 +1,5 @@ function epatch(){ /usr/bin/sudo mkdir -p /etc/portage/patches/$2; sudo wget $1 --allow-overwrite -d /etc/portage/patches/$2 } +alias emerge='sudo emerge' alias e='emerge' alias ee='emerge --noreplace' alias er='emerge --depclean' diff --git a/git.alias.zsh b/git.alias.zsh index dd8a43a..113f4d9 100644 --- a/git.alias.zsh +++ b/git.alias.zsh @@ -167,7 +167,7 @@ alias gd='git diff' # alias gpsup='git push --set-upstream origin $(git_current_branch)' # alias gpu='git push upstream' # alias gpv='git push -v' -# alias gpdb='git push origin --delete' +alias gpd='git push origin --delete' alias gr='git remote' # alias gra='git remote add' # alias grb='git rebase' @@ -244,7 +244,8 @@ alias gcnm='git commit --verbose --allow-empty-message -S -m ""' alias gca='git commit --verbose -S -am' # alias gp='git push origin main' # alias gp='git remote | xargs -L1 git push --all' # moved to funcs -alias gpf='git push --force-with-lease' +alias gp='git remote | xargs -L1 git push' +# alias gpf='git push --force-with-lease' alias gitp='git remote | xargs -L1 git pull' alias gs='git status' alias gitrm='git rm --cached -rf' @@ -256,3 +257,4 @@ ghcl() { gh repo clone $@ -- --recurse-submodules } # alias ghcr='gh repo create' # alias ghpr='gh pr' # alias ghis='gh issue' +alias bisectundo="git bisect log | head -n -2 > /tmp/fixed_bisect.log ; git bisect replay /tmp/fixed_bisect.log" |