sperate boot into option

This commit is contained in:
Johannes Jöns 2024-01-02 20:58:18 +01:00
parent 414c9bd0eb
commit 4feef7b1c1
9 changed files with 36 additions and 45 deletions

7
modules/boot/default.nix Normal file
View file

@ -0,0 +1,7 @@
{ ... }:
{
imports = [
./systemd
];
}

View file

@ -0,0 +1,24 @@
{ config, lib, ... }:
let cfg = config.jopejoe1.boot.systemd;
in {
options.jopejoe1.boot.systemd = {
enable = lib.mkEnableOption "Enable Systemd boot";
};
config = lib.mkIf cfg.enable {
boot = {
loader = {
systemd-boot = {
enable = true;
configurationLimit = 10;
editor = false;
};
efi = {
canTouchEfiVariables = true;
efiSysMountPoint = "/boot/efi";
};
};
};
};
}

View file

@ -6,6 +6,7 @@
./audio ./audio
./auto-update ./auto-update
./bluetooth ./bluetooth
./boot
./events ./events
./kodi ./kodi
./local ./local

View file

@ -67,6 +67,7 @@ in {
system.stateVersion = "24.05"; system.stateVersion = "24.05";
services.openssh.enable = true; services.openssh.enable = true;
systemd.services.nix-daemon.serviceConfig.LimitNOFILE = lib.mkForce 1048576000;
}; };
} }

View file

@ -40,11 +40,4 @@
}; };
powerManagement.cpuFreqGovernor = "ondemand"; powerManagement.cpuFreqGovernor = "ondemand";
programs = {
git = {
enable = true;
lfs.enable = true;
};
};
} }

View file

@ -28,6 +28,7 @@
repo-sync.enable = true; repo-sync.enable = true;
jopejoe1.enable = true; jopejoe1.enable = true;
root.enable = true; root.enable = true;
boot.systemd.enable = true;
}; };
networking = { networking = {
@ -55,17 +56,6 @@
boot = { boot = {
kernelPackages = pkgs.linuxPackages_testing; kernelPackages = pkgs.linuxPackages_testing;
loader = {
systemd-boot = {
enable = true;
configurationLimit = 10;
editor = false;
};
efi = {
canTouchEfiVariables = true;
efiSysMountPoint = "/boot/efi";
};
};
}; };
time.timeZone = "Europe/Berlin"; time.timeZone = "Europe/Berlin";
@ -109,18 +99,11 @@
xwayland.enable = true; xwayland.enable = true;
kdeconnect.enable = true; kdeconnect.enable = true;
gamemode.enable = true; gamemode.enable = true;
git = {
enable = true;
lfs.enable = true;
};
}; };
console = { console = {
enable = true; enable = true;
keyMap = "de"; keyMap = "de";
}; };
nix.settings.system-features = nix.settings.system-features = [ "gccarch-alderlake" "benchmark" "big-parallel" "kvm" "nixos-test" ];
[ "gccarch-alderlake" "benchmark" "big-parallel" "kvm" "nixos-test" ];
systemd.services.nix-daemon.serviceConfig.LimitNOFILE =
lib.mkForce 1048576000;
} }

View file

@ -16,17 +16,10 @@
jopejoe1.enable = true; jopejoe1.enable = true;
nix.enable = true; nix.enable = true;
root.enable = true; root.enable = true;
boot.systemd.enable = true;
}; };
networking = { hostName = "tuny"; }; networking = { hostName = "tuny"; };
boot.loader.grub.device = "/dev/sda";
programs = {
git = {
enable = true;
lfs.enable = true;
};
};
environment.systemPackages = with pkgs; [ mixxx ]; environment.systemPackages = with pkgs; [ mixxx ];

View file

@ -1,6 +1,3 @@
# Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{ config, lib, modulesPath, ... }: { config, lib, modulesPath, ... }:
{ {
@ -28,13 +25,7 @@
swapDevices = swapDevices =
[{ device = "/dev/disk/by-uuid/8569ee66-b939-4ce8-a94a-dca7df5e301b"; }]; [{ device = "/dev/disk/by-uuid/8569ee66-b939-4ce8-a94a-dca7df5e301b"; }];
# 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
# 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`.
networking.useDHCP = lib.mkDefault true; networking.useDHCP = lib.mkDefault true;
# networking.interfaces.enp3s0.useDHCP = lib.mkDefault true;
# networking.interfaces.wlp5s0.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.intel.updateMicrocode = hardware.cpu.intel.updateMicrocode =

View file

@ -50,8 +50,6 @@
kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages; kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;
loader = { loader = {
generic-extlinux-compatible.enable = true; generic-extlinux-compatible.enable = true;
systemd-boot.configurationLimit = 10;
systemd-boot.editor = false;
}; };
}; };
} }