From dbe697799605c94802426a3c5045537a1b41c2b6 Mon Sep 17 00:00:00 2001
From: Mart Lubbers <mart@martlubbers.net>
Date: Thu, 10 Jan 2019 11:55:22 +0100
Subject: [PATCH] Updates

- Improve install_clean.sh to generate tags as well
- Temporarily disable calendar sync
- Add beets to the path
- Update submodules
- Add clipboard shortcuts in vim
---
 clean/.local/bin/install_clean.sh | 23 ++++++++++++++++++-----
 email/.mutt/newmail.sh            |  2 +-
 shell/.bashrc                     |  6 +++---
 shell/.config/tmux/config         |  2 +-
 vim/.vimrc                        |  7 +++++++
 5 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/clean/.local/bin/install_clean.sh b/clean/.local/bin/install_clean.sh
index 745a9e1..e5ee3f1 100755
--- a/clean/.local/bin/install_clean.sh
+++ b/clean/.local/bin/install_clean.sh
@@ -1,9 +1,21 @@
-#!/bin/sh
-cd /tmp
-curl ftp://ftp.cs.ru.nl/pub/Clean/builds/linux-x64/clean-bundle-complete-linux-x64-latest.tgz | tar -xz
-rm -rf /opt/clean
-mv clean-bundle-complete /opt/clean
+#!/bin/bash
+set -e
 
+DISTRO="https://ftp.cs.ru.nl/Clean/builds/linux-x64/clean-bundle-complete-linux-x64-latest.tgz"
+TAGS="https://gitlab.science.ru.nl/cloogle/cloogle-tags/-/jobs/artifacts/master/raw/cloogletags?job=build"
+CLEAN_HOME="${CLEAN_HOME:-/opt/clean}"
+
+echo "Cleaning up the old distro"
+rm -rf "$CLEAN_HOME"/*
+echo "Downloading clean"
+curl -sS "$DISTRO" | tar -C "$CLEAN_HOME" --strip-components=1 -xz
+echo "Downloading cloogletags"
+curl -sSLo "$CLEAN_HOME"/bin/cloogletags "$TAGS"
+chmod +x "$CLEAN_HOME"/bin/cloogletags
+echo "Generating tags"
+cloogletags -a -c -d "$CLEAN_HOME"/lib -o "$CLEAN_HOME"/lib/tags 2>/dev/null
+
+echo "Patching StdEnv for binumap"
 patch /opt/clean/lib/StdEnv/StdGeneric.dcl <<EOPATCH
 --- StdGeneric.dcl	2018-12-17 02:43:55.000000000 +0100
 +++ StdGeneric.dcl	2018-12-17 11:06:09.196234236 +0100
@@ -55,6 +67,7 @@ patch /opt/clean/lib/StdEnv/StdGeneric.icl <<EOPATCH
  	| is_id f
 EOPATCH
 
+echo "Adding the iTasks-git environment"
 patch /opt/clean/etc/IDEEnvs <<EOPATCH
 --- IDEEnvs	2018-12-17 11:58:48.876039159 +0100
 +++ IDEEnvs	2018-12-17 12:00:52.384066455 +0100
diff --git a/email/.mutt/newmail.sh b/email/.mutt/newmail.sh
index 84c30c6..a73e7b9 100755
--- a/email/.mutt/newmail.sh
+++ b/email/.mutt/newmail.sh
@@ -5,4 +5,4 @@ then
 	notify-send "$newmail new emails!"
 fi
 notmuch new
-vdirsyncer sync
+#vdirsyncer sync
diff --git a/shell/.bashrc b/shell/.bashrc
index 09a6848..2ccc4c5 100644
--- a/shell/.bashrc
+++ b/shell/.bashrc
@@ -16,9 +16,9 @@ export NOTMUCH_CONFIG=~/.config/notmuch/config
 
 export CLEAN_HOME=/opt/clean
 
-export PATH=~/.local/bin:$PATH
-export PATH=$PATH:$CLEAN_HOME/lib/exe:$CLEAN_HOME/bin
-export PATH=$PATH:/opt/texlive/2018/bin/x86_64-linux:/opt/zotero:/opt/arduino
+export PATH="~/.local/bin:$PATH"
+export PATH="$PATH:$CLEAN_HOME/lib/exe:$CLEAN_HOME/bin"
+export PATH="$PATH:/opt/texlive/2018/bin/x86_64-linux:/opt/zotero:/opt/arduino:/opt/beets/bin"
 
 export GTK_IM_MODULE=xim
 export QT_IM_MODULE=xim
diff --git a/shell/.config/tmux/config b/shell/.config/tmux/config
index b772566..0245d41 100644
--- a/shell/.config/tmux/config
+++ b/shell/.config/tmux/config
@@ -20,7 +20,7 @@ set -g base-index 1
 
 # vi copy and pasting
 bind-key -T copy-mode-vi 'v' send -X begin-selection
-bind-key -T copy-mode-vi 'y' send -X copy-selection
+bind-key -T copy-mode-vi 'y' send -X copy-selection-and-cancel
 bind-key -T copy-mode-vi 'Space' send -X halfpage-down
 bind-key -T copy-mode-vi 'Bspace' send -X halfpage-up
 
diff --git a/vim/.vimrc b/vim/.vimrc
index 286afb6..42d87df 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -43,6 +43,13 @@ map <TAB>k <C-W>k
 nnoremap n nzzzv
 nnoremap N Nzzzv
 
+" Allow yanking to the clipboards in visual mode
+vnoremap sy :w ! xclip<enter><enter>
+vnoremap cy :w ! xclip -sel clip<enter><enter>
+" Allow pasting from the clipboards in normal mode
+nnoremap sp :r ! xclip -o<enter>
+nnoremap cp :r ! xclip -sel clip -o<enter>
+
 " Disable ex mode
 map Q <Nop>
 
-- 
2.20.1