From 1d7eb45286933ed5aa98b6f63b93c1991fad481b Mon Sep 17 00:00:00 2001
From: clerie <git@clerie.de>
Date: Sun, 23 Mar 2025 14:30:17 +0100
Subject: [PATCH 1/2] profiles/serial-console: Add profile for serial console
and enable on mercury VMs be default
---
profiles/default.nix | 1 +
profiles/mercury-vm/default.nix | 1 +
profiles/serial-console/default.nix | 26 ++++++++++++++++++++++++++
3 files changed, 28 insertions(+)
create mode 100644 profiles/serial-console/default.nix
diff --git a/profiles/default.nix b/profiles/default.nix
index 087804c..0b0b95f 100644
--- a/profiles/default.nix
+++ b/profiles/default.nix
@@ -13,6 +13,7 @@
./mercury-vm
./netcup
./network-fallback-dhcp
+ ./serial-console
./wg-clerie
];
diff --git a/profiles/mercury-vm/default.nix b/profiles/mercury-vm/default.nix
index 819a284..f8dde20 100644
--- a/profiles/mercury-vm/default.nix
+++ b/profiles/mercury-vm/default.nix
@@ -11,6 +11,7 @@ with lib;
config = mkIf config.profiles.clerie.mercury-vm.enable {
profiles.clerie.fem-net.enable = true;
+ profiles.clerie.serial-console.enable = true;
services.qemuGuest.enable = true;
diff --git a/profiles/serial-console/default.nix b/profiles/serial-console/default.nix
new file mode 100644
index 0000000..ce896c0
--- /dev/null
+++ b/profiles/serial-console/default.nix
@@ -0,0 +1,26 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+let
+
+ cfg = config.profiles.clerie.serial-console;
+
+in {
+
+ options.profiles.clerie.serial-console = {
+ enable = mkEnableOption "Use first serial console as termial";
+ };
+
+ config = mkIf cfg.enable {
+
+ boot.kernelParams = [ "console=ttyS0,115200n8" ];
+
+ boot.loader.grub.extraConfig = "
+ serial --speed=115200 --unit=0 --word=8 --parity=no --stop=1
+ terminal_input serial
+ terminal_output serial
+ ";
+
+ };
+}
From 43a3f0bbca13cc765d001d59bd8882e2e9b87a08 Mon Sep 17 00:00:00 2001
From: Flake Update Bot <flake-update-bot@clerie.de>
Date: Mon, 24 Mar 2025 03:04:09 +0100
Subject: [PATCH 2/2] Update nixpkgs 2025-03-24-02-03
---
flake.lock | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/flake.lock b/flake.lock
index e7345fc..25c2a13 100644
--- a/flake.lock
+++ b/flake.lock
@@ -533,11 +533,11 @@
},
"nixpkgs_3": {
"locked": {
- "lastModified": 1742069588,
- "narHash": "sha256-C7jVfohcGzdZRF6DO+ybyG/sqpo1h6bZi9T56sxLy+k=",
+ "lastModified": 1742669843,
+ "narHash": "sha256-G5n+FOXLXcRx+3hCJ6Rt6ZQyF1zqQ0DL0sWAMn2Nk0w=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "c80f6a7e10b39afcc1894e02ef785b1ad0b0d7e5",
+ "rev": "1e5b653dff12029333a6546c11e108ede13052eb",
"type": "github"
},
"original": {