From 061e73126c292726d87b95b82ae2dfbe8166c71d Mon Sep 17 00:00:00 2001
From: Daniel Flanagan <daniel@lyte.dev>
Date: Fri, 7 Apr 2023 22:28:29 -0500
Subject: [PATCH] Stuff

---
 common/git/config           |  3 +++
 common/helix/languages.toml | 39 +++++++++++++++++++++++++++++++++----
 os/linux/sway/config        | 11 ++++++++---
 3 files changed, 46 insertions(+), 7 deletions(-)

diff --git a/common/git/config b/common/git/config
index b4fbe9f..58f362e 100644
--- a/common/git/config
+++ b/common/git/config
@@ -81,3 +81,6 @@
 
 [url "git@git-p1ap1.divvy.co:"]
 	insteadOf = https://git-p1ap1.divvy.co
+
+[url "git@git.hq.bill.com"]
+	insteadOf = git@git-p1ap1.divvy.co
diff --git a/common/helix/languages.toml b/common/helix/languages.toml
index ba9d664..15b5926 100644
--- a/common/helix/languages.toml
+++ b/common/helix/languages.toml
@@ -1,33 +1,64 @@
 [[language]]
 name = "javascript"
+scope = "source.js"
+injection-regex = "^(js|javascript)$"
+file-types = ["js", "jsx", "mjs"]
 shebangs = ["deno", "node"]
-roots = ["deno.json", "package.json", "tsconfig.json"]
+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]]
 name = "jsx"
+scope = "source.jsx"
+injection-regex = "jsx"
+file-types = ["jsx"]
 shebangs = ["deno", "node"]
-roots = ["deno.json", "package.json", "tsconfig.json"]
+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 = "javascriptreact" }
+indent = { tab-width = 2, unit = "  " }
+grammar = "javascript"
 auto-format = true
 
 [[language]]
 name = "typescript"
+scope = "source.ts"
+injection-regex = "^(ts|typescript)$"
+file-types = ["ts"]
 shebangs = ["deno", "node"]
-roots = ["deno.json", "package.json", "tsconfig.json"]
+roots = ["deno.jsonc", "deno.json", "package.json", "tsconfig.json"]
 config = { enable = true, lint = true, unstable = true }
 language-server = { command = "deno", args = ["lsp"], language-id = "typescript" }
+indent = { tab-width = 2, unit = "  " }
 auto-format = true
 
 [[language]]
 name = "tsx"
+scope = "source.tsx"
+injection-regex = "^(tsx)$" # |typescript
+file-types = ["tsx"]
 shebangs = ["deno", "node"]
-roots = ["deno.json", "package.json", "tsconfig.json"]
+roots = ["deno.jsonc", "deno.json", "package.json", "tsconfig.json"]
 config = { enable = true, lint = true, unstable = true }
 language-server = { command = "deno", args = ["lsp"], language-id = "typescriptreact" }
+indent = { tab-width = 2, unit = "  " }
+auto-format = true
+
+[[language]]
+name = "jsonc"
+scope = "source.jsonc"
+injection-regex = "^(jsonc)$"
+file-types = ["jsonc"]
+shebangs = ["deno", "node"]
+roots = ["deno.jsonc", "deno.json", "package.json", "tsconfig.json"]
+config = { enable = true, lint = true, unstable = true }
+language-server = { command = "deno", args = ["lsp"], language-id = "jsonc" }
+indent = { tab-width = 2, unit = "  " }
 auto-format = true
 
 [[language]]
diff --git a/os/linux/sway/config b/os/linux/sway/config
index a51dae4..3131e81 100644
--- a/os/linux/sway/config
+++ b/os/linux/sway/config
@@ -10,11 +10,12 @@ set $default_gap 0
 xwayland enable
 focus_wrapping no
 gaps inner $default_gap
-smart_borders on|no_gaps
-hide_edge_borders smart_no_gaps
-default_border pixel 1
+smart_borders no_gaps
+hide_edge_borders both
+default_border pixel 2
 focus_follows_mouse no
 mouse_warping none
+popup_during_fullscreen smart
 
 input type:touchscreen {
 	events disabled
@@ -167,6 +168,8 @@ for_window [title=".*"] floating enable
 for_window [app_id=$tilers] floating disable
 bindsym $mod+shift+alt+f for_window [class=$tilers] floating toggle
 
+# for_window [title=".*"] opacity $opacity
+
 include /etc/sway/config.d/*
 include $XDG_CONFIG_HOME/lytedev-env/*/sway/config
 
@@ -178,6 +181,8 @@ bar {
 	swaybar_command waybar
 }
 
+exec /usr/share/sway/scripts/inactive-windows-transparency.py --opacity 0.95
+
 exec mako
 # exec gammastep -t 6500:3500 -l 39.0:-94.5
 # exec /usr/lib/kdeconnectd