refactor: moved scripts into wsl package

7 files changed, 8 insertions, 14 deletions

diff --git a/makefile b/makefile
index b45f1ba..d2d53fe 100644
--- a/makefile
+++ b/makefile
@@ -36,6 +36,7 @@ gpg: # Install GPG keys
 	gpg --import-ownertrust $(HOME)/.gnupg/trustfile.txt
 
 wsl: # Run WSL install script
+	stow wsl
 	./wsl/install.sh
 
 cargo rust: $(ZSH_COMP_DIR) $(BASH_COMP_DIR) # Install rust
diff --git a/sheldon/.config/sheldon/plugins.toml b/sheldon/.config/sheldon/plugins.toml
index 9fe3a2c..75b23e2 100644
--- a/sheldon/.config/sheldon/plugins.toml
+++ b/sheldon/.config/sheldon/plugins.toml
@@ -4,7 +4,6 @@
 github = 'romkatv/zsh-defer'
 
 [templates]
-disable = ""
 defer = { value = 'zsh-defer source "{{ file }}"', each = true }
 comp = { value = 'mkdir -p "$XDG_DATA_HOME/zsh/site-functions"; ln -sf "{{ file }}" "$XDG_DATA_HOME/zsh/site-functions/_{{ name }}"', each = true }
 
@@ -16,10 +15,6 @@ apply = ["defer"]
 github = "zsh-users/zsh-syntax-highlighting"
 apply = ["defer"]
 
-[plugins.zsh-vi-mode]
-github = "jeffreytse/zsh-vi-mode"
-apply = ["disable"]
-
 [plugins.zsh-shift-select]
 github = "jirutka/zsh-shift-select"
 apply = ["defer"]
diff --git a/scripts/.local/bin/discord-relay.sh b/wsl/.local/bin/discord-relay.sh
index 3932908..3932908 100755
--- a/scripts/.local/bin/discord-relay.sh
+++ b/wsl/.local/bin/discord-relay.sh
diff --git a/scripts/.local/bin/gpg-test.sh b/wsl/.local/bin/gpg-test.sh
index f23b83d..f23b83d 100644
--- a/scripts/.local/bin/gpg-test.sh
+++ b/wsl/.local/bin/gpg-test.sh
diff --git a/scripts/.local/bin/mkln.sh b/wsl/.local/bin/mkln.sh
index ef174c2..ef174c2 100755
--- a/scripts/.local/bin/mkln.sh
+++ b/wsl/.local/bin/mkln.sh
diff --git a/scripts/.local/bin/socket-relay.sh b/wsl/.local/bin/socket-relay.sh
index 436fa54..436fa54 100755
--- a/scripts/.local/bin/socket-relay.sh
+++ b/wsl/.local/bin/socket-relay.sh
diff --git a/wsl/install.sh b/wsl/install.sh
index b60fbff..fd1be7c 100755
--- a/wsl/install.sh
+++ b/wsl/install.sh
@@ -4,8 +4,6 @@ DOTFILES="${HOME}/.dotfiles"
 
 WINHOME="$(wslpath c:\\Users\\"${USER}")"
 
-mkln="${DOTFILES}/scripts/.scripts/mkln.sh -f"
-
 echo "Setting up WSL"
 
 # link WINHOME
@@ -16,13 +14,13 @@ sed -r 's|(RemoteForward\s+.+\s+)\/home\/tobyv\/\.gnupg\/S\.gpg-agent\.extra|\11
 sed '/Control/d' >"${WINHOME}/.ssh/config"
 
 # Create windows symlinks to dotfiles
-$mkln "$@" "${DOTFILES}"/git/.gitconfig "${WINHOME}"/.gitconfig
-$mkln "$@" "${DOTFILES}"/gnupg/.gnupg/gpg.conf "${WINHOME}"/AppData/Roaming/gnupg/gpg.conf
-$mkln "$@" "${DOTFILES}"/gnupg/.gnupg/gpg-agent.conf "${WINHOME}"/AppData/Roaming/gnupg/gpg-agent.conf
-$mkln "$@" "${DOTFILES}"/gnupg/.gnupg/scdaemon.conf "${WINHOME}"/AppData/Roaming/gnupg/scdaemon.conf
-$mkln "$@" "${DOTFILES}"/alacritty/.config/alacritty "${WINHOME}"/AppData/Roaming/alacritty
-$mkln "$@" "${DOTFILES}"/wsl/install/wt.json "${WINHOME}"/AppData/Local/Packages/Microsoft.WindowsTerminalPreview_8wekyb3d8bbwe/LocalState/settings.json
-$mkln "$@" "${DOTFILES}"/wsl/install/winget.json "${WINHOME}"/AppData/Local/Packages/Microsoft.DesktopAppInstaller_8wekyb3d8bbwe/LocalState/settings.json
+mkln.sh -f "$@" "${DOTFILES}"/git/.gitconfig "${WINHOME}"/.gitconfig
+mkln.sh -f "$@" "${DOTFILES}"/gnupg/.gnupg/gpg.conf "${WINHOME}"/AppData/Roaming/gnupg/gpg.conf
+mkln.sh -f "$@" "${DOTFILES}"/gnupg/.gnupg/gpg-agent.conf "${WINHOME}"/AppData/Roaming/gnupg/gpg-agent.conf
+mkln.sh -f "$@" "${DOTFILES}"/gnupg/.gnupg/scdaemon.conf "${WINHOME}"/AppData/Roaming/gnupg/scdaemon.conf
+mkln.sh -f "$@" "${DOTFILES}"/alacritty/.config/alacritty "${WINHOME}"/AppData/Roaming/alacritty
+mkln.sh -f "$@" "${DOTFILES}"/wsl/install/wt.json "${WINHOME}"/AppData/Local/Packages/Microsoft.WindowsTerminalPreview_8wekyb3d8bbwe/LocalState/settings.json
+mkln.sh -f "$@" "${DOTFILES}"/wsl/install/winget.json "${WINHOME}"/AppData/Local/Packages/Microsoft.DesktopAppInstaller_8wekyb3d8bbwe/LocalState/settings.json
 
 # install xclip/xsel
 curl -sL "https://raw.githubusercontent.com/Konfekt/win-bash-xclip-xsel/master/clip.sh" >"${HOME}/.local/bin/xclip"