From ade2c64f405d590a5bbb34d03d5d39ee6de70c5e Mon Sep 17 00:00:00 2001 From: Mart Lubbers Date: Tue, 16 Jun 2020 21:15:40 +0200 Subject: [PATCH] . --- clean/.local/bin/install_clean.sh | 59 ++++------------------- config.h/dwm/config.h | 2 +- config.h/st/config.h | 77 +++++++++++++++---------------- newsboat/.config/newsboat/urls | 5 +- shell/.bashrc | 2 +- vim/.vim/after/ftplugin/clean.vim | 2 +- 6 files changed, 54 insertions(+), 93 deletions(-) diff --git a/clean/.local/bin/install_clean.sh b/clean/.local/bin/install_clean.sh index 2abd923..544cb16 100755 --- a/clean/.local/bin/install_clean.sh +++ b/clean/.local/bin/install_clean.sh @@ -1,14 +1,21 @@ #!/bin/bash -set -e +set -ex -DISTRO="https://ftp.cs.ru.nl/Clean/builds/linux-x64/clean-bundle-complete-linux-x64-latest.tgz" +if [ $# -ne 1 ] +then + echo "Usage: $0 [x86|x64]" + exit 1 +fi + +DISTRO="https://ftp.cs.ru.nl/Clean/builds/linux-$1/clean-bundle-complete-linux-$1-latest.tgz" TAGS="https://gitlab.science.ru.nl/cloogle/cloogle-tags/-/jobs/artifacts/master/raw/cloogletags?job=build" CLMMAN="https://gitlab.science.ru.nl/clean-and-itasks/clm/raw/master/clm.1" CP2CG="https://gitlab.science.ru.nl/clean-and-itasks/cleanprof2callgrind/-/jobs/artifacts/master/raw/cleanprof2callgrind?job=test" -CLEAN_HOME="${CLEAN_HOME:-/opt/clean}" +CLEAN_HOME="/opt/clean-$1" echo "Cleaning up the old distro" rm -rf "$CLEAN_HOME"/* +mkdir -p "$CLEAN_HOME" echo "Downloading clean" curl -sSL "$DISTRO" | tar -C "$CLEAN_HOME" --strip-components=1 -xz echo "Installing manpages" @@ -22,49 +29,3 @@ 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 "Adding the iTasks-git environment" -patch /opt/clean/etc/IDEEnvs < 0: cursor application mode enabled * * < 0: cursor application mode disabled - * crlf value - * * 0: no value - * * > 0: crlf mode is enabled - * * < 0: crlf mode is disabled * * Be careful with the order of the definitions because st searches in * this table sequentially, so any XK_ANY_MOD must be in the last @@ -219,13 +223,6 @@ static KeySym mappedkeys[] = { -1 }; */ static uint ignoremod = Mod2Mask|XK_SWITCH_MOD; -/* - * Override mouse-select while mask is active (when MODE_MOUSE is set). - * Note that if you want to use ShiftMask with selmasks, set this to an other - * modifier, set to 0 to not use it. - */ -static uint forceselmod = ShiftMask; - /* * This is the huge key array which defines all compatibility to the Linux * world. Please decide about changes wisely. diff --git a/newsboat/.config/newsboat/urls b/newsboat/.config/newsboat/urls index 8644813..01f5122 100644 --- a/newsboat/.config/newsboat/urls +++ b/newsboat/.config/newsboat/urls @@ -4,10 +4,11 @@ https://www.youtube.com/feeds/videos.xml?channel_id=UCXuqSBlHAE6Xw-yeJA0Tunw yt https://www.youtube.com/feeds/videos.xml?channel_id=UC2oq8RM-S7dBk_cwF-Vvv5g yt "Vinyl Eyezz" https://www.youtube.com/feeds/videos.xml?channel_id=UC8uT9cgJorJPWu7ITLGo9Ww yt "The 8-Bit Guy" https://www.youtube.com/feeds/videos.xml?channel_id=UCLx053rWZxCiYWsBETgdKrQ yt "Lazy Game Reviews" +https://www.youtube.com/feeds/videos.xml?channel_id=UCz9uUFDhsPYii-ZihoKsbPg yt "LGR Foods" +https://www.youtube.com/feeds/videos.xml?channel_id=UCw_Sxdt27ASqErScT4Rlj8A yt "LGR Blerbs" https://www.youtube.com/feeds/videos.xml?channel_id=UCkxMlA7rt-mnIc1AjbyAsPw yt "sexplanations" https://www.youtube.com/feeds/videos.xml?channel_id=UCEFymXY4eFCo_AchSpxwyrg yt "MetalJesusRocks" https://www.youtube.com/feeds/videos.xml?channel_id=UChturLXwYxwTOf_5krs0qvA yt "The Ben Heck Show" -https://www.youtube.com/feeds/videos.xml?channel_id=UCz9uUFDhsPYii-ZihoKsbPg yt "LGR Foods" https://www.youtube.com/feeds/videos.xml?channel_id=UCTp0MnlTlmqC3NdrPzD08EA yt "Infidelamsterdam" https://www.youtube.com/feeds/videos.xml?channel_id=UC5I2hjZYiW9gZPVkvzM8_Cw yt "Techmoan" https://www.youtube.com/feeds/videos.xml?channel_id=UCkWQ0gDrqOCarmUKmppD7GQ yt "JayzTwoCents" @@ -27,3 +28,5 @@ https://www.youtube.com/feeds/videos.xml?channel_id=UCxDZs_ltFFvn0FDHT6kmoXA yt https://www.youtube.com/feeds/videos.xml?channel_id=UCxzC4EngIsMrPmbm6Nxvb-A yt "Scott Manley https://www.youtube.com/feeds/videos.xml?channel_id=UC8vR6VP-3o_SpdnEBrpYGiQ yt "AuthenticSound" https://www.youtube.com/feeds/videos.xml?channel_id=UCq3CjAhR9foEpCXj88sMAKQ yt "Survival Russia" +https://www.youtube.com/feeds/videos.xml?channel_id=UCg0PzY2Uo_Rs6v1M4J30N3w yt "Steve of Warr" +https://www.youtube.com/feeds/videos.xml?channel_id=UC07JpCn-IUv4KnJUjRba9Wg yt "dosgamert" diff --git a/shell/.bashrc b/shell/.bashrc index 29b3d3f..5206b28 100644 --- a/shell/.bashrc +++ b/shell/.bashrc @@ -20,7 +20,7 @@ export NOTMUCH_CONFIG="${XDG_CONFIG_HOME:-$HOME/.config}"/notmuch/config export PASSWORD_STORE_DIR="${XDG_DATA_HOME:-$HOME/.local/share}"/pass export TMUX_TMPDIR="$XDG_RUNTIME_DIR" -export CLEAN_HOME=/opt/clean +export CLEAN_HOME=/opt/clean-x64 export PATH=~/.local/bin:$PATH export PATH=$PATH:$CLEAN_HOME/lib/exe:$CLEAN_HOME/bin diff --git a/vim/.vim/after/ftplugin/clean.vim b/vim/.vim/after/ftplugin/clean.vim index 56402d5..d8d7aa6 100644 --- a/vim/.vim/after/ftplugin/clean.vim +++ b/vim/.vim/after/ftplugin/clean.vim @@ -1,2 +1,2 @@ -setlocal tags+=/opt/clean/lib/tags +setlocal tags+=/opt/clean-x64/lib/tags setlocal tags+=./.tags;/ -- 2.20.1