From: Jannik ZANDER <jzander@grundfos.com>
Date: Thu, 30 Jun 2016 18:49:49 +0000 (+0200)
Subject: Bash history cleanup
X-Git-Url: https://git.zndr.dk/?a=commitdiff_plain;h=f3ca4554dd87958e2435a0f9b468822ed7446bac;p=dotfiles.git

Bash history cleanup
---

diff --git a/.config/bash/aliases b/.config/bash/aliases
index 1713e04..19859cd 100644
--- a/.config/bash/aliases
+++ b/.config/bash/aliases
@@ -94,14 +94,5 @@ alias startvnc4='vnc4server -geometry 1870x980 -depth 24'
 #alias python='/usr/local/bin/python3'
 alias git_local='git --git-dir=.git_local'
 alias dotfiles='git --git-dir=$HOME/.dotfiles --work-tree=$HOME'
+alias vcbuild='"C:/Program Files (x86)/Microsoft Visual Studio 9.0/VC/vcpackages/vcbuild.exe"'
 
-# alias for genibus
-alias gf='gf.py'
-alias com1='GENIsnus_1_lin_pr_tgm.exe COM1 9600 log 5'
-alias com2='GENIsnus_1_lin_pr_tgm.exe COM2 9600 log 5'
-alias com3='GENIsnus_1_lin_pr_tgm.exe COM3 9600 log 5'
-alias com4='GENIsnus_1_lin_pr_tgm.exe COM4 9600 log 5'
-alias com5='GENIsnus_1_lin_pr_tgm.exe COM5 9600 log 5'
-alias com6='GENIsnus_1_lin_pr_tgm.exe COM6 9600 log 5'
-alias com7='GENIsnus_1_lin_pr_tgm.exe COM7 9600 log 5'
-alias com8='GENIsnus_1_lin_pr_tgm.exe COM8 9600 log 5'
diff --git a/.config/bash/options b/.config/bash/options
index 284a673..3081bae 100644
--- a/.config/bash/options
+++ b/.config/bash/options
@@ -2,7 +2,7 @@
 shopt -s nocaseglob;
 
 # Append to the Bash history file, rather than overwriting it
-shopt -s histappend;
+#shopt -s histappend;
 
 # Autocorrect typos in path names when using `cd`
 shopt -s cdspell;
diff --git a/.config/bash/prompt.bash b/.config/bash/prompt.bash
index 38c2e0e..40a0a34 100644
--- a/.config/bash/prompt.bash
+++ b/.config/bash/prompt.bash
@@ -106,6 +106,13 @@ set_prompts()
 set_prompts
 unset set_prompts
 
+# When the shell exits, append to the history file instead of overwriting it
+shopt -s histappend
+# Larger bash history
+export HISTFILESIZE=10000;
+export HISTSIZE=5000;
+export HISTCONTROL=ignoreboth:erasedups
+export HISTIGNORE="ll:ls:cd:cd -:pwd:exit:date:* --help";
 # Whenever displaying the prompt, write the previous line to disk
-export PROMPT_COMMAND="history -a";
+export PROMPT_COMMAND="history -a; history -c; history -r; $PROMPT_COMMAND"
 
diff --git a/.config/git/attributes b/.config/git/attributes
index b00b920..bda67e7 100644
--- a/.config/git/attributes
+++ b/.config/git/attributes
@@ -2,8 +2,8 @@
 *           text=auto
 
 # Text files that should be normalized (CRLF => LF)
-*.c         text
-*.h         text
+#*.c         text
+#*.h         text
 
 # Text files with fixed EOL=LF
 *.sh        text eol=LF
diff --git a/.config/git/config b/.config/git/config
index a6bd56d..6445656 100644
--- a/.config/git/config
+++ b/.config/git/config
@@ -95,6 +95,5 @@
   excludesfile = ~/.config/git/ignore
   attributesFile = ~/.config/git/attributes
   editor = vim
-  #autocrlf = false
 [include]
   path = ~/.config/git/config_local
diff --git a/.config/profile/environ.sh b/.config/profile/environ.sh
index ec177f4..b4f75b9 100644
--- a/.config/profile/environ.sh
+++ b/.config/profile/environ.sh
@@ -10,11 +10,6 @@ export PAGER='less -eFRX'
 export MANPAGER="less -eFRX"
 export BROWSER='lynx -vikeys -use_mouse'
 
-# Larger bash history (allow 32³ entries; default is 500)
-export HISTSIZE=32768;
-export HISTFILESIZE=$HISTSIZE;
-export HISTCONTROL=ignoreboth;
-export HISTIGNORE="ls:cd:cd -:pwd:exit:date:* --help";
 
 # Prefer US language and UTF-8
 export LANG="en_US.UTF-8";
diff --git a/.editorconfig b/.editorconfig
index 2150195..cb2626d 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -5,7 +5,17 @@ root = true
 [*]
 indent_style = space
 indent_size = 2
-end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
+# Windows-style newlines with a newline ending every file
+#end_of_line = crlf
+# Unix-style newlines with a newline ending every file
+#end_of_line = lf
+
+[*.py]
+indent_size = 4
+
+[Makefile]
+indent_style = tab
+
diff --git a/.vimrc b/.vimrc
index 75598d1..77da337 100644
--- a/.vimrc
+++ b/.vimrc
@@ -20,8 +20,9 @@ set runtimepath+=~/.cache/vim
 
 " section: plugins {{{1
 " ---------------------
-silent call plug#begin('~/.cache/vim/plugged')
+"silent call plug#begin('~/.cache/vim/plugged')
 
+call plug#begin('~/.cache/vim/plugged')
 "Plug 'tpope/vim-sensible'
 "Plug 'tpope/vim-ragtag'
 Plug 'tpope/vim-repeat'
@@ -216,6 +217,6 @@ if (&t_Co > 2 || has("gui_running")) && has("syntax")
  endif
 " }}}1
 
-if filereadable(expand('~/.config/vim/vimrc_local'))
-  source ~/.config/vim/vimrc_local
+if filereadable(expand('~/.vimrc_local'))
+  source ~/.vimrc_local
 endif