From cafd1a19652404214163a4881ea87f6e6bd569fe Mon Sep 17 00:00:00 2001
From: David Aizenberg <david@aizenberg.co.uk>
Date: Mon, 4 Jun 2018 04:28:27 +0300
Subject: [PATCH] fixes

---
 .bashrc  |  4 ++--
 setup.sh | 29 +++++++++++++++++------------
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/.bashrc b/.bashrc
index 5d0a948..6f5b69e 100644
--- a/.bashrc
+++ b/.bashrc
@@ -34,7 +34,7 @@ alias ping='ping -c 4'
 alias ns='sudo netstat -alnp --protocol=inet'
 
 alias reload='source ~/.bashrc'     # reload bash config.
-
+alias kb="setxkbmap -layout gb,ru -option -option grp:caps_toggle,grp_led:scroll,terminate:ctrl_alt_bksp"
 alias g='grep'
 
 #Git specific aliases
@@ -84,7 +84,7 @@ export NVM_DIR="$HOME/.nvm"
 # Yavide alias
 alias yavide="gvim --servername yavide -f -N -u /opt/yavide/.vimrc"
 
-alias t='python ~/t/t.py --task-dir ~/Dropbox --list tasks'
+alias t='clear ; python ~/t/t.py --task-dir ~/Dropbox --list tasks'
 
 # include .bashrc helpers if they exist (Non-Open Source helpers)
 if [ -f $HOME/.bash_helpers ]; then
diff --git a/setup.sh b/setup.sh
index 50f4818..34bfaeb 100755
--- a/setup.sh
+++ b/setup.sh
@@ -4,14 +4,6 @@ GREEN='\033[0;32m'
 RESET='\033[0m'
 
 
-echo "Preparing"
-
-touch ~/.bashrc ~/.vimrc
-mkdir -p ~/.vim
-mkdir -p ~/.vim/backup
-mkdir -p ~/.vim/tmp
-mkdir -p ~/.vim/colors
-
 read -p "Delete old backups? " -n 1 -r
 echo    
 if [[ $REPLY =~ ^[Yy]$ ]]
@@ -23,16 +15,29 @@ then
 	echo -e "${GREEN} Deleted old backups ${RESET}"
 fi
 
-# Create tmp dir
-mkdir tmp/
 
 echo -e "${GREEN} Backing Up and moving configs ${RESET}"
 
 mv ~/.bashrc ~/.bashrc~
-ln -rsf .bashrc ~/.bashrc
-
 mv ~/.vimrc ~/.vimrc~
 mv ~/.vim ~/.vim~
+
+echo -e "${GREEN} Preparing ${RESET}"
+
+touch ~/.bashrc ~/.vimrc
+mkdir -p ~/.vim
+mkdir -p ~/.vim/backup
+mkdir -p ~/.vim/tmp
+mkdir -p ~/.vim/colors
+
+
+# Create tmp dir
+mkdir tmp/
+
+
+ln -rsf .bashrc ~/.bashrc
+
+mkdir -p ~/.vim
 ln -rsf .vimrc ~/.vimrc
 
 echo -e "${GREEN} Installing Pathogen ${RESET}"