From 7e7c8947fc2ff5598124c4a4c18bd28432fa017e Mon Sep 17 00:00:00 2001
From: Collin Williams <96917990+bluedragon1221@users.noreply.github.com>
Date: Mon, 8 Sep 2025 14:01:35 -0500
Subject: rework most of config; probably broke jupiter again; working to add
 ganymede (non-nixos) to this repo

---
 modules/boot/nixos/default.nix   | 36 ++++++++++++++++++++++++++++++++++++
 modules/boot/nixos/plymouth.nix  | 21 +++++++++++++++++++++
 modules/boot/system/default.nix  | 36 ------------------------------------
 modules/boot/system/plymouth.nix | 21 ---------------------
 4 files changed, 57 insertions(+), 57 deletions(-)
 create mode 100644 modules/boot/nixos/default.nix
 create mode 100644 modules/boot/nixos/plymouth.nix
 delete mode 100644 modules/boot/system/default.nix
 delete mode 100644 modules/boot/system/plymouth.nix

(limited to 'modules/boot')

diff --git a/modules/boot/nixos/default.nix b/modules/boot/nixos/default.nix
new file mode 100644
index 0000000..53f18be
--- /dev/null
+++ b/modules/boot/nixos/default.nix
@@ -0,0 +1,36 @@
+{
+  pkgs,
+  config,
+  lib,
+  ...
+}: let
+  cfg = config.collinux.boot;
+in {
+  imports = [
+    ./plymouth.nix
+  ];
+
+  boot =
+    {
+      initrd = {
+        verbose = false;
+        systemd.enable = true;
+      };
+      loader = {
+        systemd-boot = lib.optionalAttrs (cfg.systemd-boot.enable && !cfg.secureBoot.enable) {
+          enable = true;
+          configurationLimit = 3;
+        };
+        efi.canTouchEfiVariables = true;
+        timeout = 0;
+      };
+    }
+    // (lib.optionalAttrs cfg.secureBoot.enable {
+      lanzaboote = {
+        enable = true;
+        pkiBundle = "/var/lib/sbctl";
+      };
+    });
+
+  environment.systemPackages = lib.mkIf cfg.secureBoot.enable [pkgs.sbctl];
+}
diff --git a/modules/boot/nixos/plymouth.nix b/modules/boot/nixos/plymouth.nix
new file mode 100644
index 0000000..5f7952b
--- /dev/null
+++ b/modules/boot/nixos/plymouth.nix
@@ -0,0 +1,21 @@
+{
+  pkgs,
+  config,
+  lib,
+  ...
+}: let
+  cfg = config.collinux.boot.plymouth;
+in
+  lib.mkIf cfg.enable {
+    boot.plymouth = {
+      enable = true;
+      theme =
+        if (cfg.theme == "catppuccin")
+        then "catppuccin-macchiato" # for whatever reason catppuccin-mocha has errors
+        else "nixos-bgrt";
+      themePackages =
+        if (cfg.theme == "catppuccin")
+        then [pkgs.catppuccin-plymouth]
+        else [pkgs.nixos-bgrt-plymouth];
+    };
+  }
diff --git a/modules/boot/system/default.nix b/modules/boot/system/default.nix
deleted file mode 100644
index 53f18be..0000000
--- a/modules/boot/system/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  pkgs,
-  config,
-  lib,
-  ...
-}: let
-  cfg = config.collinux.boot;
-in {
-  imports = [
-    ./plymouth.nix
-  ];
-
-  boot =
-    {
-      initrd = {
-        verbose = false;
-        systemd.enable = true;
-      };
-      loader = {
-        systemd-boot = lib.optionalAttrs (cfg.systemd-boot.enable && !cfg.secureBoot.enable) {
-          enable = true;
-          configurationLimit = 3;
-        };
-        efi.canTouchEfiVariables = true;
-        timeout = 0;
-      };
-    }
-    // (lib.optionalAttrs cfg.secureBoot.enable {
-      lanzaboote = {
-        enable = true;
-        pkiBundle = "/var/lib/sbctl";
-      };
-    });
-
-  environment.systemPackages = lib.mkIf cfg.secureBoot.enable [pkgs.sbctl];
-}
diff --git a/modules/boot/system/plymouth.nix b/modules/boot/system/plymouth.nix
deleted file mode 100644
index 5f7952b..0000000
--- a/modules/boot/system/plymouth.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  pkgs,
-  config,
-  lib,
-  ...
-}: let
-  cfg = config.collinux.boot.plymouth;
-in
-  lib.mkIf cfg.enable {
-    boot.plymouth = {
-      enable = true;
-      theme =
-        if (cfg.theme == "catppuccin")
-        then "catppuccin-macchiato" # for whatever reason catppuccin-mocha has errors
-        else "nixos-bgrt";
-      themePackages =
-        if (cfg.theme == "catppuccin")
-        then [pkgs.catppuccin-plymouth]
-        else [pkgs.nixos-bgrt-plymouth];
-    };
-  }
-- 
cgit v1.3.1