4 Commits
6 changed files with 84 additions and 91 deletions
+13
View File
@@ -0,0 +1,13 @@
return {
"goropikari/plantuml.nvim",
dependencies = {
"goropikari/LibDeflate.nvim",
},
opts = {
-- default opts
base_url = "https://www.plantuml.com/plantuml",
reload_events = { "BufWritePre" },
viewer = "xdg-open", -- Image viewer for non-ASCII exports
docker_image = "plantuml/plantuml-server:tomcat",
},
}
@@ -0,0 +1,4 @@
return {
"aklt/plantuml-syntax",
ft = { "plantuml" },
}
-5
View File
@@ -1,5 +0,0 @@
mbscholt = Michiel Scholten <michiel@aquariusoft.org>
m.scholten = Michiel Scholten <michiel@aquariusoft.org>
Michiel Scholten = Michiel Scholten <michiel@aquariusoft.org>
convert-repo = svnconvert <michiel@aquariusoft.org>
michiel.scholten@sanomamedia.nl = Michiel Scholten <michiel@aquariusoft.org>
-9
View File
@@ -1,9 +0,0 @@
syntax: glob
*.orig
*.rej
*~
*.o
tests/*.err
syntax: regexp
.*\#.*\#$
-33
View File
@@ -1,33 +0,0 @@
[ui]
#username = Michiel Scholten <michiel@aquariusoft.org>
username = m.scholten
[extensions]
# If you get an error about missing keyring, install python-keyring
hgext.mercurial_keyring = ~/workspace/application_addons/mercurial/mercurial_keyring/mercurial_keyring.py
convert =
hgext.bookmarks =
graphlog =
hgext.purge=
hgk=
hgflow = ~/workspace/application_addons/mercurial/hgflow/src/hgflow.py
#hggit = ~/workspace/application_addons/mercurial/hg-git/hggit
prompt = /home/mbscholt/workspace/application_addons/mercurial/hg-prompt/prompt.py
shelve=
[git]
authors = /home/mbscholt/.hgauthors.txt
[tortoisehg]
editor = geany
tabwidth = 8
shell = gnome-terminal
[auth]
sanoma.schemes = https
sanoma.prefix = hg.sanomaservices.nl
sanoma.username = m.scholten
aqs.schemes = ssh
aqs.prefix = aquariusoft.org
aqs.username = Michiel Scholten <michiel@aquariusoft.org>
+67 -44
View File
@@ -1,8 +1,7 @@
#!/bin/bash
# inspired by rrix' dotfiles
install_fish()
{
install_fish() {
touch ~/.dot/.dot_has_fish
mkdir -p "${HOME}/.config/fish/completions"
curl -sL get.fisherman.sh | fish
@@ -12,50 +11,59 @@ install_fish()
ln -s "${HOME}/workspace/application_addons/cli/tmuxinator/completion/mux.fish" "${HOME}/.config/fish/completions"
ln -s "${HOME}/workspace/application_addons/cli/tmuxinator/completion/tmuxinator.fish" "${HOME}/.config/fish/completions"
echo
echo "You might want to install Fisher:"
echo "Do you wish to install the Fisher plugin manager? This will do:"
echo "curl -sL https://git.io/fisher | source && fisher install jorgebucaran/fisher"
echo "fisher update"
echo
select yn in "Yes" "No"; do
case $yn in
Yes)
curl -sL https://git.io/fisher | source && fisher install jorgebucaran/fisher
fisher update
break
;;
No) break ;;
esac
done
}
make_link()
{
DIR="$1"
TARGET="$2"
cd || exit
echo $TARGET
if [ "$(readlink $TARGET)" = "$DIR/$TARGET" ]; then
echo " symlink exists and is fine, skipping"
return
elif [ -e $TARGET ] || [ -L $TARGET ] && [ "$(readlink $TARGET)" != "$DIR/$TARGET" ]; then
echo " exists, moving out of the way"
if [ ! -d "workspace/backup/dotfiles_$DATETIME" ]; then
mkdir -p "workspace/backup/dotfiles_$DATETIME"
fi
DIRNAME=$(dirname ${TARGET})
if [ "$DIRNAME" != "." ]; then
mkdir "workspace/backup/dotfiles_$DATETIME/$DIRNAME"
mv $TARGET "workspace/backup/dotfiles_$DATETIME/$DIRNAME"
#echo "workspace/backup/privdotfiles_$DATETIME/$DIRNAME"
else
mv $TARGET "workspace/backup/dotfiles_$DATETIME/"
#echo "workspace/backup/privdotfiles_$DATETIME/${TARGET}"
fi
fi
make_link() {
DIR="$1"
TARGET="$2"
cd || exit
echo $TARGET
if [ "$(readlink $TARGET)" = "$DIR/$TARGET" ]; then
echo " symlink exists and is fine, skipping"
return
elif [ -e $TARGET ] || [ -L $TARGET ] && [ "$(readlink $TARGET)" != "$DIR/$TARGET" ]; then
echo " exists, moving out of the way"
if [ ! -d "workspace/backup/dotfiles_$DATETIME" ]; then
mkdir -p "workspace/backup/dotfiles_$DATETIME"
fi
DIRNAME=$(dirname ${TARGET})
if [ "$DIRNAME" != "." ]; then
mkdir "workspace/backup/dotfiles_$DATETIME/$DIRNAME"
mv $TARGET "workspace/backup/dotfiles_$DATETIME/$DIRNAME"
#echo "workspace/backup/privdotfiles_$DATETIME/$DIRNAME"
else
mv $TARGET "workspace/backup/dotfiles_$DATETIME/"
#echo "workspace/backup/privdotfiles_$DATETIME/${TARGET}"
fi
fi
# If link is in a subdir, go there
DIRNAME=$(dirname ${TARGET})
if [ "$DIRNAME" != "." ]; then
cd "$DIRNAME" || exit
fi
# Create the symlink
ln -s "$DIR/$TARGET"
#echo "ln -s $DIR/$TARGET"
# If link is in a subdir, go there
DIRNAME=$(dirname ${TARGET})
if [ "$DIRNAME" != "." ]; then
cd "$DIRNAME" || exit
fi
# Create the symlink
ln -s "$DIR/$TARGET"
#echo "ln -s $DIR/$TARGET"
}
# Get the directory the dotfiles have been cloned into
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
echo "Installing from $DIR"
DATETIME=$(date +%Y%m%d_%H%M)
@@ -66,8 +74,7 @@ cd || exit
mkdir -p .config/direnv
# Symlink all the things
for TARGET in .bash_aliases .bashrc bin .gitconfig .gitignore_global .gitmodules .hgauthors.txt .hgignore .hgrc .ideavimrc .ignore .screenrc .terminfo .tmux.conf .vim .vimrc install.sh .config/direnv/direnvrc .config/nvim
do
for TARGET in .bash_aliases .bashrc bin .gitconfig .gitignore_global .gitmodules .ideavimrc .ignore .screenrc .terminfo .tmux.conf .vim .vimrc install.sh .config/direnv/direnvrc .config/nvim; do
make_link $DIR $TARGET
done
@@ -89,8 +96,14 @@ elif [ ! -e ~/.dot/.dot_no_fish ]; then
echo "Do you wish to install fish shell configuration?"
select yn in "Yes" "No"; do
case $yn in
Yes ) install_fish; break;;
No ) touch ~/.dot/.dot_no_fish; break;;
Yes)
install_fish
break
;;
No)
touch ~/.dot/.dot_no_fish
break
;;
esac
done
fi
@@ -99,8 +112,12 @@ echo
echo "Do you wish to install the starship prompt?"
select yn in "Yes" "No"; do
case $yn in
Yes ) make_link $DIR ".config/starship.toml"; curl -sS https://starship.rs/install.sh | sh; break;;
No ) break;;
Yes)
make_link $DIR ".config/starship.toml"
curl -sS https://starship.rs/install.sh | sh
break
;;
No) break ;;
esac
done
@@ -109,8 +126,14 @@ if [ ! -e ~/.dot_is_server ] && [ ! -e ~/.dot_no_server ]; then
echo "Is this machine a server?"
select yn in "Yes" "No"; do
case $yn in
Yes ) touch ~/.dot_is_server; break;;
No ) touch ~/.dot_no_server; break;;
Yes)
touch ~/.dot_is_server
break
;;
No)
touch ~/.dot_no_server
break
;;
esac
done
fi