From 9547aa3ee3e9ba9a731c224eed7226ca1f57fa76 Mon Sep 17 00:00:00 2001 From: Severin Kaderli Date: Sun, 11 Sep 2016 17:27:17 +0200 Subject: [PATCH] Add .bashrc Signed-off-by: Severin Kaderli --- .bash_profile | 6 +- .bashrc | 125 +++++++++++++++++++++++++++++++++++++++ .config/i3/config | 21 ++++--- .config/i3/i3blocks.conf | 10 +--- 4 files changed, 140 insertions(+), 22 deletions(-) create mode 100644 .bashrc diff --git a/.bash_profile b/.bash_profile index 7bb7bcc..df06e13 100644 --- a/.bash_profile +++ b/.bash_profile @@ -1,3 +1,5 @@ -if [ -z "$DISPLAY" ] && [ "$(fgconsole)" -eq 1 ]; then - exec startx +if [ "$(tty)" = "/dev/tty1" ]; then + startx && exit fi + +source $HOME/.bashrc diff --git a/.bashrc b/.bashrc new file mode 100644 index 0000000..9fdf896 --- /dev/null +++ b/.bashrc @@ -0,0 +1,125 @@ +# ~/.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|xterm-color|*-256color) 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 + if [[ ${EUID} == 0 ]] ; then + PS1='${debian_chroot:+($debian_chroot)}\[\033[01;31m\]\h\[\033[01;34m\] \W \$\[\033[00m\] ' + else + PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\] \[\033[01;34m\]\w \$\[\033[00m\] ' + fi +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' + +# some more ls aliases +alias ll='ls -alF' +alias la='ls -A' +alias l='ls -CF' + +# 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 + +if [ -x /usr/bin/mint-fortune ]; then + /usr/bin/mint-fortune +fi diff --git a/.config/i3/config b/.config/i3/config index 0afcdf0..4383d4a 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -143,10 +143,10 @@ bindsym $mod+Shift+KP_9 move container to workspace $workspace9 bindsym $mod+Shift+KP_0 move container to workspace $workspace10 # Reload configuration file -bindsym $mod+Shift+c reload +bindsym $mod+Shift+r reload # Restart i3 -bindsym $mod+Shift+r restart +#bindsym $mod+Shift+r restart # Logout from i3 bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -b 'Yes, exit i3' 'i3-msg exit'" @@ -171,7 +171,7 @@ bindsym $mod+x mode "resize" # finds out, if available) bar { font pango: Roboto-Regular, FontAwesome 10 - status_command i3blocks -c ~/.config/i3/i3blocks.conf + status_command i3blocks -c $HOME/.config/i3/i3blocks.conf position top } @@ -196,6 +196,9 @@ bindsym $mod+$alt+Right move workspace to output right # Run specific applications on start ### +# Merge .Xresources on boot +exec xrdb -merge $HOME/.Xresources + # Compton exec --no-startup-id compton @@ -206,14 +209,10 @@ exec_always --no-startup-id feh --bg-center /home/severin/GoogleDrive/02_Media/0 exec_always --no-startup-id xrandr --output $output2 --mode 1280x1024 --pos 1280x0 --rotate normal --output VIRTUAL1 --off --output DP1 --off --output $output1 --mode 1280x1024 --pos 0x0 --rotate normal # Other applications -exec --no-startup-id google-chrome-beta -exec --no-startup-id gnome-terminal -x bash -c "sudo apt-get update && sudo apt-get upgrade -y" -exec --no-startup-id gnome-terminal -exec --no-startup-id thunar -exec --no-startup-id thunar -#exec --no-startup-id steam -#exec --no-startup-id keepass2 -exec --no-startup-id audacious + +exec google-chrome-beta +exec gnome-terminal -x bash -c "sudo apt-get update && sudo apt-get upgrade -y" +exec audacious # Assign programs to specific workspaces ### diff --git a/.config/i3/i3blocks.conf b/.config/i3/i3blocks.conf index b4d0ba2..0c74efa 100644 --- a/.config/i3/i3blocks.conf +++ b/.config/i3/i3blocks.conf @@ -1,7 +1,4 @@ # i3blocks config file - - -# Global properties command=/usr/share/i3blocks/$BLOCK_NAME markup=none @@ -10,11 +7,10 @@ align=center separator=false separator_block_width=10 - [Music] markup=pango command=~/.config/i3/i3bar/music.sh -interval=1 +interval=repeat [seperator] @@ -28,7 +24,3 @@ interval=repeat [Datetime] command=~/.config/i3/i3bar/datetime.sh interval=1 - -[Shutdown] -full_text= -command=~/.config/i3/i3bar/shutdown.sh -c -p rofi