From 5fca149b6c31b5ccea71e61be3af7c1f3d75d98c Mon Sep 17 00:00:00 2001
From: Andre <andre@8bitbuddhism.com>
Date: Mon, 11 Mar 2024 00:07:31 -0400
Subject: [PATCH] Fix start-haven script on Haven

---
 flake.lock              | 18 +++++++++---------
 hosts/Haven/default.nix |  8 +++-----
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/flake.lock b/flake.lock
index 99a6773..5425570 100644
--- a/flake.lock
+++ b/flake.lock
@@ -117,11 +117,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1709204054,
-        "narHash": "sha256-U1idK0JHs1XOfSI1APYuXi4AEADf+B+ZU4Wifc0pBHk=",
+        "lastModified": 1709904018,
+        "narHash": "sha256-fVp/89wNjWg7OQ/Gj3eSK2IXKDk9mXSj5ltOz98Ce2w=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "2f3367769a93b226c467551315e9e270c3f78b15",
+        "rev": "8b07ca541939211d3cc437ddfd74ebdef3d72471",
         "type": "github"
       },
       "original": {
@@ -174,11 +174,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1709147990,
-        "narHash": "sha256-vpXMWoaCtMYJ7lisJedCRhQG9BSsInEyZnnG5GfY9tQ=",
+        "lastModified": 1709410583,
+        "narHash": "sha256-esOSUoQ7mblwcsSea0K17McZuwAIjoS6dq/4b83+lvw=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "33a97b5814d36ddd65ad678ad07ce43b1a67f159",
+        "rev": "59e37017b9ed31dee303dbbd4531c594df95cfbc",
         "type": "github"
       },
       "original": {
@@ -222,11 +222,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1709237383,
-        "narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=",
+        "lastModified": 1709703039,
+        "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8",
+        "rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d",
         "type": "github"
       },
       "original": {
diff --git a/hosts/Haven/default.nix b/hosts/Haven/default.nix
index a8f1f35..fc07bc3 100644
--- a/hosts/Haven/default.nix
+++ b/hosts/Haven/default.nix
@@ -3,7 +3,7 @@
 # Settings specific to Haven
 
 let
-	start-haven = pkgs.writeText "info" (builtins.readFile ./start-haven.sh);
+	start-haven = pkgs.writeShellScriptBin "start-haven" (builtins.readFile ./start-haven.sh);
 in
 {
 	imports = [
@@ -58,9 +58,7 @@ in
 	};
 
 	# Add script for booting Haven
-	systemd.tmpfiles.rules = [
-		"d ${config.users.users.aires.home}/bin/ 0700 aires users"	# First, make sure the directory exists
-		"L+ ${config.users.users.aires.home}/bin/start-haven 0700 - - - ${start-haven}"
+	environment.systemPackages = [
+		start-haven
 	];
-
 }
\ No newline at end of file