6 Commits

Author SHA1 Message Date
finn.markwitz ff34fe762e Merge pull request 'Feat/mibook boot desktop choice' (#4) from feat/mibook-boot-desktop-choice into main
Reviewed-on: #4
2026-07-27 09:55:47 +02:00
finn.markwitz 7e4407a1f8 feat(mibook): boot to terminal, launch KDE on demand
Add my.profiles.kde-desktop.startOnBoot (default true, no change for
existing consumers). When false, boot to multi-user.target, keep SDDM
out of any boot target's wants, and provide a 'desktop' command that
starts the display manager on demand. Enable this on mibook.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01CfozKLQdUh5TzqyjSigLUx
2026-07-27 09:48:13 +02:00
finn.markwitz 539fb26791 docs: spec for mibook boot-time terminal/desktop choice
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01CfozKLQdUh5TzqyjSigLUx
2026-07-27 09:27:37 +02:00
finn.markwitz 79b26ddfda chore: Flake Update 2026-07-24 12:01:15 +02:00
finn.markwitz b8961fb47d Merge pull request 'feat(mibook): do nothing on lid close while on AC power' (#2) from feat/mibook-lid-close-ac into main
Reviewed-on: #2
2026-07-24 11:56:02 +02:00
finn.markwitz 4851f745d8 feat(mibook): do nothing on lid close while on AC power
Ship a system-wide PowerDevil default (/etc/xdg/powerdevilrc) setting the
AC lid-close action to "do nothing" (LidAction=0). Battery behavior is left
at the default (suspend).

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01KbZoyXq6J8v2eqC9yn5Vcy
2026-07-21 17:42:47 +02:00
5 changed files with 115 additions and 25 deletions
@@ -0,0 +1,61 @@
# mibook: choose terminal-only vs desktop at boot
## Goal
Let mibook boot to a text console by default, with KDE fully installed and
launchable on demand. The user decides after boot whether they need the
graphical desktop, without rebuilding the system.
## Behavior
- mibook boots to a text console (`multi-user.target`). SDDM and Plasma do
**not** start automatically.
- KDE (SDDM + Plasma 6) remains fully installed.
- Running `desktop` in the terminal starts the SDDM display manager, which
presents the graphical login screen; logging in there enters a Plasma 6
session.
- No reverse command. To return to a text console, stop the display manager
(`sudo systemctl stop display-manager`) or reboot.
- Other machines that enable the `kde-desktop` profile are unaffected; their
desktop still starts on boot.
## Implementation
### `modules/environments/kde-desktop/default.nix`
Add an opt-out option to the existing profile:
- New option `my.profiles.kde-desktop.startOnBoot`, a boolean defaulting to
`true`. The default preserves the current behavior for every consumer.
- The existing `config` block (SDDM, Plasma 6, user packages) stays enabled
whenever the profile is enabled, regardless of `startOnBoot`.
- When `startOnBoot = false`, additionally apply:
- `systemd.services.display-manager.wantedBy = lib.mkForce [ ];` so SDDM is
defined but not pulled in by any boot target.
- `systemd.defaultUnit = "multi-user.target";` so the boot target is the
text console.
- A `desktop` command provided via
`pkgs.writeShellScriptBin "desktop" "exec sudo systemctl start display-manager.service"`,
added to `environment.systemPackages`.
### `machines/mibook/environments.nix`
Set `kde-desktop.startOnBoot = false;` alongside the existing
`kde-desktop.enable = true;`.
## Testing / verification
- `nix build '.#nixosConfigurations.mibook.config.system.build.toplevel'`
builds without error.
- After `nixos-rebuild switch` on mibook: system boots to a TTY, no SDDM;
running `desktop` brings up the SDDM login and a working Plasma session.
- Confirm jupiter (or any non-mibook consumer) is unchanged: its evaluated
`systemd.defaultUnit` / display-manager wantedBy are not altered.
## Trade-offs
- `desktop` relies on `sudo`; the user has sudo access, so no extra
configuration is required.
- Chose "boot to terminal, launch on demand" over a GRUB boot-menu entry
because it is more robust across NixOS generations and needs no fragile
static kernel entries.
Generated
+14 -14
View File
@@ -89,11 +89,11 @@
"nixpkgs-regression": "nixpkgs-regression" "nixpkgs-regression": "nixpkgs-regression"
}, },
"locked": { "locked": {
"lastModified": 1784375420, "lastModified": 1784762557,
"narHash": "sha256-dt1zVj4MRpmffhsgQk+3tx1m/pFTXbtVWrn5KZ1y+8Q=", "narHash": "sha256-R/r6jRnANV50c8F5Fz5+1Q1moab0IGWRk+cg5ME2nMY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nix", "repo": "nix",
"rev": "bebd2f851a304e9fb2e143ce0cbeff577c6a37ac", "rev": "d10c84cd0cc0efdcb29cf2611caf5fbcd10fa071",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -143,11 +143,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1784310968, "lastModified": 1784723954,
"narHash": "sha256-rkSPTePrKqs4dg+i7ZFCq93+HrClac6oSwXX927SVjA=", "narHash": "sha256-1CfD8ZUjCkTgjsneLZ/lxCHhgDfqxxE7/GX0MmsgiqA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "779c32a00155994c86cde8213a8dd4df139d4355", "rev": "a017f5b72210026af5b3ac5949f08d94380a6fbd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -218,11 +218,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1784497964, "lastModified": 1784796856,
"narHash": "sha256-WhdsTtaih3DgTPP/PX023b36UNQyMzEoi6GkPyGx0y4=", "narHash": "sha256-vwxWgF+Gj276WznzGb1LxGsK/39HaQwgQXiU3EkC844=",
"rev": "241313f4e8e508cb9b13278c2b0fa25b9ca27163", "rev": "e2587caef70cea85dd97d7daab492899902dbf5d",
"type": "tarball", "type": "tarball",
"url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1037713.241313f4e8e5/nixexprs.tar.xz" "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1040357.e2587caef70c/nixexprs.tar.xz"
}, },
"original": { "original": {
"id": "nixpkgs", "id": "nixpkgs",
@@ -245,11 +245,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1784432872, "lastModified": 1784707089,
"narHash": "sha256-IX7j5TvSD7hYC9NZ8mgmq7pZ97mYyl24Qs4Tz4uyvO4=", "narHash": "sha256-DUedXhD2Rg8q4Xyd07Sb90eZGy4gg6W+Vl/WbLNwAZo=",
"rev": "fd1462031fdee08f65fd0b4c6b64e22239a77870", "rev": "b3fe9581c9061c749abef42b6d4ee7b7c05c33fa",
"type": "tarball", "type": "tarball",
"url": "https://releases.nixos.org/nixos/26.05/nixos-26.05.5591.fd1462031fde/nixexprs.tar.xz" "url": "https://releases.nixos.org/nixos/26.05/nixos-26.05.5845.b3fe9581c906/nixexprs.tar.xz"
}, },
"original": { "original": {
"id": "nixpkgs", "id": "nixpkgs",
+8
View File
@@ -44,6 +44,14 @@
services.openssh.enable = true; services.openssh.enable = true;
# KDE (PowerDevil) power settings: do nothing on lid close while on AC power.
# Shipped as a system-wide default; KConfig cascades so a user's own
# ~/.config/powerdevilrc will override this if present.
environment.etc."xdg/powerdevilrc".text = ''
[AC][SuspendAndShutdown]
LidAction=0
'';
system = { system = {
stateVersion = "23.05"; stateVersion = "23.05";
autoUpgrade.enable = true; autoUpgrade.enable = true;
+1
View File
@@ -6,6 +6,7 @@ in
{ {
my.profiles = { my.profiles = {
kde-desktop.enable = true; kde-desktop.enable = true;
kde-desktop.startOnBoot = false;
zsh.enable = true; zsh.enable = true;
apps = { apps = {
desktop_apps = true; desktop_apps = true;
+22 -2
View File
@@ -11,9 +11,19 @@ in
{ {
options.my.profiles.kde-desktop = with lib; { options.my.profiles.kde-desktop = with lib; {
enable = mkEnableOption "KDE Desktop Environment"; enable = mkEnableOption "KDE Desktop Environment";
startOnBoot = mkOption {
type = types.bool;
default = true;
description = ''
Whether the display manager (SDDM) starts automatically at boot.
When false, the system boots to a text console and KDE can be
launched on demand with the `desktop` command.
'';
};
}; };
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable (lib.mkMerge [
{
services = { services = {
displayManager.sddm.enable = true; displayManager.sddm.enable = true;
displayManager.sddm.wayland.enable = true; displayManager.sddm.wayland.enable = true;
@@ -23,5 +33,15 @@ in
# Programms can be added here... # Programms can be added here...
numix-icon-theme numix-icon-theme
]; ];
}; }
(lib.mkIf (!cfg.startOnBoot) {
# Boot to a text console; SDDM stays installed but is not pulled in
# by any boot target. Launch KDE on demand with `desktop`.
systemd.services.display-manager.wantedBy = lib.mkForce [ ];
systemd.defaultUnit = lib.mkForce "multi-user.target";
environment.systemPackages = [
(pkgs.writeShellScriptBin "desktop" "exec sudo systemctl start display-manager.service")
];
})
]);
} }