From 7602e70ac45fb757acbc9c6e54af48828f6edbc9 Mon Sep 17 00:00:00 2001
From: self <george@gabbott.dev>
Date: Fri, 23 Sep 2022 22:54:47 +0100
Subject: Split out zshrc into several files for cleanliness

---
 setup.sh | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

(limited to 'setup.sh')

diff --git a/setup.sh b/setup.sh
index 8f96add..e5bc970 100755
--- a/setup.sh
+++ b/setup.sh
@@ -63,11 +63,11 @@ fi
 
 ####################################################################################
 ###################### Making some directories for later use #######################
-mkdir -p $HOME/.config
-mkdir -p $HOME/.config/zsh
-mkdir -p $HOME/.config/newsboat
-mkdir -p $HOME/.config/mpd
-mkdir -p $HOME/.config/ncmpcpp
+mkdir -p $XDG_CONFIG_HOME
+mkdir -p $XDG_CONFIG_HOME/zsh
+mkdir -p $XDG_CONFIG_HOME/newsboat
+mkdir -p $XDG_CONFIG_HOME/mpd
+mkdir -p $XDG_CONFIG_HOME/ncmpcpp
 mkdir -p $HOME/.local/share/dwm
 
 #####################################################################################
@@ -103,15 +103,19 @@ git clone git.sateoki.xyz/self/dmenu    ./inst
 sh ./scripts/udcmdlink                                                           #####
 
 ######################### Set up symlinks to dotfiles ################################
-ln -s $HOME/git/syscfg/dotfiles/zsh/.zshrc     $HOME/.config/zsh/.zshrc
-ln -s $HOME/git/syscfg/dotfiles/zsh/.zshrc-mk  $HOME/.config/zsh/.zshrc-mk
-ln -s $HOME/git/syscfg/dotfiles/zsh/.zshenv    $HOME/.zshenv
-ln -s $HOME/git/syscfg/dotfiles/.xinitrc       $HOME/.xinitrc
+ln -s $HOME/git/syscfg/dotfiles/zsh/.zshrc         $XDG_CONFIG_HOME/zsh/.zshrc
+ln -s $HOME/git/syscfg/dotfiles/zsh/.zshrc-mk      $XDG_CONFIG_HOME/zsh/.zshrc-mk
+ln -s $HOME/git/syscfg/dotfiles/zsh/.zshrc-fn      $XDG_CONFIG_HOME/zsh/.zshrc-fn
+ln -s $HOME/git/syscfg/dotfiles/zsh/.zshrc-git     $XDG_CONFIG_HOME/zsh/.zshrc-git
+ln -s $HOME/git/syscfg/dotfiles/zsh/.zshrc-abbrev  $XDG_CONFIG_HOME/zsh/.zshrc-abbrev
+ln -s $HOME/git/syscfg/dotfiles/zsh/.zshrc-xdg     $XDG_CONFIG_HOME/zsh/.zshrc-xdg
+ln -s $HOME/git/syscfg/dotfiles/zsh/.zshenv        $HOME/.zshenv
+ln -s $HOME/git/syscfg/dotfiles/.xinitrc           $HOME/.xinitrc
 
 # Music
-ln -s $HOME/git/syscfg/dotfiles/mpd.conf       $HOME/.config/mpd.conf
+ln -s $HOME/git/syscfg/dotfiles/mpd.conf       $XDG_CONFIG_HOME/mpd.conf
 ln -s $HOME/git/syscfg/dotfiles/mpd.conf       /etc/mpd.conf
-ln -s $HOME/git/syscfg/dotfiles/ncmpcpp-config $HOME/.config/ncmpcpp/config
+ln -s $HOME/git/syscfg/dotfiles/ncmpcpp-config $XDG_CONFIG_HOME/ncmpcpp/config
 
 # sddm - only install if MINIMAL="no" 
 
-- 
cgit v1.2.1