Simplify installation

1 files changed, 20 insertions, 110 deletions

diff --git a/install b/install
index 38a6332..d60b7cb 100755
--- a/install
+++ b/install
@@ -1,124 +1,34 @@
 #!/usr/bin/env sh
 
-echo "Installing essential software"
-
-./provision essential
+if [[ "$1" == "--skip-provisioning" ]]; then
+  echo "[1/4] Skipping essential software."
+else
+  echo "[1/4] Installing essential software."
+  ./provision essential
+fi
 
-echo "Updating submodules"
+echo "[2/4] Updating submodules"
 
 git submodule update --init --recursive
 
-echo "Linking runcoms"
-
-# hush login
-ln -fns .dotfiles/hushlogin ~/.hushlogin
-
-# zsh runcoms
-ln -fns .dotfiles/runcoms/zshrc ~/.zshrc
-ln -fns .dotfiles/runcoms/zshenv ~/.zshenv
-ln -fns .dotfiles/runcoms/zprofile ~/.zprofile
-ln -fns .dotfiles/runcoms/zlogout ~/.zlogout
-ln -fns .dotfiles/runcoms/zlogin ~/.zlogin
-
-# TMUX
-ln -fns .dotfiles/tmux.conf ~/.tmux.conf
-
-# Nethack
-ln -fns .dotfiles/nethackrc ~/.nethackrc
-
-# Git
-ln -fns .dotfiles/gitconfig ~/.gitconfig
-
-# ripgrep
-ln -fns .dotfiles/rgignore ~/.rgignore
+echo "[3/4] Linking Files"
 
-# yabai
-ln -fns .dotfiles/yabairc ~/.yabairc
+# Link files that go directly in home
+for d in home/* ; do
+    name=${d#home/}
+    ln -fns .dotfiles/$d ~/.$name
+done
 
-# skhdc
-ln -fns .dotfiles/skhdrc ~/.skhdrc
-
-# tmuxp
-ln -fns .dotfiles/tmuxp ~/.tmuxp
-
-# plan
-ln -fns .dotfiles/plan ~/.plan
-
-# config dir
+# Link files that go in ~/.config
 mkdir -p ~/.config
-
-# kitty
-ln -fns ../.dotfiles/config/kitty ~/.config/kitty
-
-# ghostty
-ln -fns ../.dotfiles/config/ghostty ~/.config/ghostty
-
-# nvim
-ln -fns ../.dotfiles/config/nvim ~/.config/nvim
-
-# karabiner
-ln -fns ../.dotfiles/config/karabiner ~/.config/karabiner
-
-# sway
-ln -fns ../.dotfiles/config/sway ~/.config/sway
-
-# qutebrowser
-ln -fns ../.dotfiles/config/qutebrowser ~/.config/qutebrowser
-
-# aerc
-ln -fns ../.dotfiles/config/aerc ~/.config/aerc
-
-# emacs
-ln -fns ../.dotfiles/config/emacs ~/.config/emacs
-
-# fuzzel
-ln -fns ../.dotfiles/config/fuzzel ~/.config/fuzzel
-#
-# wofi
-ln -fns ../.dotfiles/config/wofi ~/.config/wofi
-
-# mako
-ln -fns ../.dotfiles/config/mako ~/.config/mako
-
-# niri
-ln -fns ../.dotfiles/config/niri ~/.config/niri
-
-# swaylock
-ln -fns ../.dotfiles/config/swaylock ~/.config/swaylock
-
-# waybar
-ln -fns ../.dotfiles/config/waybar ~/.config/waybar
-
-# mpd
-ln -fns ../.dotfiles/config/mpd ~/.config/mpd
-
-# ncmpcpp
-ln -fns ../.dotfiles/config/ncmpcpp ~/.config/ncmpcpp
-
-# weechat
-ln -fns ../.dotfiles/config/weechat ~/.config/weechat
-
-# wpaperd
-ln -fns ../.dotfiles/config/wpaperd ~/.config/wpaperd
-
-# btop
-ln -fns ../.dotfiles/config/btop ~/.config/btop
-
-# task
-ln -fns ../.dotfiles/config/task ~/.config/task
-
-# wob
-ln -fns ../.dotfiles/config/wob ~/.config/wob
-
-# vdirsyncer
-ln -fns ../.dotfiles/config/vdirsyncer ~/.config/vdirsyncer
-
-# age recipients
-ln -fns .dotfiles/age-recipients ~/.age-recipients
+for d in config/* ; do
+    name=${d#config/}
+    ln -fns ../.dotfiles/$d ~/.config/$name
+done
 
 touch ~/.tool-versions
 
-echo "Setting up password store"
+echo "[4/4] Setting up password store"
 mkdir -p ~/.passage
 if [ ! -d "$HOME/.passage" ]; then
   echo ">>> Cloning."
@@ -127,4 +37,4 @@ else
   echo ">>> Already exists."
 fi
 
-echo "Sensitive files have not been decrypted. Run ./sensitive to decrypt."
+echo "ACHTUNG! Sensitive files have not been decrypted. Run ./sensitive to decrypt."