From 2f2b20235cca684283feb55763d41916ea286cb6 Mon Sep 17 00:00:00 2001 From: "flyingscorpio@arch-desktop" Date: Fri, 4 Sep 2020 17:53:52 +0200 Subject: [PATCH] Remove original_bashrc and put the interesting parts of it in different files --- dotfiles/bash/bashrc | 22 ++++++- dotfiles/bash/original_bashrc | 114 ---------------------------------- dotfiles/shell/aliases | 17 ++++- dotfiles/zsh/zshrc | 3 + 4 files changed, 37 insertions(+), 119 deletions(-) delete mode 100644 dotfiles/bash/original_bashrc diff --git a/dotfiles/bash/bashrc b/dotfiles/bash/bashrc index 3f604f8..f828491 100644 --- a/dotfiles/bash/bashrc +++ b/dotfiles/bash/bashrc @@ -1,12 +1,28 @@ # ~/.bashrc # -# Source the originaly generated bashrc -. ~/SetupCockpit/dotfiles/bash/original_bashrc +# check the window size after each command and, if necessary, +# update the values of LINES and COLUMNS. +shopt -s checkwinsize + +HISTCONTROL=ignoreboth # don't put duplicate lines or lines starting with space in the history. +shopt -s histappend # append to the history file, don't overwrite it +HISTSIZE=10000 +HISTFILESIZE=10000 + +if [ -f ~/.bash_aliases ]; then + . ~/.bash_aliases +fi + +if [ -f /usr/share/bash-completion/bash_completion ]; then + . /usr/share/bash-completion/bash_completion +elif [ -f /etc/bash_completion ]; then + . /etc/bash_completion +fi # On Arch Linux, source pkgfile "command not found" hook if [ -e /usr/share/doc/pkgfile/command-not-found.bash ]; then - source /usr/share/doc/pkgfile/command-not-found.bash + . /usr/share/doc/pkgfile/command-not-found.bash fi # Enable colored less output diff --git a/dotfiles/bash/original_bashrc b/dotfiles/bash/original_bashrc deleted file mode 100644 index a2af7e6..0000000 --- a/dotfiles/bash/original_bashrc +++ /dev/null @@ -1,114 +0,0 @@ -#!/bin/bash - -# ~/.bashrc: executed by bash(1) for non-login shells. -# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc) -# for examples - -# If not running interactively, don't do anything -case $- in - *i*) ;; - *) return;; -esac - -# don't put duplicate lines or lines starting with space in the history. -# See bash(1) for more options -HISTCONTROL=ignoreboth - -# append to the history file, don't overwrite it -shopt -s histappend - -# for setting history length see HISTSIZE and HISTFILESIZE in bash(1) -HISTSIZE=1000 -HISTFILESIZE=2000 - -# check the window size after each command and, if necessary, -# update the values of LINES and COLUMNS. -shopt -s checkwinsize - -# If set, the pattern "**" used in a pathname expansion context will -# match all files and zero or more directories and subdirectories. -#shopt -s globstar - -# 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-kitty) 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\]\$ ' -else - PS1='${debian_chroot:+($debian_chroot)}\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 - -# 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' - -# Add an "alert" alias for long running commands. Use like so: -# sleep 10; alert -alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"' - -# 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. - -if [ -f ~/.bash_aliases ]; then - . ~/.bash_aliases -fi - -# enable programmable completion features (you don't need to enable -# this, if it's already enabled in /etc/bash.bashrc and /etc/profile -# sources /etc/bash.bashrc). -if ! shopt -oq posix; then - if [ -f /usr/share/bash-completion/bash_completion ]; then - . /usr/share/bash-completion/bash_completion - elif [ -f /etc/bash_completion ]; then - . /etc/bash_completion - fi -fi diff --git a/dotfiles/shell/aliases b/dotfiles/shell/aliases index 6163bec..3648995 100644 --- a/dotfiles/shell/aliases +++ b/dotfiles/shell/aliases @@ -2,9 +2,22 @@ alias lime2connect='ssh flyingscorpio@2px.info' + +# 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 grep='grep --color=auto' + alias fgrep='fgrep --color=auto' + alias egrep='egrep --color=auto' +fi + alias rm='rm -I --preserve-root' -alias grep='grep --color=auto' -alias ls='ls --color=auto' + +# Add an "alert" alias for long running commands. Use like so: +# sleep 10; alert +alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"' + alias ll='ls -lh' alias lla='ls -lArth' alias la='ls -A' diff --git a/dotfiles/zsh/zshrc b/dotfiles/zsh/zshrc index a382e96..8d2ea43 100644 --- a/dotfiles/zsh/zshrc +++ b/dotfiles/zsh/zshrc @@ -39,6 +39,9 @@ zstyle ':completion:*' menu select zmodload zsh/complist compinit setopt COMPLETE_ALIASES +case "$TERM" in + xterm-kitty) kitty + complete setup zsh | source /dev/stdin +esac # Use vim keys in tab complete menu bindkey -M menuselect 'h' vi-backward-char