Fix linting errors
Signed-off-by: Severin Kaderli <severin.kaderli@gmail.com>
This commit is contained in:
parent
fec74b795e
commit
8b3a294360
5 changed files with 25 additions and 30 deletions
|
@ -2,20 +2,20 @@
|
|||
#
|
||||
# Author: Severin Kaderli <severin.kaderli@gmail.com>
|
||||
# We just source .bashrc so we don't need to manage two files.
|
||||
if [[ -f $HOME/.bashrc ]]; then
|
||||
. $HOME/.bashrc
|
||||
if [[ -f "${HOME}/.bashrc" ]]; then
|
||||
. "${HOME}/.bashrc"
|
||||
fi
|
||||
|
||||
# Setting keyboard colors
|
||||
if [[ -f $HOME/.keyleds ]]; then
|
||||
. $HOME/.keyleds
|
||||
if [[ -f "${HOME}/.keyleds" ]]; then
|
||||
. "${HOME}/.keyleds"
|
||||
fi
|
||||
|
||||
# Restore custom dconf configuration
|
||||
cat "${HOME}/dconf/root.conf" | dconf load /
|
||||
dconf load / < "${HOME}/dconf/root.conf"
|
||||
|
||||
# Activate correct crontab file
|
||||
crontab $HOME/.crontab
|
||||
crontab "${HOME}/.crontab"
|
||||
|
||||
# If we are on tty1 we start the x-server
|
||||
if [ "$(tty)" = "/dev/tty1" ]; then
|
||||
|
|
|
@ -6,34 +6,34 @@ shopt -s checkwinsize
|
|||
shopt -s globstar
|
||||
|
||||
# set a fancy prompt (non-color, unless we know we "want" color)
|
||||
case "$TERM" in
|
||||
xterm|xterm-color|*-256color) color_prompt=yes;;
|
||||
esac
|
||||
#case "$TERM" in
|
||||
# xterm|xterm-color|*-256color) color_prompt=yes;;
|
||||
#esac
|
||||
|
||||
unset color_prompt force_color_prompt
|
||||
#unset color_prompt force_color_prompt
|
||||
|
||||
# Enable color support of ls
|
||||
if [ -f $HOME/.dircolors ]; then
|
||||
dircolors -b $HOME/.dircolors > /dev/null 2>&1
|
||||
if [ -f "${HOME}/.dircolors" ]; then
|
||||
dircolors -b "${HOME}/.dircolors" > /dev/null 2>&1
|
||||
fi
|
||||
|
||||
# Sourcing alias definitions
|
||||
if [ -f $HOME/.aliases ]; then
|
||||
. $HOME/.aliases
|
||||
if [ -f "${HOME}/.aliases" ]; then
|
||||
. "${HOME}/.aliases"
|
||||
fi
|
||||
|
||||
# Source git-prompt script
|
||||
if [ -f /usr/share/git/completion/git-prompt.sh ]; then
|
||||
. /usr/share/git/completion/git-prompt.sh
|
||||
if [ -f "/usr/share/git/completion/git-prompt.sh" ]; then
|
||||
. "/usr/share/git/completion/git-prompt.sh"
|
||||
fi
|
||||
|
||||
# Enable autocompletion features
|
||||
if [ -f /etc/bash_completion ]; then
|
||||
if [ -f "/etc/bash_completion" ]; then
|
||||
/etc/bash_completion
|
||||
fi
|
||||
complete -cf sudo
|
||||
|
||||
# Sourcing alias definitions
|
||||
if [ -f $HOME/.env ]; then
|
||||
. $HOME/.env
|
||||
if [ -f "${HOME}/.env" ]; then
|
||||
. "${HOME}/.env"
|
||||
fi
|
11
system/.env
11
system/.env
|
@ -1,4 +1,6 @@
|
|||
#!/bin/bash
|
||||
. "${HOME}/bin/utils.sh"
|
||||
|
||||
|
||||
# Bash
|
||||
export HISTCONTROL=ignoreboth
|
||||
|
@ -36,16 +38,9 @@ export npm_config_prefix="$HOME/.node_modules"
|
|||
# Adding folders to the PATH variable
|
||||
export PATH="$PATH:$HOME/bin:$HOME/.node_modules/bin"
|
||||
|
||||
# Color codes for bash prompt
|
||||
RESET='\033[0m'
|
||||
GREEN='\033[32m'
|
||||
RED='\033[31m'
|
||||
BLUE='\033[34m'
|
||||
YELLOW='\033[33m'
|
||||
|
||||
# Set bash prompt
|
||||
set_bash_prompt() {
|
||||
PS1="${Reset}┌─"
|
||||
PS1="${RESET}┌─"
|
||||
PS1="${PS1}${RED}[\t]"
|
||||
PS1="${PS1}${BLUE}[\h]"
|
||||
PS1="${PS1}${YELLOW}[\w]"
|
||||
|
|
|
@ -10,6 +10,6 @@ setxkbmap -model pc105 -layout ch
|
|||
# Start ibus
|
||||
ibus-daemon -drx
|
||||
|
||||
if [[ -f $HOME/.bash_profile ]]; then
|
||||
. $HOME/.bash_profile
|
||||
if [[ -f "${HOME}/.bash_profile" ]]; then
|
||||
. "${HOME}/.bash_profile"
|
||||
fi
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue