From 6bd5a143a3cb5466486faee0ad7da60b2fdb77ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9ophile=20Bastian?= <contact@tobast.fr>
Date: Mon, 5 Oct 2020 14:37:41 +0200
Subject: [PATCH] Alter bashrc, vimrc

---
 files/.bashrc | 60 ++++++++++++++++++++++++++++-----------------------
 files/.vimrc  | 18 ++++++++--------
 2 files changed, 42 insertions(+), 36 deletions(-)

diff --git a/files/.bashrc b/files/.bashrc
index 98b8a2f..2e506cd 100644
--- a/files/.bashrc
+++ b/files/.bashrc
@@ -6,38 +6,40 @@
 #	/bin/bash "$HOME/.at_login"
 #fi
 
-# If not running interactively, don't do anything
-[ -z "$PS1" ] && return
+if [ -n "$PS1" ]; then
+    # don't put duplicate lines in the history. See bash(1) for more options
+    # ... or force ignoredups and ignorespace
+    HISTCONTROL=ignoredups:ignorespace
 
-# don't put duplicate lines in the history. See bash(1) for more options
-# ... or force ignoredups and ignorespace
-HISTCONTROL=ignoredups:ignorespace
+    # append to the history file, don't overwrite it
+    shopt -s histappend
 
-# 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
 
-# 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
 
-# check the window size after each command and, if necessary,
-# update the values of LINES and COLUMNS.
-shopt -s checkwinsize
+    # make less more friendly for non-text input files, see lesspipe(1)
+    [ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)"
 
-# make less more friendly for non-text input files, see lesspipe(1)
-[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)"
+    if [ -f /etc/bash_completion ] && ! shopt -oq posix; then
+        . /etc/bash_completion
+    fi
+
+    [ -f ~/.bash_ps1 ] && source ~/.bash_ps1
+
+    # Autojump
+    [ -f /etc/profile.d/autojump.bash ] && source /etc/profile.d/autojump.bash
+fi
+
+[ -f ~/.bash_sshagent ] && source ~/.bash_sshagent
 
 # Aliases
 [ -f ~/.bash_aliases ] && source ~/.bash_aliases
 
-if [ -f /etc/bash_completion ] && ! shopt -oq posix; then
-    . /etc/bash_completion
-fi
-
-[ -f ~/.bash_ps1 ] && source ~/.bash_ps1
-
-[ -f ~/.bash_sshagent ] && source ~/.bash_sshagent
-
 export GTK_IM_MODULE=xim
 
 export EDITOR=/usr/bin/vim
@@ -45,16 +47,13 @@ export EDITOR=/usr/bin/vim
 export _JAVA_OPTIONS='-Dawt.useSystemAAFontSettings=on -Dswing.aatext=true -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel'
 export ANDROID_HOME=/opt/android-sdk
 
-export PATH="$PATH:/home/tobast/bin"
+export PATH="$PATH:$HOME/bin"
 export MANPATH="$MANPATH:$HOME/local/man"
 
 export TERMINAL="/usr/bin/terminator"
 
 export LC_REALUSER='tbastian'
 
-# Autojump
-[ -f /etc/profile.d/autojump.bash ] && source /etc/profile.d/autojump.bash
-
 # Opam
 which opam > /dev/null 2>&1 && [ -d ~/.opam ] && eval $(opam config env)
 
@@ -67,3 +66,10 @@ then
     export PATH="$PATH:$cur_path"
 fi
 unset gempath
+
+# pip
+export PATH="$PATH:$HOME/.local/bin"
+
+# Go
+export GOPATH="$HOME/.go"
+export PATH="$PATH:$HOME/.go/bin"
diff --git a/files/.vimrc b/files/.vimrc
index f9d7c0c..be0c9a2 100644
--- a/files/.vimrc
+++ b/files/.vimrc
@@ -84,15 +84,15 @@ filetype plugin indent on    " required
 " set statusline+=%#warningmsg#
 " set statusline+=%{SyntasticStatuslineFlag()}
 " set statusline+=%*
-let g:syntastic_always_populate_loc_list = 1
-"let g:syntastic_auto_loc_list = 1
-let g:syntastic_check_on_open = 1
-let g:syntastic_check_on_wq = 0
-let g:syntastic_enable_signs=1
-let g:syntastic_cpp_check_header = 1
-let g:syntastic_cpp_remove_include_errors = 1
-let g:syntastic_quiet_messages = {"regex":'pragma once in'}
-"let g:syntastic_auto_jump=1
+"let g:syntastic_always_populate_loc_list = 1
+""let g:syntastic_auto_loc_list = 1
+"let g:syntastic_check_on_open = 1
+"let g:syntastic_check_on_wq = 0
+"let g:syntastic_enable_signs=1
+"let g:syntastic_cpp_check_header = 1
+"let g:syntastic_cpp_remove_include_errors = 1
+"let g:syntastic_quiet_messages = {"regex":'pragma once in'}
+""let g:syntastic_auto_jump=1
 
 "" LaTeX
 let g:syntastic_tex_checkers = [ 'chktex' ]