aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--alacritty/.config/alacritty/alacritty.yml10
-rw-r--r--alacritty/.config/alacritty/colors.yml150
-rw-r--r--alacritty/.config/alacritty/window.yml7
-rw-r--r--wsl/.config/alacritty/local.yml (renamed from wsl/.config/alacritty/font.yml)12
-rw-r--r--wsl/.config/alacritty/shell.yml6
-rwxr-xr-xwsl/.local/bin/wsl-installer.sh17
6 files changed, 87 insertions, 115 deletions
diff --git a/alacritty/.config/alacritty/alacritty.yml b/alacritty/.config/alacritty/alacritty.yml
index 7a6a359..7749908 100644
--- a/alacritty/.config/alacritty/alacritty.yml
+++ b/alacritty/.config/alacritty/alacritty.yml
@@ -3,18 +3,12 @@ import:
- ~/.config/alacritty/colors.yml
- ~/.config/alacritty/key_bindings.yml
- ~/.config/alacritty/shell.yml
+ - ~/.config/alacritty/window.yml
+ - ~/.config/alacritty/local.yml
env:
TERM: alacritty
-window:
- dimensions:
- columns: 120
- lines: 40
- dynamic_padding: false
- decorations: full
- opacity: 0.9
-
scrolling:
history: 10000
multiplier: 3
diff --git a/alacritty/.config/alacritty/colors.yml b/alacritty/.config/alacritty/colors.yml
index 57f8827..6ec7b68 100644
--- a/alacritty/.config/alacritty/colors.yml
+++ b/alacritty/.config/alacritty/colors.yml
@@ -1,93 +1,57 @@
-schemes:
- vscode_light: &vscode_light
- primary:
- background: "#ffffff"
- foreground: "#1e1e1e"
-
- cursor:
- text: "#d4d4d4"
- cursor: "#d4d4d4"
-
- normal:
- black: "#1e1e1e"
- red: "#c72e0f"
- green: "#009000"
- yellow: "#795e25"
- blue: "#007acc"
- magenta: "#af00db"
- cyan: "#56b6c2"
- white: "#d4d4d4"
-
- bright:
- black: "#1e1e1e"
- red: "#c72e0f"
- green: "#009000"
- yellow: "#795e25"
- blue: "#007acc"
- magenta: "#af00db"
- cyan: "#56b6c2"
- white: "#d4d4d4"
-
- vscode_dark: &vscode_dark
- primary:
- background: "#1e1e1e"
- foreground: "#d4d4d4"
-
- cursor:
- text: "#d4d4d4"
- cursor: "#d4d4d4"
-
- normal:
- black: "#1e1e1e"
- red: "#f44747"
- green: "#608b4e"
- yellow: "#dcdcaa"
- blue: "#569cd6"
- magenta: "#c678dd"
- cyan: "#56b6c2"
- white: "#d4d4d4"
-
- bright:
- black: "#545454"
- red: "#f44747"
- green: "#608b4e"
- yellow: "#dcdcaa"
- blue: "#569cd6"
- magenta: "#c678dd"
- cyan: "#56b6c2"
- white: "#d4d4d4"
-
- gruvbox: &gruvbox # Default colors
- primary:
- background: "0x1d2021"
- foreground: "0xd4be98"
-
- # Normal colors
- normal:
- # alt-normal-black: "0x544b3c"
- black: "0x171A1A"
- red: "0xea6962"
- green: "0xa9b665"
- yellow: "0xd8a657"
- blue: "0x7daea3"
- magenta: "0xd3869b"
- aqua: "0x89b482"
- white: "0xd4be98"
-
- # Bright colors
- bright:
- # alt-bright-black: "0x4f4738"
- black: "0x17191a"
- red: "0xea6962"
- green: "0xa9b665"
- yellow: "0xd8a657"
- blue: "0x7daea3"
- magenta: "0xd3869b"
- aqua: "0x89b482"
- white: "0xd4be98"
-
- indexed_colors:
- - { index: 16, color: "0xe78a4e" }
- - { index: 17, color: "0xc14a4a" }
-
-colors: *gruvbox
+# Colors (Gruvbox dark)
+colors:
+ primary:
+ background: &gruvbox_dark_bg "#1d2021"
+ foreground: "#ebdbb2"
+ bright_foreground: "#fbf1c7"
+ dim_foreground: "#a89984"
+ cursor:
+ text: CellBackground
+ cursor: CellForeground
+ vi_mode_cursor:
+ text: CellBackground
+ cursor: CellForeground
+ # search:
+ # matches:
+ # foreground: '#000000'
+ # background: '#ffffff'
+ # focused_match:
+ # foreground: CellBackground
+ # background: CellForeground
+ # bar:
+ # background: ''
+ # foreground: ''
+ # line_indicator:
+ # foreground: None
+ # background: None
+ selection:
+ text: CellBackground
+ background: CellForeground
+ bright:
+ black: "#928374"
+ red: "#fb4934"
+ green: "#b8bb26"
+ yellow: "#fabd2f"
+ blue: "#83a598"
+ magenta: "#d3869b"
+ cyan: "#8ec07c"
+ white: "#ebdbb2"
+ normal:
+ black: *gruvbox_dark_bg
+ red: "#cc241d"
+ green: "#98971a"
+ yellow: "#d79921"
+ blue: "#458588"
+ magenta: "#b16286"
+ cyan: "#689d6a"
+ white: "#a89984"
+ dim:
+ black: "#32302f"
+ red: "#9d0006"
+ green: "#79740e"
+ yellow: "#b57614"
+ blue: "#076678"
+ magenta: "#8f3f71"
+ cyan: "#427b58"
+ white: "#928374"
+ # indexed_colors: []
diff --git a/alacritty/.config/alacritty/window.yml b/alacritty/.config/alacritty/window.yml
new file mode 100644
index 0000000..2f0cc01
--- /dev/null
+++ b/alacritty/.config/alacritty/window.yml
@@ -0,0 +1,7 @@
+window:
+ dimensions:
+ columns: 120
+ lines: 40
+ dynamic_padding: false
+ decorations: full
+ opacity: 0.9
diff --git a/wsl/.config/alacritty/font.yml b/wsl/.config/alacritty/local.yml
index 9872d01..6faa821 100644
--- a/wsl/.config/alacritty/font.yml
+++ b/wsl/.config/alacritty/local.yml
@@ -1,3 +1,10 @@
+shell:
+ program: C:\WINDOWS\system32\wsl.exe
+ args:
+ - "tmux new -As home"
+
+working_directory: '\\wsl$\Arch\home\tobyv'
+
font:
normal:
family: FiraCode NF
@@ -10,4 +17,7 @@ font:
style: Italic
bold_italic:
family: FiraCode NF
- style: Bold Italic \ No newline at end of file
+ style: Bold Italic
+
+window:
+ opacity: 0.98
diff --git a/wsl/.config/alacritty/shell.yml b/wsl/.config/alacritty/shell.yml
deleted file mode 100644
index c3bd711..0000000
--- a/wsl/.config/alacritty/shell.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-shell:
- program: C:\WINDOWS\system32\wsl.exe
- args:
- - "tmux new -As home"
-
-working_directory: '\\wsl$\Arch\home\tobyv'
diff --git a/wsl/.local/bin/wsl-installer.sh b/wsl/.local/bin/wsl-installer.sh
index 44c0fff..0229a35 100755
--- a/wsl/.local/bin/wsl-installer.sh
+++ b/wsl/.local/bin/wsl-installer.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
DOTFILES="${HOME}/.dotfiles"
@@ -11,7 +11,7 @@ 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"
+ sed '/Control/d' >"${WINHOME}/.ssh/config"
# Create windows symlinks to dotfiles
mkln.sh "$@" "$HOME"/.gitconfig "${WINHOME}"/.gitconfig
@@ -21,7 +21,10 @@ mkln.sh "$@" "$HOME"/.gnupg/scdaemon.conf "${WINHOME}"/AppData/Roaming/gnupg/scd
mkln.sh "$@" "$HOME"/.config/alacritty/alacritty.yml "${WINHOME}"/AppData/Roaming/alacritty/alacritty.yml
for f in "$HOME"/.config/alacritty/*; do
- mkln.sh "$@" "$f" "${WINHOME}"/.config/alacritty/"$(basename "$f")"
+ case "$f" in
+ *shell.yml) echo "Skipping $f" ;;
+ *) mkln.sh "$@" "$f" "${WINHOME}"/.config/alacritty/"$(basename "$f")" ;;
+ esac
done
# install wsl2-ssh-pageant
@@ -36,10 +39,10 @@ chmod +x "${HOME}"/.local/bin/xclip
chmod +x "${HOME}"/.local/bin/xsel
# 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
+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"
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-09-20 09:23:10 +0000