From 5a42bed8d8d7770b14e284b63442828f5bcf348b Mon Sep 17 00:00:00 2001
From: Daniel Flanagan <daniel@lyte.dev>
Date: Wed, 17 May 2023 10:12:41 -0500
Subject: [PATCH] Cleanup

---
 common/bin/good-morning         |  4 ++--
 common/bin/maybe-good-morning   | 21 ---------------------
 common/helix/languages.toml     |  7 ++++++-
 os/linux/bin/maybe-good-morning | 18 ++++++++++++++++++
 4 files changed, 26 insertions(+), 24 deletions(-)
 delete mode 100755 common/bin/maybe-good-morning
 create mode 100755 os/linux/bin/maybe-good-morning

diff --git a/common/bin/good-morning b/common/bin/good-morning
index f3b1704..6ba0b5d 100755
--- a/common/bin/good-morning
+++ b/common/bin/good-morning
@@ -5,8 +5,8 @@
 set message_file (mktemp)
 
 for f in (fd good-morning.d.fish $HOME/.config/lytedev-env --max-depth 2)
-    # run scripts for any linked environments with a hooked script
-    source $f $message_file
+	# run scripts for any linked environments with a hooked script
+	source $f $message_file
 end
 
 
diff --git a/common/bin/maybe-good-morning b/common/bin/maybe-good-morning
deleted file mode 100755
index 6909def..0000000
--- a/common/bin/maybe-good-morning
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/env fish
-
-# TODO: some kind of better time-based or last-awakened heuristic to determine
-# whether or not this shows
-
-set -l hours 08 09 10
-if ! contains (date +%H) $hours
-    echo "Not sending notification since it isn't the morning" >>&2
-    exit 1
-end
-
-notify-send \
-    --urgency critical \
-    "Good morning!" \
-    "Activate this notification (click it) to run the script. Dismiss (Super+Ctrl+Space) to ignore." \
-    --action=default=Activate \
-    | rg default
-
-if test $status -eq 0
-    hyprctl dispatch exec [float] wezterm start good-morning
-end
diff --git a/common/helix/languages.toml b/common/helix/languages.toml
index c4545f2..a58c8e3 100644
--- a/common/helix/languages.toml
+++ b/common/helix/languages.toml
@@ -83,4 +83,9 @@ auto-format = false
 
 [[grammar]]
 name = "nim"
-source = { git = "https://github.com/aMOPel/tree-sitter-nim", rev = "8ce3627827e45a5835004391ff5ffcfe029ae6cf" }
\ No newline at end of file
+source = { git = "https://github.com/aMOPel/tree-sitter-nim", rev = "8ce3627827e45a5835004391ff5ffcfe029ae6cf" }
+
+[[language]]
+name = "fish"
+auto-format = true
+indent = { tab-width = 2, unit = "\t" }
diff --git a/os/linux/bin/maybe-good-morning b/os/linux/bin/maybe-good-morning
new file mode 100755
index 0000000..28d1e2c
--- /dev/null
+++ b/os/linux/bin/maybe-good-morning
@@ -0,0 +1,18 @@
+#!/usr/bin/env fish
+
+# TODO: some kind of better time-based or last-awakened heuristic to determine
+# whether or not this shows
+
+set -l hours 08 09 10
+if ! contains (date +%H) $hours
+	echo "Not sending notification since it isn't the morning" >>&2
+	exit 1
+end
+
+notify-send \
+	--urgency critical \
+	"Good morning!" \
+	"Activate this notification (click it or Super+Shift+Space) to run the script. Dismiss (Super+Ctrl+Space) to ignore." \
+	--action=default=Activate \
+	| rg default \
+	&& hyprctl dispatch exec [float] wezterm start good-morning