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 +++++++++++++++++++++
 2 files changed, 57 insertions(+)
 create mode 100644 modules/boot/nixos/default.nix
 create mode 100644 modules/boot/nixos/plymouth.nix

(limited to 'modules/boot/nixos')

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];
+    };
+  }
-- 
cgit v1.3.1


From 27a46e998c503fe70c4f3011b1b77e5a86d21ce7 Mon Sep 17 00:00:00 2001
From: Collin Williams <96917990+bluedragon1221@users.noreply.github.com>
Date: Tue, 9 Sep 2025 20:40:13 -0500
Subject: various "debloating"

---
 hosts/mercury/config.nix                  | 2 +-
 hosts/mercury/nixos.nix                   | 6 +++++-
 modules/boot/nixos/default.nix            | 2 ++
 modules/services/nixos/audio.nix          | 2 +-
 modules/services/nixos/networking/iwd.nix | 1 +
 5 files changed, 10 insertions(+), 3 deletions(-)

(limited to 'modules/boot/nixos')

diff --git a/hosts/mercury/config.nix b/hosts/mercury/config.nix
index 4b5ac0d..a80a871 100644
--- a/hosts/mercury/config.nix
+++ b/hosts/mercury/config.nix
@@ -67,7 +67,7 @@
 
     boot = {
       systemd-boot.enable = true;
-      plymouth.enable = true;
+      # plymouth.enable = true;
       secureBoot.enable = true;
     };
   };
diff --git a/hosts/mercury/nixos.nix b/hosts/mercury/nixos.nix
index 5b1b113..9e59671 100644
--- a/hosts/mercury/nixos.nix
+++ b/hosts/mercury/nixos.nix
@@ -1,4 +1,5 @@
 {
+  lib,
   pkgs,
   inputs,
   ...
@@ -16,16 +17,19 @@
 
   fonts = {
     enableDefaultPackages = false;
+    fontDir.enable = true;
     packages = with pkgs; [
       ibm-plex
       nerd-fonts.iosevka
     ];
   };
 
+  services.speechd.enable = lib.mkForce false; # idk, im not disabled
+  environment.defaultPackages = lib.mkForce []; # im not a noob
+
   networking.firewall.allowedUDPPorts = [445];
   networking.firewall.allowedTCPPorts = [8000];
   users.users.collin.packages = [pkgs.cifs-utils];
-  fonts.fontDir.enable = true;
 
   system.stateVersion = "25.05";
 }
diff --git a/modules/boot/nixos/default.nix b/modules/boot/nixos/default.nix
index 53f18be..66f31fc 100644
--- a/modules/boot/nixos/default.nix
+++ b/modules/boot/nixos/default.nix
@@ -12,9 +12,11 @@ in {
 
   boot =
     {
+      bcache.enable = false; # why is this default on? I DON'T CARE ABOUT bcache
       initrd = {
         verbose = false;
         systemd.enable = true;
+        checkJournalingFS = false;
       };
       loader = {
         systemd-boot = lib.optionalAttrs (cfg.systemd-boot.enable && !cfg.secureBoot.enable) {
diff --git a/modules/services/nixos/audio.nix b/modules/services/nixos/audio.nix
index 93f8289..273f1a4 100644
--- a/modules/services/nixos/audio.nix
+++ b/modules/services/nixos/audio.nix
@@ -7,7 +7,7 @@
   cfg = config.collinux.services.audio;
 in
   lib.mkIf cfg.enable {
-    security.rtkit.enable = true;
+    security.rtkit.enable = false;
     services.pipewire = {
       enable = true;
       wireplumber.enable = true;
diff --git a/modules/services/nixos/networking/iwd.nix b/modules/services/nixos/networking/iwd.nix
index d081792..441498d 100644
--- a/modules/services/nixos/networking/iwd.nix
+++ b/modules/services/nixos/networking/iwd.nix
@@ -23,4 +23,5 @@ in
       useDHCP = false;
       networkmanager.enable = false;
     };
+    systemd.network.enable = lib.mkForce false;
   }
-- 
cgit v1.3.1