From 68f5c77e559d720cdadc3d28041e917cb3ae145c Mon Sep 17 00:00:00 2001
From: Shun Git <kwokshungit@gmail.com>
Date: Sat, 15 Jul 2023 12:56:23 +0800
Subject: [PATCH] update install method

---
 README.md            | 22 +++++++++-------------
 gitconfig            |  3 +--
 gitignore            |  1 +
 tools/install.sh     |  5 +----
 tools/install_osx.sh |  7 -------
 tools/locations      |  1 +
 zshrc                | 14 ++------------
 7 files changed, 15 insertions(+), 38 deletions(-)
 delete mode 100755 tools/install_osx.sh

diff --git a/README.md b/README.md
index 6433b6e..50a9af6 100644
--- a/README.md
+++ b/README.md
@@ -4,22 +4,18 @@ Configuration files for `zsh`, `tmux`, `vim` and many other things
 very loosely based on [The Text Triumvirate](https://web.archive.org/web/20200414221857/https://www.drbunsen.org/the-text-triumvirate/)
 
 ## Installing
-1) Install `zsh`, `tmux` and `vim`
-```shell
+
+```sh
+# install `zsh`, `tmux` and `vim`
 sudo apt purge vim-tiny*
 sudo apt install zsh tmux vim
-```
-2) Install [oh-my-zsh](https://github.com/robbyrussell/oh-my-zsh/)
-```shell
+
+# install oh-my-zsh (https://github.com/robbyrussell/oh-my-zsh/)
 sh -c "$(curl -fsSL https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh)"
-```
-3) Install `.dotfiles`
-```shell
-git clone --recursive https://github.com/randName/dotfiles .dotfiles
-cd .dotfiles && tools/install.sh
-```
 
-### Terminal Settings (Fonts, Colours)
-The `vim` statusbar uses [Powerline fonts](https://github.com/powerline/fonts)
+# install .dotfiles
+git clone --depth 1 --recursive https://github.com/randName/dotfiles .dotfiles
+.dotfiles/tools/install.sh
+```
 
 refer to [the wiki](https://github.com/randName/dotfiles/wiki) for more setup instructions
diff --git a/gitconfig b/gitconfig
index d0cd9ba..c893b79 100644
--- a/gitconfig
+++ b/gitconfig
@@ -1,7 +1,6 @@
 [user]
 	name = Shun Git
-	email = kwokshungit@gmail.com
-	signingkey = 2A8E70EDA1631F2B
+	email = noreply@randna.me
 [github]
 	user = randname
 [alias]
diff --git a/gitignore b/gitignore
index e1faf36..116bdfa 100644
--- a/gitignore
+++ b/gitignore
@@ -1,6 +1,7 @@
 tags
 .tags
 .nvmrc
+node_modules/
 
 surge.sh
 
diff --git a/tools/install.sh b/tools/install.sh
index 074561a..673628e 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -1,10 +1,7 @@
 #!/bin/sh
 
 # Symlink to default locations
-for fn in $(cat tools/locations); do
+for fn in $(cat $(dirname $0)/locations); do
 	[ -z "$fn" ] && continue
 	ln -vs --backup=existing $PWD/$fn $HOME/.$fn
 done
-
-# Generate .less
-lesskey lesskey
diff --git a/tools/install_osx.sh b/tools/install_osx.sh
deleted file mode 100755
index 18483a8..0000000
--- a/tools/install_osx.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-# Symlink to default locations
-for fn in $(cat tools/locations); do
-	[ -z "$fn" ] && continue
-	ln -vsi $PWD/$fn $HOME/.$fn
-done
diff --git a/tools/locations b/tools/locations
index 8432d3b..abd7fce 100644
--- a/tools/locations
+++ b/tools/locations
@@ -1,6 +1,7 @@
 zshenv
 zshrc
 vimrc
+lesskey
 tmux.conf
 
 gitconfig
diff --git a/zshrc b/zshrc
index 50e0662..1238610 100644
--- a/zshrc
+++ b/zshrc
@@ -15,12 +15,7 @@ source $ZSH/oh-my-zsh.sh
 autoload -U promptinit; promptinit
 prompt pure
 
-# machine-local configuration
-[ -f $HOME/.zshlocal ] && source $HOME/.zshlocal
-
 # User configuration
-export LANG='en_SG.utf8'
-
 export TZ='Asia/Singapore'
 
 bindkey -v
@@ -35,10 +30,5 @@ bindkey -r '^L'
 
 setopt AUTO_CD
 
-# stuff that needs to be near the end
-
-if [ -d $HOME/.pyenv ]; then
-	export PATH=$HOME/.pyenv/bin:$PATH
-	eval "$(pyenv init -)"
-	eval "$(pyenv virtualenv-init -)"
-fi
+# machine-local configuration
+[ -f $HOME/.zshlocal ] && source $HOME/.zshlocal