Merge networking.nix and cleanup

This commit is contained in:
monologiq 2025-12-24 16:56:09 +01:00
parent 7c553dbf9a
commit abd055702b
5 changed files with 97 additions and 91 deletions

View file

@ -1,4 +1,10 @@
{ config, lib, pkgs, ... }:
{
config,
lib,
pkgs,
modulesPath,
...
}:
let
bootUUID = config.machine.fs.bootUUID;
efiUUID = config.machine.fs.efiUUID;
@ -6,11 +12,15 @@ let
cryptrootUUID = config.machine.fs.cryptrootUUID;
in
{
imports = [ ./minimal.nix ];
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
./minimal.nix
];
boot.bootspec.enable = true;
boot.initrd = {
kernelModules = [ ];
luks.devices."cryptroot".device = "/dev/disk/by-uuid/${luuksUUID}";
systemd.enable = true;
};
@ -43,8 +53,6 @@ in
];
};
boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-uuid/${luuksUUID}";
environment.sessionVariables = {
EDITOR = "${pkgs.vim}/bin/vim";
PAGER = "${pkgs.less}/bin/less";
@ -104,6 +112,9 @@ in
options = [ "subvol=@var_lib_portables" ];
};
services.avahi.enable = true;
services.openssh.enable = true;
swapDevices = [ ];
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;