From 1058f95f24fa984363531f7d6d106285574397ac Mon Sep 17 00:00:00 2001 From: Toby Vincent Date: Tue, 29 Mar 2022 17:04:37 -0500 Subject: refactor: moved wsl install to normal script --- .stowrc | 4 +- makefile | 2 +- wsl/.local/bin/wsl-installer.sh | 42 +++++ wsl/install.sh | 44 ----- wsl/install/winget.json | 28 --- wsl/install/wt.json | 389 ---------------------------------------- 6 files changed, 44 insertions(+), 465 deletions(-) create mode 100755 wsl/.local/bin/wsl-installer.sh delete mode 100755 wsl/install.sh delete mode 100755 wsl/install/winget.json delete mode 100644 wsl/install/wt.json diff --git a/.stowrc b/.stowrc index 7dd796c..5d35626 100644 --- a/.stowrc +++ b/.stowrc @@ -1,6 +1,4 @@ --verbose --dotfiles --no-folding ---target=$HOME ---ignore=install ---ignore=install.sh \ No newline at end of file +--target=$HOME \ No newline at end of file diff --git a/makefile b/makefile index d2d53fe..7ea14b0 100644 --- a/makefile +++ b/makefile @@ -37,7 +37,7 @@ gpg: # Install GPG keys wsl: # Run WSL install script stow wsl - ./wsl/install.sh + ./wsl/.local/bin/wsl-installer.sh cargo rust: $(ZSH_COMP_DIR) $(BASH_COMP_DIR) # Install rust curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --no-modify-path diff --git a/wsl/.local/bin/wsl-installer.sh b/wsl/.local/bin/wsl-installer.sh new file mode 100755 index 0000000..b71c4f4 --- /dev/null +++ b/wsl/.local/bin/wsl-installer.sh @@ -0,0 +1,42 @@ +#!/usr/bin/env bash + +DOTFILES="${HOME}/.dotfiles" + +WINHOME="$(wslpath c:\\Users\\"${USER}")" + +echo "Setting up WSL" + +# link WINHOME +ln -sfn "$WINHOME" ~/win + +# ssh-config +sed -r 's|(RemoteForward\s+.+\s+)\/home\/tobyv\/\.gnupg\/S\.gpg-agent\.extra|\1127.0.0.1:4321|' "${DOTFILES}"/ssh/.ssh/config | +sed '/Control/d' >"${WINHOME}/.ssh/config" + +# Create windows symlinks to dotfiles +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 + +# install xclip/xsel +curl -sL "https://raw.githubusercontent.com/Konfekt/win-bash-xclip-xsel/master/clip.sh" >"${HOME}/.local/bin/xclip" +curl -sL "https://raw.githubusercontent.com/Konfekt/win-bash-xclip-xsel/master/clip.sh" >"${HOME}/.local/bin/xsel" +chmod +x "${HOME}/.local/bin/xclip" +chmod +x "${HOME}/.local/bin/xsel" + +# install hotkeys.exe +install_dir="${WINHOME}/AppData/Local/Programs/hotkeys" +mkdir -p "${install_dir}" +rm -f "${install_dir}/hotkeys.exe" +curl -sL "https://github.com/tobyvin/hotkeys/releases/latest/download/hotkeys.exe" >"${install_dir}/hotkeys.exe" + +# https://github.com/wslutilities/wslu +command -v wslview &>/dev/null || cat <<-EOF + wslu is not installed. + wslu (wslview) is needed to open browser windows from linux commands. + install instructions: https://github.com/wslutilities/wslu#installation +EOF + +echo "WSL has been set up" diff --git a/wsl/install.sh b/wsl/install.sh deleted file mode 100755 index fd1be7c..0000000 --- a/wsl/install.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/usr/bin/env bash - -DOTFILES="${HOME}/.dotfiles" - -WINHOME="$(wslpath c:\\Users\\"${USER}")" - -echo "Setting up WSL" - -# link WINHOME -ln -sfn "$WINHOME" ~/win - -# ssh-config -sed -r 's|(RemoteForward\s+.+\s+)\/home\/tobyv\/\.gnupg\/S\.gpg-agent\.extra|\1127.0.0.1:4321|' "${DOTFILES}"/ssh/.ssh/config | -sed '/Control/d' >"${WINHOME}/.ssh/config" - -# Create windows symlinks to dotfiles -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" -curl -sL "https://raw.githubusercontent.com/Konfekt/win-bash-xclip-xsel/master/clip.sh" >"${HOME}/.local/bin/xsel" -chmod +x "${HOME}/.local/bin/xclip" -chmod +x "${HOME}/.local/bin/xsel" - -# install hotkeys.exe -install_dir="${WINHOME}/AppData/Local/Programs/hotkeys" -mkdir -p "${install_dir}" -rm -f "${install_dir}/hotkeys.exe" -curl -sL "https://github.com/tobyvin/hotkeys/releases/latest/download/hotkeys.exe" >"${install_dir}/hotkeys.exe" - -# https://github.com/wslutilities/wslu -command -v wslview &>/dev/null || cat <<-EOF - wslu is not installed. - wslu (wslview) is needed to open browser windows from linux commands. - install instructions: https://github.com/wslutilities/wslu#installation -EOF - -echo "WSL has been set up" diff --git a/wsl/install/winget.json b/wsl/install/winget.json deleted file mode 100755 index b583c03..0000000 --- a/wsl/install/winget.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "$schema": "https://aka.ms/winget-settings.schema.json", - "source": { - "autoUpdateIntervalInMinutes": 5 - }, - "visual": { - "progressBar": "accent" - }, - "installBehavior": { - "preferences": { - "scope": "user", - "locale": [ - "en-US" - ] - } - }, - "network": { - "downloader": "do", - "doProgressTimeoutInSeconds": 60 - }, - "telemetry": { - "disable": true - }, - "experimentalFeatures": { - "dependencies": true, - "directMSI": true - } -} \ No newline at end of file diff --git a/wsl/install/wt.json b/wsl/install/wt.json deleted file mode 100644 index ff53422..0000000 --- a/wsl/install/wt.json +++ /dev/null @@ -1,389 +0,0 @@ -{ - "$help": "https://aka.ms/terminal-documentation", - "$schema": "https://aka.ms/terminal-profiles-schema", - "actions": - [ - { - "command": - { - "action": "closeTab" - }, - "keys": "ctrl+w" - }, - { - "command": - { - "action": "openSettings", - "target": "settingsUI" - }, - "keys": "ctrl+comma" - }, - { - "command": - { - "action": "openSettings" - }, - "keys": "ctrl+shift+comma" - }, - { - "command": "paste", - "keys": "ctrl+v" - }, - { - "command": - { - "action": "openSettings", - "target": "defaultsFile" - }, - "keys": "ctrl+alt+comma" - }, - { - "command": - { - "action": "newTab", - "profile": "btm" - }, - "keys": "alt+`" - }, - { - "command": "unbound", - "keys": "ctrl+f" - }, - { - "command": "unbound", - "keys": "ctrl+t" - }, - { - "command": - { - "action": "commandPalette" - }, - "keys": "f1" - } - ], - "alwaysShowNotificationIcon": true, - "confirmCloseAllTabs": false, - "defaultProfile": "{574e775e-4f2a-5b96-ac1e-a2962a402336}", - "disabledProfileSources": - [ - "Windows.Terminal.Azure" - ], - "experimental.rendering.forceFullRepaint": true, - "initialCols": 100, - "initialRows": 30, - "multiLinePasteWarning": false, - "profiles": - { - "defaults": - { - "bellStyle": - [ - "window", - "taskbar" - ], - "closeOnExit": "always", - "colorScheme": "vscode-dark", - "cursorColor": "#D4D4D4", - "cursorShape": "filledBox", - "font": - { - "face": "FiraCode NF", - "size": 11 - }, - "padding": "8", - "useAcrylic": true - }, - "list": - [ - { - "guid": "{58ad8b0c-3ef8-5f4d-bc6f-13e4c00f2530}", - "hidden": false, - "icon": "ms-appx:///ProfileIcons/{9acb9455-ca41-5af7-950f-6bca1bc9722f}.png", - "name": "Debian", - "source": "Windows.Terminal.Wsl" - }, - { - "commandline": "ssh heimdall", - "guid": "{a66d99ed-52b1-4302-9aac-b1b95d81a051}", - "icon": "ms-appx:///ProfileIcons/{9acb9455-ca41-5af7-950f-6bca1bc9722f}.png", - "name": "Heimdall" - }, - { - "commandline": "ssh loki", - "guid": "{1dd1a300-37b9-4aff-b7e3-8b029ca796a9}", - "icon": "ms-appx:///ProfileIcons/{9acb9455-ca41-5af7-950f-6bca1bc9722f}.png", - "name": "Loki" - }, - { - "commandline": "C:\\Users\\tobyv\\.ssh\\wsl-ssh.bat door", - "guid": "{2d87a771-a5dd-44d5-b32d-ce8688b41f7c}", - "hidden": false, - "icon": "ms-appx:///ProfileIcons/{9acb9455-ca41-5af7-950f-6bca1bc9722f}.png", - "name": "Door" - }, - { - "guid": "{574e775e-4f2a-5b96-ac1e-a2962a402336}", - "hidden": false, - "name": "PowerShell", - "source": "Windows.Terminal.PowershellCore" - }, - { - "commandline": "btm", - "guid": "{1a3bcafa-ff3b-46ba-bdf4-582e99ec9dfc}", - "hidden": false, - "name": "btm" - }, - { - "guid": "{b154058b-47bb-56d5-a1b0-06d98908dfa2}", - "hidden": false, - "name": "Developer Command Prompt for VS 2019 (2)", - "source": "Windows.Terminal.VisualStudio" - }, - { - "guid": "{f1a99e78-5690-5e40-b3ff-55031ae2cce5}", - "hidden": false, - "name": "Developer PowerShell for VS 2019 (2)", - "source": "Windows.Terminal.VisualStudio" - } - ] - }, - "schemes": - [ - { - "background": "#0C0C0C", - "black": "#0C0C0C", - "blue": "#0037DA", - "brightBlack": "#767676", - "brightBlue": "#3B78FF", - "brightCyan": "#61D6D6", - "brightGreen": "#16C60C", - "brightPurple": "#B4009E", - "brightRed": "#E74856", - "brightWhite": "#F2F2F2", - "brightYellow": "#F9F1A5", - "cursorColor": "#FFFFFF", - "cyan": "#3A96DD", - "foreground": "#CCCCCC", - "green": "#13A10E", - "name": "Campbell", - "purple": "#881798", - "red": "#C50F1F", - "selectionBackground": "#FFFFFF", - "white": "#CCCCCC", - "yellow": "#C19C00" - }, - { - "background": "#012456", - "black": "#0C0C0C", - "blue": "#0037DA", - "brightBlack": "#767676", - "brightBlue": "#3B78FF", - "brightCyan": "#61D6D6", - "brightGreen": "#16C60C", - "brightPurple": "#B4009E", - "brightRed": "#E74856", - "brightWhite": "#F2F2F2", - "brightYellow": "#F9F1A5", - "cursorColor": "#FFFFFF", - "cyan": "#3A96DD", - "foreground": "#CCCCCC", - "green": "#13A10E", - "name": "Campbell Powershell", - "purple": "#881798", - "red": "#C50F1F", - "selectionBackground": "#FFFFFF", - "white": "#CCCCCC", - "yellow": "#C19C00" - }, - { - "background": "#282C34", - "black": "#282C34", - "blue": "#61AFEF", - "brightBlack": "#5A6374", - "brightBlue": "#61AFEF", - "brightCyan": "#56B6C2", - "brightGreen": "#98C379", - "brightPurple": "#C678DD", - "brightRed": "#E06C75", - "brightWhite": "#DCDFE4", - "brightYellow": "#E5C07B", - "cursorColor": "#FFFFFF", - "cyan": "#56B6C2", - "foreground": "#DCDFE4", - "green": "#98C379", - "name": "One Half Dark", - "purple": "#C678DD", - "red": "#E06C75", - "selectionBackground": "#FFFFFF", - "white": "#DCDFE4", - "yellow": "#E5C07B" - }, - { - "background": "#FAFAFA", - "black": "#383A42", - "blue": "#0184BC", - "brightBlack": "#4F525D", - "brightBlue": "#61AFEF", - "brightCyan": "#56B5C1", - "brightGreen": "#98C379", - "brightPurple": "#C577DD", - "brightRed": "#DF6C75", - "brightWhite": "#FFFFFF", - "brightYellow": "#E4C07A", - "cursorColor": "#4F525D", - "cyan": "#0997B3", - "foreground": "#383A42", - "green": "#50A14F", - "name": "One Half Light", - "purple": "#A626A4", - "red": "#E45649", - "selectionBackground": "#FFFFFF", - "white": "#FAFAFA", - "yellow": "#C18301" - }, - { - "background": "#002B36", - "black": "#002B36", - "blue": "#268BD2", - "brightBlack": "#073642", - "brightBlue": "#839496", - "brightCyan": "#93A1A1", - "brightGreen": "#586E75", - "brightPurple": "#6C71C4", - "brightRed": "#CB4B16", - "brightWhite": "#FDF6E3", - "brightYellow": "#657B83", - "cursorColor": "#FFFFFF", - "cyan": "#2AA198", - "foreground": "#839496", - "green": "#859900", - "name": "Solarized Dark", - "purple": "#D33682", - "red": "#DC322F", - "selectionBackground": "#FFFFFF", - "white": "#EEE8D5", - "yellow": "#B58900" - }, - { - "background": "#FDF6E3", - "black": "#002B36", - "blue": "#268BD2", - "brightBlack": "#073642", - "brightBlue": "#839496", - "brightCyan": "#93A1A1", - "brightGreen": "#586E75", - "brightPurple": "#6C71C4", - "brightRed": "#CB4B16", - "brightWhite": "#FDF6E3", - "brightYellow": "#657B83", - "cursorColor": "#002B36", - "cyan": "#2AA198", - "foreground": "#657B83", - "green": "#859900", - "name": "Solarized Light", - "purple": "#D33682", - "red": "#DC322F", - "selectionBackground": "#FFFFFF", - "white": "#EEE8D5", - "yellow": "#B58900" - }, - { - "background": "#000000", - "black": "#000000", - "blue": "#3465A4", - "brightBlack": "#555753", - "brightBlue": "#729FCF", - "brightCyan": "#34E2E2", - "brightGreen": "#8AE234", - "brightPurple": "#AD7FA8", - "brightRed": "#EF2929", - "brightWhite": "#EEEEEC", - "brightYellow": "#FCE94F", - "cursorColor": "#FFFFFF", - "cyan": "#06989A", - "foreground": "#D3D7CF", - "green": "#4E9A06", - "name": "Tango Dark", - "purple": "#75507B", - "red": "#CC0000", - "selectionBackground": "#FFFFFF", - "white": "#D3D7CF", - "yellow": "#C4A000" - }, - { - "background": "#FFFFFF", - "black": "#000000", - "blue": "#3465A4", - "brightBlack": "#555753", - "brightBlue": "#729FCF", - "brightCyan": "#34E2E2", - "brightGreen": "#8AE234", - "brightPurple": "#AD7FA8", - "brightRed": "#EF2929", - "brightWhite": "#EEEEEC", - "brightYellow": "#FCE94F", - "cursorColor": "#000000", - "cyan": "#06989A", - "foreground": "#555753", - "green": "#4E9A06", - "name": "Tango Light", - "purple": "#75507B", - "red": "#CC0000", - "selectionBackground": "#FFFFFF", - "white": "#D3D7CF", - "yellow": "#C4A000" - }, - { - "background": "#000000", - "black": "#000000", - "blue": "#000080", - "brightBlack": "#808080", - "brightBlue": "#0000FF", - "brightCyan": "#00FFFF", - "brightGreen": "#00FF00", - "brightPurple": "#FF00FF", - "brightRed": "#FF0000", - "brightWhite": "#FFFFFF", - "brightYellow": "#FFFF00", - "cursorColor": "#FFFFFF", - "cyan": "#008080", - "foreground": "#C0C0C0", - "green": "#008000", - "name": "Vintage", - "purple": "#800080", - "red": "#800000", - "selectionBackground": "#FFFFFF", - "white": "#C0C0C0", - "yellow": "#808000" - }, - { - "background": "#1E1E1E", - "black": "#000000", - "blue": "#2472C8", - "brightBlack": "#666666", - "brightBlue": "#3B8EEA", - "brightCyan": "#29B8DB", - "brightGreen": "#23D18B", - "brightPurple": "#D670D6", - "brightRed": "#F14C4C", - "brightWhite": "#E5E5E5", - "brightYellow": "#F5F543", - "cursorColor": "#FFFFFF", - "cyan": "#11A8CD", - "foreground": "#CCCCCC", - "green": "#0DBC79", - "name": "vscode-dark", - "purple": "#BC3FBC", - "red": "#CD3131", - "selectionBackground": "#FFFFFF", - "white": "#E5E5E5", - "yellow": "#E5E510" - } - ], - "startOnUserLogin": false, - "tabSwitcherMode": "mru", - "tabWidthMode": "equal", - "trimBlockSelection": true, - "useAcrylicInTabRow": true, - "windowingBehavior": "useExisting" -} \ No newline at end of file -- cgit v1.2.3-70-g09d2