From c444a8eea1816cd4d608cb18e31f33b06745490a Mon Sep 17 00:00:00 2001
From: EuAndreh <eu@euandre.org>
Date: Mon, 28 Mar 2022 09:08:04 -0300
Subject: sh/symlinks.sh: Move all directory creations to the top, cleanup and
 do better grouping

---
 sh/symlinks.sh | 76 ++++++++++++++++++++++------------------------------------
 1 file changed, 29 insertions(+), 47 deletions(-)

diff --git a/sh/symlinks.sh b/sh/symlinks.sh
index 21bc63c1..4f95a64e 100644
--- a/sh/symlinks.sh
+++ b/sh/symlinks.sh
@@ -1,65 +1,47 @@
 #!/bin/sh
 
+mkdir -p \
+	~/Downloads/Screenshots/ ~/.local/share/common-lisp ~/tmp/ ~/.gnupg \
+	~/.xmonad ~/.config/ranger/ ~/.config/guix                          \
+	~/.config/khal ~/.config/khard
+
+if [ ! -e ~/tmp/scratch.txt ]; then
+	touch ~/tmp/scratch.txt
+fi
+
+ln -fs ~/dev/libre ~/common-lisp &&
+	rm -f  ~/dev/libre/libre
+ln -fs ~/dev/others/password-store ~/.password-store &&
+	rm -f  ~/dev/others/password-store/password-store
+
+# FIXME: guix shell --check complains about this
 ln -fs "$DOTFILES/sh/bashrc.sh"                 ~/.bashrc
 ln -fs "$DOTFILES/sh/bash_profile.sh"           ~/.bash_login
 ln -fs "$DOTFILES/sh/bash_profile.sh"           ~/.bash_profile
-ln -fs "$DOTFILES/git/gitattributes"            ~/.gitattributes
-ln -fs "$DOTFILES/git/gitignore"                ~/.gitignore_global
-ln -fs "$DOTFILES/git/gitconfig.ini"            ~/.gitconfig
-ln -fs "$DOTFILES/sbclrc.lisp"                  ~/.sbclrc
+ln -fs "$HOME/annex/bin/misc/nurc.sh"           ~/.nurc
 ln -fs "$DOTFILES/inputrc.conf"                 ~/.inputrc
 ln -fs "$DOTFILES/Xmodmap.conf"                 ~/.Xmodmap
-ln -fs "$DOTFILES/npmrc.sh"                     ~/.npmrc
-ln -fs "$DOTFILES/mailcap.conf"                 ~/.mailcap
 
-mkdir -p ~/Downloads/Screenshots/
-
-mkdir -p ~/.local/share/common-lisp
-[ ! -e ~/.local/share/common-lisp/source ] && ln -fs ~/dev/libre ~/.local/share/common-lisp/source
-
-mkdir -p ~/tmp/
-touch ~/tmp/scratch.txt
-touch /tmp/fp.euandreh.log
+ln -fs "$DOTFILES/vcs/hgrc.ini"                 ~/.hgrc
+ln -fs "$DOTFILES/vcs/gitconfig.ini"            ~/.gitconfig
+ln -fs "$HOME/annex/bin/misc/git/mrconfig.ini"  ~/.mrconfig
 
-mkdir -p ~/.gnupg
 ln -fs "$DOTFILES/gpg/gpg.conf"                 ~/.gnupg/gpg.conf
 ln -fs "$DOTFILES/gpg/gpg-agent.conf"           ~/.gnupg/gpg-agent.conf
 ln -fs "$DOTFILES/gpg/sshcontrol"               ~/.gnupg/sshcontrol
-ln -fs "$DOTFILES/../servers/ssh.conf"          ~/.ssh/config
-ln -fs "$HOME/annex/bin/misc/git/mrconfig.ini"  ~/.mrconfig
-
-mkdir -p ~/.newsboat
-ln -fs "${HOME}/annex/bin/misc/atom/newsboat-urls.txt" ~/.newsboat/urls
-
-## tmux
-ln -fs "$DOTFILES/tmux.conf"                    ~/.tmux.conf
+ln -fs "$DOTFILES/ssh.conf"                     ~/.ssh/config
 
-## vi
-ln -fs "$DOTFILES/exrc.conf"                    ~/.exrc
-
-## xmonad
-mkdir -p ~/.xmonad
 ln -fs "$DOTFILES/xmonad/xsession.sh"           ~/.xsession
 ln -fs "$DOTFILES/xmonad/xmonad.hs"             ~/.xmonad/xmonad.hs
 ln -fs "$DOTFILES/xmonad/xmobar.hs"             ~/.xmobarrc
 
-## Mercurial
-ln -fs "${DOTFILES}/hgrc.ini"                   ~/.hgrc
-
-## ranger
-mkdir -p ~/.config/ranger/
-ln -fs "${DOTFILES}/ranger.conf"                ~/.config/ranger/rc.conf
-
-## nu
-ln -fs "$HOME/annex/bin/misc/nurc.sh"           ~/.nurc
-
-## Guix
-mkdir -p ~/.config/guix
+ln -fs "$DOTFILES/npmrc.sh"                     ~/.npmrc
+ln -fs "$DOTFILES/mailcap.conf"                 ~/.mailcap
+ln -fs "$DOTFILES/tmux.conf"                    ~/.tmux.conf
+ln -fs "$DOTFILES/exrc.conf"                    ~/.exrc
+ln -fs "$DOTFILES/ranger.conf"                  ~/.config/ranger/rc.conf
+ln -fs "$DOTFILES/infokey"                      ~/.infokey
+ln -fs "$DOTFILES/sbclrc.lisp"                  ~/.sbclrc
 ln -fs "$DOTFILES/guix/channels.scm"            ~/.config/guix/channels.scm
-
-## pimutils
-mkdir -p ~/.config/vdirsyncer/ ~/.config/khal
-ln -fs "$HOME/annex/bin/misc/pimutils/vdirsyncer.conf" ~/.config/vdirsyncer/config
-ln -fs "$HOME/annex/bin/misc/pimutils/khal.conf"       ~/.config/khal/config
-
-ln -fs "$DOTFILES/infokey" ~/.infokey
+ln -fs "$HOME/annex/bin/misc/khard.conf" ~/.config/khard/khard.conf
+ln -fs "$HOME/annex/bin/misc/khal.conf"  ~/.config/khal/config
-- 
cgit v1.3