From 863dc77e3d85c8a17dd5276c47a68770bb3acad1 Mon Sep 17 00:00:00 2001
From: punkfairie <marley@punkfairie.net>
Date: Sat, 1 Mar 2025 18:38:36 -0800
Subject: [PATCH] fix: MarleyNet fixes

---
 homes/x86_64-linux/marley@marleynet/default.nix | 9 +++++++++
 modules/nixos/base/boot/default.nix             | 2 ++
 modules/nixos/bundles/desktop/default.nix       | 2 ++
 modules/nixos/bundles/server/default.nix        | 2 ++
 systems/x86_64-linux/marleynet/default.nix      | 9 ++++++---
 systems/x86_64-linux/nyx/default.nix            | 3 ---
 6 files changed, 21 insertions(+), 6 deletions(-)
 create mode 100644 homes/x86_64-linux/marley@marleynet/default.nix

diff --git a/homes/x86_64-linux/marley@marleynet/default.nix b/homes/x86_64-linux/marley@marleynet/default.nix
new file mode 100644
index 0000000..a6f3da7
--- /dev/null
+++ b/homes/x86_64-linux/marley@marleynet/default.nix
@@ -0,0 +1,9 @@
+{lib, ...}: let
+  inherit (lib.marleyos) enabled;
+in {
+  marleyos = {
+    bundles.server = enabled;
+  };
+
+  home.stateVersion = "24.05";
+}
diff --git a/modules/nixos/base/boot/default.nix b/modules/nixos/base/boot/default.nix
index e0b099d..3d0d8fe 100644
--- a/modules/nixos/base/boot/default.nix
+++ b/modules/nixos/base/boot/default.nix
@@ -5,4 +5,6 @@
   ...
 }: {
   boot.kernelPackages = lib.mkIf (!config.marleyos.isServer) pkgs.linuxPackages_xanmod;
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
 }
diff --git a/modules/nixos/bundles/desktop/default.nix b/modules/nixos/bundles/desktop/default.nix
index 271d246..5f0032d 100644
--- a/modules/nixos/bundles/desktop/default.nix
+++ b/modules/nixos/bundles/desktop/default.nix
@@ -11,6 +11,8 @@ in {
 
   config = lib.mkIf cfg.enable {
     marleyos = {
+      isDesktop = lib.mkDefault true;
+
       mounts = {
         automounts = enabled;
         babeshare = enabled;
diff --git a/modules/nixos/bundles/server/default.nix b/modules/nixos/bundles/server/default.nix
index 5dda8e2..30617ac 100644
--- a/modules/nixos/bundles/server/default.nix
+++ b/modules/nixos/bundles/server/default.nix
@@ -11,6 +11,8 @@ in {
 
   config = lib.mkIf cfg.enable {
     marleyos = {
+      isServer = lib.mkDefault true;
+
       appearance = {
         base = enabled;
         console = enabled;
diff --git a/systems/x86_64-linux/marleynet/default.nix b/systems/x86_64-linux/marleynet/default.nix
index 94c8c4d..45ce16a 100644
--- a/systems/x86_64-linux/marleynet/default.nix
+++ b/systems/x86_64-linux/marleynet/default.nix
@@ -3,15 +3,18 @@
 in {
   imports = [./hardware-configuration.nix];
 
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-
   networking.hostName = "marleynet";
 
+  marleyos = {
+    bundles.server = enabled;
+  };
+
   users.users.marley.openssh.authorizedKeys.keys = [
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDcKsDGK8C5W6eRsJQSdAOTFVZnkKRWjnyn4iDR8zMi7 marley@nyx"
 
     # iphone
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM+hMOzQBPmi6Rjw7fYvwn43w1Dgk+GEooGPnQz2RTcK Generated By Termius"
   ];
+
+  system.stateVersion = "24.05";
 }
diff --git a/systems/x86_64-linux/nyx/default.nix b/systems/x86_64-linux/nyx/default.nix
index 83cda74..ba534ae 100644
--- a/systems/x86_64-linux/nyx/default.nix
+++ b/systems/x86_64-linux/nyx/default.nix
@@ -3,9 +3,6 @@
 in {
   imports = [./hardware-configuration.nix ./mounts.nix ./autorandr.nix];
 
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-
   networking.hostName = "nyx";
 
   # For local dev.