From 4338c85a18bb983dac516d6942f1dca5c3a92811 Mon Sep 17 00:00:00 2001
From: Daniel Flanagan <daniel@lyte.dev>
Date: Wed, 24 May 2023 15:27:31 -0500
Subject: [PATCH] More

---
 common/helix/languages.toml                   | 22 +++++++++----------
 common/wezterm/wezterm.lua                    | 10 +++++++++
 .../provision.d/60-AS_ROOT-vt-colors.bash     |  3 +++
 os/linux/eww/eww.yuck                         |  8 ++++++-
 os/linux/hypr/hyprland.conf                   |  2 ++
 5 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/common/helix/languages.toml b/common/helix/languages.toml
index 833ad21..c93d18b 100644
--- a/common/helix/languages.toml
+++ b/common/helix/languages.toml
@@ -11,18 +11,18 @@ name = "fish"
 auto-format = true
 indent = { tab-width = 2, unit = "\t" }
 
-# [[language]]
-# name = "javascript"
-# scope = "source.js"
-# injection-regex = "^(js|javascript)$"
-# file-types = ["js", "jsx", "mjs"]
-# shebangs = ["deno", "node"]
-# roots = ["deno.jsonc", "deno.json", "package.json", "tsconfig.json"]
-# comment-token = "//"
+[[language]]
+name = "javascript"
+scope = "source.js"
+injection-regex = "^(js|javascript)$"
+file-types = ["js", "jsx", "mjs"]
+shebangs = ["deno", "node"]
+roots = ["deno.jsonc", "deno.json", "package.json", "tsconfig.json"]
+comment-token = "//"
 # config = { enable = true, lint = true, unstable = true }
-# language-server = { command = "deno", args = ["lsp"], language-id = "javascript" }
-# indent = { tab-width = 2, unit = "  " }
-# auto-format = true
+# language-server = { command = "typescript-language-server", args = ["--stdio"], language-id = "javascript" }
+indent = { tab-width = 2, unit = "\t" }
+auto-format = true
 
 # [[language]]
 # name = "jsx"
diff --git a/common/wezterm/wezterm.lua b/common/wezterm/wezterm.lua
index 442f417..abb2222 100644
--- a/common/wezterm/wezterm.lua
+++ b/common/wezterm/wezterm.lua
@@ -39,6 +39,16 @@ config.keys = {
     mods = 'CTRL',
     action = wezterm.action.ActivatePaneDirection'Down'
   },
+  {
+    key = 'Insert',
+    mods = 'SHIFT',
+    action = wezterm.action.PasteFrom'Clipboard'
+  },
+  {
+    key = 'v',
+    mods = 'CTRL|SHIFT',
+    action = wezterm.action.PasteFrom'PrimarySelection'
+  },
   {
     key = 'h',
     mods = 'CTRL',
diff --git a/os/linux/arch/provision.d/60-AS_ROOT-vt-colors.bash b/os/linux/arch/provision.d/60-AS_ROOT-vt-colors.bash
index 573348f..37c809d 100755
--- a/os/linux/arch/provision.d/60-AS_ROOT-vt-colors.bash
+++ b/os/linux/arch/provision.d/60-AS_ROOT-vt-colors.bash
@@ -2,6 +2,9 @@
 
 test -d /boot/loader/entries || { echo "no known bootloader"; exit 1; }
 
+# TODO: see catppuccin-tty for possible alternate implementation?
+# TODO: possibly just setup catppuccin-tty?
+
 inject_red="vt.default_red=0x11,0xf9,0xa6,0xf4,0x66,0xae,0xa1,0xf8,0x75,0xf9,0xa6,0xf4,0x66,0xae,0xa1,0xf9"
 inject_green="vt.default_grn=0x11,0x26,0xe2,0xbf,0xd9,0x81,0xef,0xf8,0x71,0x26,0xe2,0xbf,0xd9,0x81,0xef,0xf8"
 inject_blue="vt.default_blu=0x11,0x72,0x2e,0x75,0xef,0xff,0xe4,0xf2,0x5e,0x72,0x2e,0x75,0xef,0xff,0xe4,0xf5"
diff --git a/os/linux/eww/eww.yuck b/os/linux/eww/eww.yuck
index 46ec928..152c9e5 100644
--- a/os/linux/eww/eww.yuck
+++ b/os/linux/eww/eww.yuck
@@ -22,7 +22,10 @@
     time
     ; TODO: idle inhibitor?
     ; TODO: get these to align properly?
-    (box :class "mic" (box :class {micMuted == "false" ? "live" : "muted"} {micMuted == "false" ? " " : " "}))
+    (box :class "mic" (
+      box :class {micMuted == "false" ? "live" : "muted"} {micMuted == "false" ? " " : " "}
+      ) {micVolume + "%"}
+    )
     {"󰕾 " + volume + "%"}
     {" " + round(EWW_CPU["avg"], 0) + "%"}
     {" " + round(EWW_RAM["used_mem_perc"], 0) + "%"}
@@ -43,6 +46,9 @@
 (deflisten volume :initial "0"
   "pamixer --get-volume; pactl subscribe | grep sink --line-buffered | while read i; do pamixer --get-volume; done")
 
+(deflisten micVolume :initial "0"
+  "pamixer --default-source --get-volume; pactl subscribe | grep source --line-buffered | while read i; do pamixer --default-source --get-volume; done")
+
 (deflisten micMuted :initial "false"
   "pamixer --default-source --get-mute; pactl subscribe | grep source --line-buffered | while read i; do pamixer --default-source --get-mute; done")
 
diff --git a/os/linux/hypr/hyprland.conf b/os/linux/hypr/hyprland.conf
index 9da796f..bdb67ea 100644
--- a/os/linux/hypr/hyprland.conf
+++ b/os/linux/hypr/hyprland.conf
@@ -211,3 +211,5 @@ bindm = $mainMod, mouse:273, resizewindow
 bind = $mainMod CTRL, space, exec, makoctl dismiss
 bind = $mainMod SHIFT CTRL, space, exec, makoctl restore
 bind = $mainMod SHIFT, space, exec, makoctl invoke
+
+bind = $mainMod, E, exec, thunar