From 0e8356965eeec449360fefda6a04598fadb792a3 Mon Sep 17 00:00:00 2001
From: Daniel Flanagan <daniel@lyte.dev>
Date: Fri, 19 May 2023 14:36:25 -0500
Subject: [PATCH] Cleanup

---
 common/helix/config.toml    |   3 +-
 common/helix/languages.toml | 142 ++++++++++++++++--------------------
 os/linux/hypr/hyprland.conf |   2 +-
 3 files changed, 65 insertions(+), 82 deletions(-)

diff --git a/common/helix/config.toml b/common/helix/config.toml
index 3116317..22a010f 100644
--- a/common/helix/config.toml
+++ b/common/helix/config.toml
@@ -43,5 +43,4 @@ C = ":bc"
 
 [keys.select]
 space = { q = ":reflow 80", Q = ":reflow 120" }
-"L" = "repeat_last_motion"
-
+"L" = "repeat_last_motion"
\ No newline at end of file
diff --git a/common/helix/languages.toml b/common/helix/languages.toml
index a58c8e3..833ad21 100644
--- a/common/helix/languages.toml
+++ b/common/helix/languages.toml
@@ -1,91 +1,75 @@
-[[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]]
-name = "jsx"
-scope = "source.jsx"
-injection-regex = "jsx"
-file-types = ["jsx"]
-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 = "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.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.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]]
 name = "elixir"
 auto-format = true
 
-[[language]]
-name = "nim"
-scope = "source.nim"
-injection-regex = "nim"
-file-types = ["nim","nims"]
-shebangs = ["nim"]
-roots = []
-comment-token = "#"
-language-server = { command = "nimlangserver" }
-indent = { tab-width = 2, unit = " " }
-auto-format = true
-
 [[language]]
 name = "html"
 auto-format = false
 
-[[grammar]]
-name = "nim"
-source = { git = "https://github.com/aMOPel/tree-sitter-nim", rev = "8ce3627827e45a5835004391ff5ffcfe029ae6cf" }
-
 [[language]]
 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 = "//"
+# 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.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.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.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
diff --git a/os/linux/hypr/hyprland.conf b/os/linux/hypr/hyprland.conf
index 3c326f4..9da796f 100644
--- a/os/linux/hypr/hyprland.conf
+++ b/os/linux/hypr/hyprland.conf
@@ -5,7 +5,7 @@ monitor=,preferred,auto,auto
 
 # Execute your favorite apps at launch
 exec-once = firefox & wezterm & hyprpaper & mako & /usr/lib/polkit-kde-authentication-agent-1 & eww daemon & eww open-many bar
-exec-once = swayidle -w timeout 600 'notify-send "Locking in 30 seconds..."' timeout 630 'swaylock -f' timeout 660 'hyprctl dispatch dpms off' resume 'hyprctl dispatch dpms on' resume 'maybe-good-morning' before-sleep 'swaylock -f'
+exec-once = swayidle -w timeout 600 'notify-send "Locking in 30 seconds..."' timeout 630 'swaylock -f' timeout 660 'hyprctl dispatch dpms off' resume 'hyprctl dispatch dpms on && maybe-good-morning' before-sleep 'swaylock -f'
 exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
 
 env = XCURSOR_SIZE,24