X-Git-Url: https://git.shemshak.org/gitweb.cgi/~bandali/configs/blobdiff_plain/58a81de3fd19f05e7b213502bd5d22cf70505f15..169b607c432b23ead7138252ab529093578c34c4:/.bashrc

diff --git a/.bashrc b/.bashrc
index cce2dc8..f4fa270 100644
--- a/.bashrc
+++ b/.bashrc
@@ -1,15 +1,26 @@
+# If not running interactively, don't do anything else
+[[ $- != *i* ]] && return
+
+# i-beam cursor
+# echo -e "\033[5 q"              # blinking
+echo -e "\033[6 q"              # non-blinking
+
 # various bash tweaks
 shopt -s histappend
 shopt -s cmdhist
 HISTSIZE=
 HISTFILESIZE=
 HISTCONTROL=ignoreboth
-HISTIGNORE='ls:l:s:bg:fg:history'
+HISTIGNORE='ls:l:s:g:[bf]g:history'
 HISTTIMEFORMAT='%F %T '
 stty stop ""
 
 # aliases
 alias ls='ls --color=auto'
+alias l='ls -lh'                # long format and human-readable sizes
+alias ll='l -A'                 # long format, all files
+alias g='git'
+include /usr/share/bash-completion/completions/git && __git_complete g _git
 alias mpv="mpv --ytdl-format mp4"
 alias mv="mv -iv"
 alias cp="cp -iv"
@@ -24,16 +35,13 @@ aur() {
    cd ${1}
 }
 
-# i-beam cursor
-# echo -e "\033[5 q"              # blinking
-echo -e "\033[6 q"              # non-blinking
-
-
-# If not running interactively, don't do anything else
-[[ $- != *i* ]] && return
+# fzf
+include /usr/share/fzf/key-bindings.bash
+include /usr/share/fzf/completion.bash
 
+# from https://unix.stackexchange.com/a/55935
 a_prompt() {
-    cwd=$(pwd | sed -e "s!$HOME!~!" | sed -re "s!([^/])[^/]+/!\1/!g")
+    cwd=$(sed -e "s:$HOME:~:" -e "s:\(\.\?[^/]\)[^/]*/:\1/:g" <<<$PWD)
     printf $cwd
 }
 PS1="\u@\h \$(a_prompt)> "