From f8759897293de64c101a69bec3af2705b7c84902 Mon Sep 17 00:00:00 2001
From: Mehdi Sadeghi <mehdi@mehdix.org>
Date: Tue, 7 Jun 2022 08:06:48 +0200
Subject: Separate sh history. Add hist count to prompt.

sh history is written to ~/.sh_history now. The reason is that
I am chasing the cause of a history truncation issue.
---
 .env | 37 +++++++++++++++++++++++++++----------
 1 file changed, 27 insertions(+), 10 deletions(-)

(limited to '.env')

diff --git a/.env b/.env
index e8c565e..9d566e1 100644
--- a/.env
+++ b/.env
@@ -1,7 +1,15 @@
-echo .env begin
 # .env
+echo .env begin
+
 PS1='$(prompt)'
 
+# sh history config
+HISTSIZE=65535
+HISTFILE=.sh_history
+
+# Tell Readline to use vi-style keybindings
+#set -o vi
+
 if [ -z "${SSH_AGENT_PID}" ]; then
 	if ! [ -e /tmp/ssh-agent-$USER ]
 	then
@@ -28,22 +36,31 @@ alias githome='git --git-dir ~/.githome --work-tree ~'
 alias ls='ls --color -A --group-directories-first --sort=extension'
 alias recent='ls -ltch'
 alias gl='git pull'
+alias gsl='git stash && git pull && git stash pop'
 alias gcm='git checkout master'
+alias gcd='git checkout develop'
 alias gco='git checkout'
 alias gst='git status'
 alias mbsync="mbsync -c ~/.config/isync/mbsyncrc"
+alias rm="rm -i"
+
+PATH=$HOME/.local/bin:$PATH
+HOSTNAME=$(cat /proc/sys/kernel/hostname)
+PATH=$HOME/.local/bin/$HOSTNAME:$PATH
+PATH=$HOME/.local/bin/`uname -m`:$PATH
+PATH=$HOME/.cargo/bin:$PATH
+GOPATH="$HOME/.local/share/go"
+PATH=$GOPATH/bin:$PATH
+export PATH
+export LANGUAGE=en
+BROWSER=w3m
+
+# Load nix if available
+[ -e $HOME/.nix-profile/etc/profile.d/nix.sh ] \
+	&& . $HOME/.nix-profile/etc/profile.d/nix.sh
 
 # Use correct TTY for GPG Pinentry
 export GPG_TTY="$(tty)"
 gpg-connect-agent updatestartuptty /bye >/dev/null
-export PATH=$HOME/.local/bin:$PATH
-HOSTNAME=$(cat /proc/sys/kernel/hostname)
-export PATH=$HOME/.local/bin/$HOSTNAME:$PATH
-export PATH=$HOME/.local/bin/`uname -m`:$PATH
-export PATH=$HOME/.cargo/bin:$PATH
-export GOPATH="$HOME/.local/share/go"
-export PATH=$GOPATH/bin:$PATH
 
-export BROWSER=w3m
-export LANGUAGE=en
 echo .env end
-- 
cgit v1.2.3