From 1098c68073fa8d3ae5d5c7e7d2f8547fc6ba06bd Mon Sep 17 00:00:00 2001
From: Evan Reichard <evan@reichard.io>
Date: Sat, 27 Sep 2025 12:28:43 -0400
Subject: [PATCH] wip

---
 modules/nixos/system/disk/default.nix            |  8 ++++----
 systems/x86_64-linux/lin-va-thinkpad/default.nix | 10 +++++++++-
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/modules/nixos/system/disk/default.nix b/modules/nixos/system/disk/default.nix
index 68d3dfc..1139b7e 100644
--- a/modules/nixos/system/disk/default.nix
+++ b/modules/nixos/system/disk/default.nix
@@ -20,13 +20,13 @@ in
           content = {
             type = "gpt";
             partitions = {
-              boot = {
-                name = "boot";
+              bios-boot = {
+                name = "bios-boot";
                 size = "1M";
                 type = "EF02";
               };
-              esp = {
-                name = "ESP";
+              boot = {
+                name = "boot";
                 size = "500M";
                 type = "EF00";
                 content = {
diff --git a/systems/x86_64-linux/lin-va-thinkpad/default.nix b/systems/x86_64-linux/lin-va-thinkpad/default.nix
index 2a71136..b86f8b2 100755
--- a/systems/x86_64-linux/lin-va-thinkpad/default.nix
+++ b/systems/x86_64-linux/lin-va-thinkpad/default.nix
@@ -1,4 +1,4 @@
-{ namespace, lib, ... }:
+{ namespace, pkgs, lib, ... }:
 let
   inherit (lib.${namespace}) enabled;
 in
@@ -17,6 +17,8 @@ in
     system = {
       boot = {
         enable = true;
+        enableGrub = false;
+        enableSystemd = true;
         silentBoot = true;
       };
       disk = {
@@ -34,6 +36,7 @@ in
     };
 
     services = {
+      tailscale = enabled;
       avahi = enabled;
       ydotool = enabled;
     };
@@ -55,4 +58,9 @@ in
       };
     };
   };
+
+  # Additional System Packages
+  environment.systemPackages = with pkgs; [
+    mosh
+  ];
 }