From 6ead3afd3687c947f6e8bcdf3eccf7c4a342c985 Mon Sep 17 00:00:00 2001
From: Bun <bun@nixfox.ca>
Date: Thu, 17 Apr 2025 11:17:51 -0400
Subject: [PATCH] Add Bluetui, organize some other things

---
 modules/system/devices/bluetooth/default.nix          |  7 +++++--
 modules/system/devices/boot/lanzaboote/default.nix    | 11 +++++++++--
 .../devices/disks/impermanence/root/default.nix       |  3 +--
 modules/system/devices/video/nvidia/default.nix       |  6 ++++--
 4 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/modules/system/devices/bluetooth/default.nix b/modules/system/devices/bluetooth/default.nix
index 1fbb51be..b6885d45 100644
--- a/modules/system/devices/bluetooth/default.nix
+++ b/modules/system/devices/bluetooth/default.nix
@@ -1,4 +1,4 @@
-{ config, lib, ... }:
+{ config, lib, pkgs, ... }:
 {
   config = lib.mkIf config.system.desktop.enable {
     hardware.bluetooth = {
@@ -8,6 +8,9 @@
         Policy.AutoEnable = "true";
       };
     };
-    environment.persistence."/persist".directories = [ "/var/lib/bluetooth" ];
+    environment = {
+      systemPackages = with pkgs; [ bluetui ];
+      persistence."/persist".directories = [ "/var/lib/bluetooth" ];
+    };
   };
 }
diff --git a/modules/system/devices/boot/lanzaboote/default.nix b/modules/system/devices/boot/lanzaboote/default.nix
index 6c567f45..b3eb4940 100644
--- a/modules/system/devices/boot/lanzaboote/default.nix
+++ b/modules/system/devices/boot/lanzaboote/default.nix
@@ -1,7 +1,14 @@
-{ pkgs, lanzaboote, ... }:
+{ config, pkgs, lanzaboote, ... }:
 {
   imports = [ lanzaboote.nixosModules.lanzaboote ];
 
   boot.lanzaboote.pkiBundle = "/etc/secureboot";
-  environment.systemPackages = with pkgs; [ sbctl ];
+
+  environment = {
+    systemPackages = with pkgs; [ sbctl ];
+    persistence."/persist".directories = [{
+      directory = config.boot.lanzaboote.pkiBundle;
+      mode = "0700";
+    }];
+  };
 }
diff --git a/modules/system/devices/disks/impermanence/root/default.nix b/modules/system/devices/disks/impermanence/root/default.nix
index 910a87da..ca93701a 100644
--- a/modules/system/devices/disks/impermanence/root/default.nix
+++ b/modules/system/devices/disks/impermanence/root/default.nix
@@ -3,10 +3,9 @@
   environment.persistence."/persist" = {
     hideMounts = true;
     directories = [
-      "/storage"
       "/etc/nixos"
+      "/storage"
       "/var/lib/nixos"
-      { directory = "/etc/secureboot"; mode = "0700"; }
     ];
     files = [
       "/etc/machine-id"
diff --git a/modules/system/devices/video/nvidia/default.nix b/modules/system/devices/video/nvidia/default.nix
index e2662244..27de2fae 100644
--- a/modules/system/devices/video/nvidia/default.nix
+++ b/modules/system/devices/video/nvidia/default.nix
@@ -1,6 +1,6 @@
 { config, lib, ... }:
 {
-  options.system.nvidia.enable = lib.mkEnableOption "Enable the Nvidia graphics stack";
+  options.system.nvidia.enable = lib.mkEnableOption "Enable Nvidia graphic drivers";
 
   config = lib.mkIf config.system.nvidia.enable {
     hardware.nvidia = {
@@ -9,9 +9,11 @@
       open = true;
     };
 
+    boot.kernelParams = [ "nvidia_drm.fbdev=1" ]; # Framebuffer fixes TTY access
+
     services.xserver.videoDrivers = [ "nvidia" ];
+
     nixpkgs.allowUnfreePackages = [ "nvidia-x11" ];
-    boot.kernelParams = [ "nvidia_drm.fbdev=1" ]; # Experimental framebuffer allows tty access
 
     specialisation.nouveau.configuration.config.system.nvidia.enable = lib.mkForce false;
   };