prunebutt/nixvimConfig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

try to fix non-booting muffinman

Browse source
This commit is contained in:
Michael Floßmann 2024-07-13 18:59:36 +02:00
parent 289a121824
commit c99de5c6a4
4 changed files with 38 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

32
hosts/muffinman/configuration.nix
View file

@ -25,9 +25,13 @@ in
# systemd-boot.enable = true; # systemd-boot.enable = true;
loader.efi.canTouchEfiVariables = true; loader.efi.canTouchEfiVariables = true;
# TODO: remove my mail address from here
swraid.enable = true; 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 = { initrd = {
availableKernelModules = [ "igb" ]; availableKernelModules = [ "igb" ];
# systemd.users.root.shell = "/bin/conspy"; # systemd.users.root.shell = "/bin/conspy";
@ -51,17 +55,25 @@ in
hostName = hostName; hostName = hostName;
networkmanager.enable = true; networkmanager.enable = true;
useDHCP = false;
interfaces = { interfaces = {
eno2.ipv4.addresses = [ eno2 = {
ipv4.addresses = [
{ {
address = static_ip; address = "${static_ip}";
prefixLength = 24; prefixLength = 24;
} }
]; ];
}; };
defaultGateway = gateway; };
defaultGateway = {
address = "${gateway}";
interface = "eno2";
};
nameservers = [ nameservers = [
gateway "${gateway}"
"9.9.9.9" "9.9.9.9"
]; ];
}; };
@ -114,10 +126,10 @@ in
# enableSSHSupport = true; # enableSSHSupport = true;
# }; # };
# auto unlock storage drive # # auto unlock storage drive
environment.etc.crypttab.text = '' # environment.etc.crypttab.text = ''
cryptstorage UUID=74b68945-6edf-4141-93d4-bcccb310f7df /etc/secrets/storage_keyfile.key # cryptstorage UUID=74b68945-6edf-4141-93d4-bcccb310f7df /etc/secrets/storage_keyfile.key
''; # '';
# Enable the OpenSSH daemon. # Enable the OpenSSH daemon.
services.openssh.enable = true; services.openssh.enable = true;
@ -126,7 +138,7 @@ in
# networking.firewall.allowedTCPPorts = [ ... ]; # networking.firewall.allowedTCPPorts = [ ... ];
# networking.firewall.allowedUDPPorts = [ ... ]; # networking.firewall.allowedUDPPorts = [ ... ];
# Or disable the firewall altogether. # Or disable the firewall altogether.
# networking.firewall.enable = false; networking.firewall.enable = false;
# This value determines the NixOS release from which the default # This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions # settings for stateful data, like file locations and database versions

18
hosts/muffinman/hardware-configuration.nix
View file

@ -26,15 +26,15 @@
options = [ "fmask=0022" "dmask=0022" ]; options = [ "fmask=0022" "dmask=0022" ];
}; };
fileSystems."/data/media" = # fileSystems."/data/media" =
{ device = "/dev/disk/by-uuid/203764d8-7e5d-4e61-8467-46dab635ceff"; # { device = "/dev/disk/by-uuid/203764d8-7e5d-4e61-8467-46dab635ceff";
fsType = "ext4"; # fsType = "ext4";
}; # };
#
fileSystems."/data/personal" = # fileSystems."/data/personal" =
{ device = "/dev/disk/by-uuid/4fa1ebd4-eeee-44ab-a77b-df58edcf1813"; # { device = "/dev/disk/by-uuid/4fa1ebd4-eeee-44ab-a77b-df58edcf1813";
fsType = "ext4"; # fsType = "ext4";
}; # };
swapDevices = [ swapDevices = [
{ device = "/.swapfile"; size = 30518; } { device = "/.swapfile"; size = 30518; }

2
modules/nixOS/bundles/core/default.nix
View file

@ -7,6 +7,8 @@
# ./sops.nix # ./sops.nix
]; ];
console.keyMap = lib.mkDefault "neo";
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
vim vim
wget wget

2
modules/nixOS/bundles/general-desktop.nix
View file

@ -7,7 +7,7 @@
"kernel.sysrq" = 502; # enables "REISUB" "kernel.sysrq" = 502; # enables "REISUB"
}; };
console.keyMap = lib.mkDefault "neo"; # console.keyMap = lib.mkDefault "neo";
services.xserver = { services.xserver = {
xkb = lib.mkDefault { xkb = lib.mkDefault {