danielsiepmann/nixpkgs
danielsiepmann/nixpkgs
1
0
Code Releases Activity

Install NixOS on Hikari

Browse source 
No dual boot this time.
But hibernate.
This commit is contained in:
Daniel Siepmann 2023-02-15 16:42:27 +01:00
parent b9c9d8f934
commit 18bd52a23b
Signed by: Daniel Siepmann
GPG key ID: 33D6629915560EF4
3 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
systems/hikari/configuration.nix
View file

@ -24,9 +24,15 @@
}; };
}; };
# Setup keyfile initrd = {
initrd.secrets = { # Setup keyfile
"/crypto_keyfile.bin" = null; secrets = {
"/crypto_keyfile.bin" = null;
};
luks.devices."luks-77a26fd0-f3c7-4eca-be5e-dba6b6c66e4f" = {
device = "/dev/disk/by-uuid/77a26fd0-f3c7-4eca-be5e-dba6b6c66e4f";
keyFile = "/crypto_keyfile.bin";
};
}; };
}; };

12
systems/hikari/hardware-configuration.nix
View file

@ -15,25 +15,27 @@
boot.extraModulePackages = [ config.boot.kernelPackages.broadcom_sta ]; boot.extraModulePackages = [ config.boot.kernelPackages.broadcom_sta ];
fileSystems."/" = fileSystems."/" =
{ device = "/dev/disk/by-uuid/bb322f78-2e67-41dc-9385-8a5fe9abb103"; { device = "/dev/disk/by-uuid/3b35e5dd-4b81-4b32-b572-96f1301ac1ef";
fsType = "ext4"; fsType = "ext4";
}; };
boot.initrd.luks.devices."luks-4bbd7327-2cd7-4aed-90ea-32030abdc894".device = "/dev/disk/by-uuid/4bbd7327-2cd7-4aed-90ea-32030abdc894"; boot.initrd.luks.devices."luks-1ad0b141-874e-42c5-9c36-08144b3b6e7a".device = "/dev/disk/by-uuid/1ad0b141-874e-42c5-9c36-08144b3b6e7a";
fileSystems."/boot/efi" = fileSystems."/boot/efi" =
{ device = "/dev/disk/by-uuid/67E3-17ED"; { device = "/dev/disk/by-uuid/8EE4-E230";
fsType = "vfat"; fsType = "vfat";
}; };
swapDevices = [ ]; swapDevices =
[ { device = "/dev/disk/by-uuid/86be72da-47ff-404f-a4ba-e078ea151e99"; }
];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's # (the default) this is the recommended approach. When using systemd-networkd it's
# still possible to use this option, but it's recommended to use it in conjunction # still possible to use this option, but it's recommended to use it in conjunction
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`. # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
networking.useDHCP = lib.mkDefault true; networking.useDHCP = lib.mkDefault true;
# networking.interfaces.enp0s20u1.useDHCP = lib.mkDefault true; # networking.interfaces.enp0s20u2.useDHCP = lib.mkDefault true;
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
} }

1
systems/hikari/web-development/lib/mkcert.nix
View file

@ -44,6 +44,7 @@ in {
]; ];
# NOTE: Disable until root certificate is generated, then add again # NOTE: Disable until root certificate is generated, then add again
# Maybe check for file existense and throw proper error message?
security.pki.certificates = [ security.pki.certificates = [
(builtins.readFile "${config.custom.web-development.certFolder}rootCA.pem") (builtins.readFile "${config.custom.web-development.certFolder}rootCA.pem")
]; ];