.

1 files changed, 28 insertions, 31 deletions

diff --git a/install.sh b/install.sh
index acbb0ba..532f357 100755
--- a/install.sh
+++ b/install.sh
@@ -6,12 +6,16 @@ symlink () {
     ln -sfT "$@"
 }
 
-DOTFILES_DIR=~/.dotfiles
-CONFIG_DIR=~/.config
-LOCAL_DIR=~/.local
-PICTURES_DIR=~/.pictures
-REPOS_DIR=~/repos
-VM_DIR=~/vm
+if [ ! -d "$HOME" ]; then
+    echo "invalid \$HOME"
+    exit 1
+fi
+
+DOTFILES_DIR=$HOME/.dotfiles
+CONFIG_DIR=$HOME/.config
+LOCAL_DIR=$HOME/.local
+PICTURES_DIR=$HOME/.pictures
+REPOS_DIR=$HOME/repos
 
 BIN_DIR=$LOCAL_DIR/bin
 OPT_DIR=$LOCAL_DIR/opt
@@ -27,6 +31,11 @@ mkdir -p $CONFIG_DIR \
 
 symlink $(cd $(dirname "$0"); pwd -P) $DOTFILES_DIR
 
+# aerc
+mkdir -p $CONFIG_DIR/aerc
+symlink $DOTFILES_DIR/aerc/aerc.conf $CONFIG_DIR/aerc/aerc.conf
+symlink $DOTFILES_DIR/aerc/binds.conf $CONFIG_DIR/aerc/binds.conf
+
 # alacritty
 symlink $DOTFILES_DIR/alacritty $CONFIG_DIR/alacritty
 
@@ -49,11 +58,11 @@ mkdir -p $CONFIG_DIR/cudatext/settings
 symlink $DOTFILES_DIR/cudatext/user.json $CONFIG_DIR/cudatext/settings/user.json
 
 # drawio
-if [ -f /usr/share/applications/drawio.desktop ]; then
+if [ -f /usr/share/applications/draw.io.desktop ]; then
     symlink $DOTFILES_DIR/drawio/drawio $BIN_DIR/drawio
-    cp /usr/share/applications/drawio.desktop $APP_DIR
+    cp /usr/share/applications/draw.io.desktop $APP_DIR
     sed -i "s/^Exec=\\S*/Exec=$(cd $LOCAL_DIR; pwd | sed 's/\//\\\//g')\\/bin\\/drawio/g" \
-        $APP_DIR/drawio.desktop
+        $APP_DIR/draw.io.desktop
 fi
 
 # dunst
@@ -66,7 +75,7 @@ symlink $DOTFILES_DIR/fontconfig $CONFIG_DIR/fontconfig
 symlink $DOTFILES_DIR/foot $CONFIG_DIR/foot
 
 # git
-symlink $DOTFILES_DIR/git/.gitconfig ~/.gitconfig
+symlink $DOTFILES_DIR/git/.gitconfig $HOME/.gitconfig
 
 # i3
 symlink $DOTFILES_DIR/i3 $CONFIG_DIR/i3
@@ -116,6 +125,7 @@ symlink $DOTFILES_DIR/ranger $CONFIG_DIR/ranger
 
 # river
 symlink $DOTFILES_DIR/river $CONFIG_DIR/river
+symlink $DOTFILES_DIR/river/run-river.sh $BIN_DIR/run-river
 
 # rofi
 symlink $DOTFILES_DIR/rofi $CONFIG_DIR/rofi
@@ -124,18 +134,18 @@ symlink $DOTFILES_DIR/rofi $CONFIG_DIR/rofi
 symlink $DOTFILES_DIR/setkbmap/setkbmap $BIN_DIR/setkbmap
 
 # shell
-symlink $DOTFILES_DIR/shell/.profile ~/.profile
+symlink $DOTFILES_DIR/shell/.profile $HOME/.profile
 
 # shell - bash
-symlink $DOTFILES_DIR/shell/bash/.bashrc ~/.bashrc
-symlink ~/.profile ~/.bash_profile
+symlink $DOTFILES_DIR/shell/bash/.bashrc $HOME/.bashrc
+symlink $HOME/.profile $HOME/.bash_profile
 
 # shell - fish
 symlink $DOTFILES_DIR/shell/fish $CONFIG_DIR/fish
 
 # shell - zsh
-symlink $DOTFILES_DIR/shell/zsh/.zshrc ~/.zshrc
-symlink ~/.profile ~/.zprofile
+symlink $DOTFILES_DIR/shell/zsh/.zshrc $HOME/.zshrc
+symlink $HOME/.profile $HOME/.zprofile
 
 # sublime-text
 mkdir -p $CONFIG_DIR/sublime-text/Packages/User
@@ -158,20 +168,7 @@ symlink $DOTFILES_DIR/sway/run-sway.sh $BIN_DIR/run-sway
 symlink $DOTFILES_DIR/tmux $CONFIG_DIR/tmux
 
 # vm
-mkdir -p $VM_DIR/alpine/armv7
-mkdir -p $VM_DIR/alpine/x86_64
-mkdir -p $VM_DIR/archlinux/armv7
-mkdir -p $VM_DIR/debian/armv7
-mkdir -p $VM_DIR/netbsd
-mkdir -p $VM_DIR/openbsd
-mkdir -p $VM_DIR/win11
-symlink $DOTFILES_DIR/vm/alpine/x86_64/run.sh $VM_DIR/alpine/x86_64/run.sh
-symlink $DOTFILES_DIR/vm/alpine/armv7/run.sh $VM_DIR/alpine/armv7/run.sh
-symlink $DOTFILES_DIR/vm/archlinux/armv7/run.sh $VM_DIR/archlinux/armv7/run.sh
-symlink $DOTFILES_DIR/vm/debian/armv7/run.sh $VM_DIR/debian/armv7/run.sh
-symlink $DOTFILES_DIR/vm/netbsd/run.sh $VM_DIR/netbsd/run.sh
-symlink $DOTFILES_DIR/vm/openbsd/run.sh $VM_DIR/openbsd/run.sh
-symlink $DOTFILES_DIR/vm/win11/run.sh $VM_DIR/win11/run.sh
+symlink $DOTFILES_DIR/vm/run.sh $BIN_DIR/vm
 
 # nvim
 mkdir -p $CONFIG_DIR/nvim
@@ -181,7 +178,7 @@ symlink $DOTFILES_DIR/nvim/init.lua $CONFIG_DIR/nvim/init.lua
 symlink $DOTFILES_DIR/waybar $CONFIG_DIR/waybar
 
 # xorg
-symlink $DOTFILES_DIR/xorg/.xinitrc ~/.xinitrc
-symlink $DOTFILES_DIR/xorg/.Xresources ~/.Xresources
+symlink $DOTFILES_DIR/xorg/.xinitrc $HOME/.xinitrc
+symlink $DOTFILES_DIR/xorg/.Xresources $HOME/.Xresources
 symlink $DOTFILES_DIR/xorg/loadxresources $BIN_DIR/loadxresources
 symlink $DOTFILES_DIR/xorg/setwallpaper $BIN_DIR/setwallpaper