yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request 'treewide: fix evaluation warnings' (#5214) from nuke-warnings into main

Browse Source 
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/5214
This commit is contained in:
Michael Hoang
2025-09-19 13:29:41 +00:00
parent 91985504d0 00a864663b
commit 4ec5be9476
3 changed files with 30 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
flake.lock generated
View File

@@ -31,11 +31,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1758160037, "lastModified": 1758287904,
"narHash": "sha256-fXelTdjdILspZ1IUU9aICB1+PXwSFiF8j+7ujwo1VpQ=", "narHash": "sha256-IGmaEf3Do8o5Cwp1kXBN1wQmZwQN3NLfq5t4nHtVtcU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "4f554162fff88e77655073d352eec0cea71103a2", "rev": "67ff9807dd148e704baadbd4fd783b54282ca627",
"type": "github" "type": "github"
}, },
"original": { "original": {

46
flakeModules/demo_iso.nix
View File

@@ -45,29 +45,33 @@ let
''; '';
}; };
morphModule = { morphModule =
imports = [ { config, ... }:
( {
{ modulesPath, ... }: imports = [
{ (
imports = [ "${modulesPath}/image/images.nix" ]; { modulesPath, ... }:
} {
) imports = [ "${modulesPath}/image/images.nix" ];
]; }
image.modules.iso.isoImage.squashfsCompression = "zstd -Xcompression-level 1"; )
networking.networkmanager.enable = true; ];
services.getty.autologinUser = "root"; image.modules.iso.isoImage.squashfsCompression = "zstd -Xcompression-level 1";
programs.bash.interactiveShellInit = '' networking.networkmanager.enable = true;
if [[ "$(tty)" =~ /dev/(tty1|hvc0|ttyS0)$ ]]; then services.getty.autologinUser = "root";
# workaround for https://github.com/NixOS/nixpkgs/issues/219239 programs.bash.interactiveShellInit = ''
systemctl restart systemd-vconsole-setup.service if [[ "$(tty)" =~ /dev/(tty1|hvc0|ttyS0)$ ]]; then
# workaround for https://github.com/NixOS/nixpkgs/issues/219239
systemctl restart systemd-vconsole-setup.service
reset reset
${clan_welcome}/bin/clan_welcome ${clan_welcome}/bin/clan_welcome
fi fi
''; '';
};
system.stateVersion = config.system.nixos.release;
};
in in
{ {
clan.templates.machine.demo-template = { clan.templates.machine.demo-template = {

2
pkgs/installer/flake-module.nix
View File

@@ -19,6 +19,8 @@ let
system.stateVersion = config.system.nixos.release; system.stateVersion = config.system.nixos.release;
nixpkgs.pkgs = self.inputs.nixpkgs.legacyPackages.x86_64-linux; nixpkgs.pkgs = self.inputs.nixpkgs.legacyPackages.x86_64-linux;
users.users.root.initialHashedPassword = lib.mkForce null;
boot.loader.grub.efiSupport = lib.mkDefault true; boot.loader.grub.efiSupport = lib.mkDefault true;
boot.loader.grub.efiInstallAsRemovable = lib.mkDefault true; boot.loader.grub.efiInstallAsRemovable = lib.mkDefault true;
disko.devices = { disko.devices = {