Skip to content

Commit 05badf3

Browse files
authored
Merge pull request #72 from Mic92/joerg-ci
vm.nix: disable documentation
2 parents 65489e7 + 315b495 commit 05badf3

File tree

5 files changed

+47
-15
lines changed

5 files changed

+47
-15
lines changed

.github/workflows/publish.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: "Publish a flake to flakestry"
2+
on:
3+
push:
4+
tags:
5+
- "v?[0-9]+.[0-9]+.[0-9]+"
6+
- "v?[0-9]+.[0-9]+"
7+
workflow_dispatch:
8+
inputs:
9+
tag:
10+
description: "The existing tag to publish"
11+
type: "string"
12+
required: true
13+
jobs:
14+
publish-flake:
15+
runs-on: ubuntu-latest
16+
permissions:
17+
id-token: "write"
18+
contents: "read"
19+
steps:
20+
- uses: flakestry/flakestry-publish@main
21+
with:
22+
version: "${{ inputs.tag || github.ref_name }}"

.mergify.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
queue_rules:
2+
- name: default
3+
merge_conditions: []
4+
defaults:
5+
actions:
6+
queue:
7+
allow_merging_configuration_change: true
8+
method: rebase
9+
pull_request_rules:
10+
- name: merge using the merge queue
11+
conditions:
12+
- base=master
13+
- label~=merge-queue|dependencies
14+
actions:
15+
queue: {}

examples/vm.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{ pkgs, ... }: {
22
boot.kernelPackages = pkgs.linuxPackages_latest;
33
services.openssh.enable = true;
4+
documentation.enable = false;
45
}

share/modules/nixos-shell-config.nix

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -51,18 +51,12 @@ in {
5151
# FIXME? currently 500K seems to be the limit?
5252
virtualisation.msize = mkVMDefault 104857600;
5353

54-
services =
55-
let
56-
service = if lib.versionAtLeast (lib.versions.majorMinor lib.version) "20.09" then "getty" else "mingetty";
57-
in
58-
{
59-
${service}.helpLine = ''
60-
Log in as "root" with an empty password.
61-
If you are connect via serial console:
62-
Type Ctrl-a c to switch to the qemu console
63-
and `quit` to stop the VM.
64-
'';
65-
};
54+
services.getty.helpLine = ''
55+
If you are connect via serial console:
56+
Type Ctrl-a c to switch to the qemu console
57+
and `quit` to stop the VM.
58+
'';
59+
services.getty.autologinUser = "root";
6660

6761
virtualisation = {
6862
graphics = mkVMDefault false;

share/modules/nixos-shell.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{ lib, options, pkgs, modulesPath, ... }:
1+
{ lib, modulesPath, ... }:
22

33
{
44
imports = [
@@ -16,7 +16,7 @@
1616
mountHome = mkOption {
1717
type = types.bool;
1818
default = true;
19-
description = "Whether to mount <filename>/home</filename>.";
19+
description = "Whether to mount `/home`.";
2020
};
2121

2222
mountNixProfile = mkOption {
@@ -36,7 +36,7 @@
3636
options = {
3737
target = mkOption {
3838
type = types.path;
39-
description = "Target on the guest.";
39+
description = lib.mdDoc "Target on the guest.";
4040
};
4141

4242
inherit cache;

0 commit comments

Comments
 (0)