try to fix non-booting muffinman
This commit is contained in:
parent
289a121824
commit
c99de5c6a4
4 changed files with 38 additions and 24 deletions
|
|
@ -25,9 +25,13 @@ in
|
|||
# systemd-boot.enable = true;
|
||||
loader.efi.canTouchEfiVariables = true;
|
||||
|
||||
# TODO: remove my mail address from here
|
||||
swraid.enable = true;
|
||||
swraid.mdadmConf = ''
|
||||
MAILADDR michael.flossmann@posteo.net
|
||||
'';
|
||||
|
||||
kernelParams = [ "ip=${static_ip}::${gateway}:255.255.255.0:${hostName}:" ];
|
||||
kernelParams = builtins.trace "ip=${static_ip}::${gateway}:255.255.255.0:${hostName}:" [ "ip=${static_ip}::${gateway}:255.255.255.0:${hostName}:" ];
|
||||
initrd = {
|
||||
availableKernelModules = [ "igb" ];
|
||||
# systemd.users.root.shell = "/bin/conspy";
|
||||
|
|
@ -51,17 +55,25 @@ in
|
|||
hostName = hostName;
|
||||
networkmanager.enable = true;
|
||||
|
||||
useDHCP = false;
|
||||
|
||||
interfaces = {
|
||||
eno2.ipv4.addresses = [
|
||||
{
|
||||
address = static_ip;
|
||||
prefixLength = 24;
|
||||
}
|
||||
];
|
||||
eno2 = {
|
||||
ipv4.addresses = [
|
||||
{
|
||||
address = "${static_ip}";
|
||||
prefixLength = 24;
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
defaultGateway = {
|
||||
address = "${gateway}";
|
||||
interface = "eno2";
|
||||
};
|
||||
defaultGateway = gateway;
|
||||
nameservers = [
|
||||
gateway
|
||||
"${gateway}"
|
||||
"9.9.9.9"
|
||||
];
|
||||
};
|
||||
|
|
@ -114,10 +126,10 @@ in
|
|||
# enableSSHSupport = true;
|
||||
# };
|
||||
|
||||
# auto unlock storage drive
|
||||
environment.etc.crypttab.text = ''
|
||||
cryptstorage UUID=74b68945-6edf-4141-93d4-bcccb310f7df /etc/secrets/storage_keyfile.key
|
||||
'';
|
||||
# # auto unlock storage drive
|
||||
# environment.etc.crypttab.text = ''
|
||||
# cryptstorage UUID=74b68945-6edf-4141-93d4-bcccb310f7df /etc/secrets/storage_keyfile.key
|
||||
# '';
|
||||
|
||||
# Enable the OpenSSH daemon.
|
||||
services.openssh.enable = true;
|
||||
|
|
@ -126,7 +138,7 @@ in
|
|||
# networking.firewall.allowedTCPPorts = [ ... ];
|
||||
# networking.firewall.allowedUDPPorts = [ ... ];
|
||||
# Or disable the firewall altogether.
|
||||
# networking.firewall.enable = false;
|
||||
networking.firewall.enable = false;
|
||||
|
||||
# This value determines the NixOS release from which the default
|
||||
# settings for stateful data, like file locations and database versions
|
||||
|
|
|
|||
|
|
@ -26,15 +26,15 @@
|
|||
options = [ "fmask=0022" "dmask=0022" ];
|
||||
};
|
||||
|
||||
fileSystems."/data/media" =
|
||||
{ device = "/dev/disk/by-uuid/203764d8-7e5d-4e61-8467-46dab635ceff";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
fileSystems."/data/personal" =
|
||||
{ device = "/dev/disk/by-uuid/4fa1ebd4-eeee-44ab-a77b-df58edcf1813";
|
||||
fsType = "ext4";
|
||||
};
|
||||
# fileSystems."/data/media" =
|
||||
# { device = "/dev/disk/by-uuid/203764d8-7e5d-4e61-8467-46dab635ceff";
|
||||
# fsType = "ext4";
|
||||
# };
|
||||
#
|
||||
# fileSystems."/data/personal" =
|
||||
# { device = "/dev/disk/by-uuid/4fa1ebd4-eeee-44ab-a77b-df58edcf1813";
|
||||
# fsType = "ext4";
|
||||
# };
|
||||
|
||||
swapDevices = [
|
||||
{ device = "/.swapfile"; size = 30518; }
|
||||
|
|
|
|||
|
|
@ -7,6 +7,8 @@
|
|||
# ./sops.nix
|
||||
];
|
||||
|
||||
console.keyMap = lib.mkDefault "neo";
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
vim
|
||||
wget
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
"kernel.sysrq" = 502; # enables "REISUB"
|
||||
};
|
||||
|
||||
console.keyMap = lib.mkDefault "neo";
|
||||
# console.keyMap = lib.mkDefault "neo";
|
||||
|
||||
services.xserver = {
|
||||
xkb = lib.mkDefault {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue