diff options
| -rw-r--r-- | .bash_aliases | 12 | ||||
| -rw-r--r-- | .bashrc | 76 |
2 files changed, 20 insertions, 68 deletions
diff --git a/.bash_aliases b/.bash_aliases index 892a455..3034db1 100644 --- a/.bash_aliases +++ b/.bash_aliases @@ -1,3 +1,15 @@ +alias ls='ls --color=auto' +alias ll='ls --color=auto -lAh' +#alias l='ls -CF' + +alias dir='dir --color=auto' +alias vdir='vdir --color=auto' + +alias grep='grep --color=auto' +alias fgrep='fgrep --color=auto' +alias egrep='egrep --color=auto' + + alias yts="mpv --ytdl-format='bestvideo[height<=360]+bestaudio'" alias ytd='youtube-dl -o "%(playlist_index)d-%(title)s.%(ext)s"' alias ytv3="youtube-dl --write-auto-sub -f 'bestvideo[height<=360]+bestaudio/best[height<=360]' -o '%(playlist_index)d-%(title)s.%(ext)s'" @@ -1,6 +1,7 @@ -# ~/.bashrc: executed by bash(1) for non-login shells. -# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc) -# for examples +PATH=$PATH:$HOME/.local/bin/:$HOME/.config/composer/vendor/bin + +export EDITOR='nvim' +export VISUAL='nvim' # If not running interactively, don't do anything case $- in @@ -30,75 +31,19 @@ shopt -s checkwinsize # make less more friendly for non-text input files, see lesspipe(1) #[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)" -# set variable identifying the chroot you work in (used in the prompt below) -if [ -z "${debian_chroot:-}" ] && [ -r /etc/debian_chroot ]; then - debian_chroot=$(cat /etc/debian_chroot) -fi - -# set a fancy prompt (non-color, unless we know we "want" color) -case "$TERM" in - xterm-color|*-256color|xterm-termite) color_prompt=yes;; -esac - -# uncomment for a colored prompt, if the terminal has the capability; turned -# off by default to not distract the user: the focus in a terminal window -# should be on the output of commands, not on the prompt -#force_color_prompt=yes - -if [ -n "$force_color_prompt" ]; then - if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then - # We have color support; assume it's compliant with Ecma-48 - # (ISO/IEC-6429). (Lack of such support is extremely rare, and such - # a case would tend to support setf rather than setaf.) - color_prompt=yes - else - color_prompt= - fi -fi - -if [ "$color_prompt" = yes ]; then - PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ ' - #PS1="\[$(tput bold)\]\[$(tput setaf 6)\]\T \[$(tput setaf 4)\][\[$(tput setaf 5)\]\u\[$(tput setaf 4)\]@\[$(tput setaf 5)\]\h \[$(tput setaf 2)\]\W\[$(tput setaf 4)\]]\\$ \[$(tput sgr0)\]" -else - PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ ' - #PS1='\T [\u@\h \W]\$ ' -fi -unset color_prompt force_color_prompt - -# If this is an xterm set the title to user@host:dir -case "$TERM" in -xterm*|rxvt*) - PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1" - ;; -*) - ;; -esac +PS1='\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ ' +#PS1="\[$(tput bold)\]\[$(tput setaf 6)\]\T \[$(tput setaf 4)\][\[$(tput setaf 5)\]\u\[$(tput setaf 4)\]@\[$(tput setaf 5)\]\h \[$(tput setaf 2)\]\W\[$(tput setaf 4)\]]\\$ \[$(tput sgr0)\]" # enable color support of ls and also add handy aliases if [ -x /usr/bin/dircolors ]; then test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)" - alias ls='ls --color=auto' - #alias dir='dir --color=auto' - #alias vdir='vdir --color=auto' - - #alias grep='grep --color=auto' - #alias fgrep='fgrep --color=auto' - #alias egrep='egrep --color=auto' fi # colored GCC warnings and errors -#export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01' +export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01' -# some more ls aliases -#alias ll='ls -l' -#alias la='ls -A' -#alias l='ls -CF' - -# Alias definitions. -# You may want to put all your additions into a separate file like -# ~/.bash_aliases, instead of adding them here directly. -# See /usr/share/doc/bash-doc/examples in the bash-doc package. +# Import aliases. if [ -f ~/.bash_aliases ]; then . ~/.bash_aliases fi @@ -114,11 +59,6 @@ if ! shopt -oq posix; then fi fi -PATH=$PATH:$HOME/.local/bin/:$HOME/.config/composer/vendor/bin - -export EDITOR='nvim' -export VISUAL='nvim' - #bind 'set show-all-if-ambiguous on' #bind 'set show-all-if-unmodified on' #bind 'set menu-complete-display-prefix on' |