repo: separate and reword common nixos config

2 files changed, 28 insertions, 5 deletions

diff --git a/fw/configuration.nix b/fw/configuration.nix
index c66497c..071c725 100644
--- a/fw/configuration.nix
+++ b/fw/configuration.nix
@@ -83,7 +83,7 @@
     # services.fprintd.enable = true;
     # services.fprintd.tod.enable = true;
     # services.fprintd.tod.driver = pkgs.libfprint-2-tod1-goodix;
-    boot.initrd.systemd.enable = true;
+    # boot.initrd.systemd.enable = true;
     environment.systemPackages = [ pkgs.tpm2-tss ];
     system.stateVersion = "25.05";
   };
diff --git a/nixos/default.nix b/nixos/default.nix
index aac8986..47eeca6 100644
--- a/nixos/default.nix
+++ b/nixos/default.nix
@@ -54,10 +54,25 @@ in
 
     nixpkgs.config.allowUnfree = true;
 
-    boot.kernelPackages = pkgs.linuxPackages_latest;
-    boot.loader.systemd-boot.enable = true;
-    boot.loader.systemd-boot.consoleMode = "max";
-    boot.loader.efi.canTouchEfiVariables = true;
+    boot = {
+      consoleLogLevel=0;
+      initrd.verbose = false;
+      initrd.systemd.enable = true; # required for early stuff
+      kernelPackages = pkgs.linuxPackages_latest;
+      kernelParams = ["quiet" "splash"  "rd.systemd.show_status=false" "rd.udev.log_level=3" "udev.log_priority=3" "boot.shell_on_fail"];
+      loader = {
+        timeout = 0;
+        systemd-boot = {
+          enable = true;
+          consoleMode = "auto";
+          editor = false;
+        };
+        efi.canTouchEfiVariables = true;
+      };
+      plymouth = {
+        enable = true;
+      };
+    };
 
     networking = {
       hostName = cfg.hostname;
@@ -103,6 +118,10 @@ in
     services.greetd = {
       enable = false;
       settings = {
+        initial_session = {
+          command = "sway --unsupported-gpu";
+          user = "${cfg.username}";
+        };
         default_session = {
           command = "${pkgs.greetd.greetd}/bin/agreety --cmd 'sway --unsupported-gpu'"; 
         };
@@ -172,8 +191,12 @@ in
 
     # environment.pathsToLink = [ "/share/zsh" ];
     console = {
+      packages = [
+        pkgs.cozette
+      ];
       earlySetup = true;
       useXkbConfig = true;
+      font = "${pkgs.cozette}/share/consolefonts/cozette12x26.psfu";
       colors = [
         "0f0f0f"
         "ac8a8c"