coolneng
/
panacea
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Replace grub with systemd-boot

This commit is contained in:
coolneng 2020-05-08 21:53:52 +02:00
parent 4f9079395d
commit f4e7147105
Signed by: coolneng
GPG Key ID: 9893DA236405AF57
4 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
configuration.nix
View File

@ -9,11 +9,11 @@
kernelModules = [ "i915" "acpi_call" ]; kernelModules = [ "i915" "acpi_call" ];
extraModulePackages = with config.boot.kernelPackages; [ acpi_call ]; extraModulePackages = with config.boot.kernelPackages; [ acpi_call ];
supportedFilesystems = [ "zfs" ]; supportedFilesystems = [ "zfs" ];
zfs.requestEncryptionCredentials = true;
}; };
# Intel CPU tweaks # Intel CPU tweaks
hardware.cpu.intel.updateMicrocode = hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
lib.mkDefault config.hardware.enableRedistributableFirmware;
hardware.opengl.extraPackages = with pkgs; [ hardware.opengl.extraPackages = with pkgs; [
vaapiIntel vaapiIntel
@ -23,11 +23,10 @@
# Bootloader configuration # Bootloader configuration
boot.loader = { boot.loader = {
timeout = 2; efi.canTouchEfiVariables = true;
grub = { systemd-boot = {
efiSupport = true; enable = true;
configurationLimit = 50; configurationLimit = 50;
copyKernels = true;
}; };
}; };
@ -69,12 +68,16 @@
swapDevices = [ { device = "/swap"; size = 8192; } ]; swapDevices = [ { device = "/swap"; size = 8192; } ];
boot.resumeDevice = "/swap"; boot.resumeDevice = "/swap";
# NixOS version
system.stateVersion = "20.09";
# Import other configuration modules # Import other configuration modules
imports = [ imports = [
./modules/software.nix ./modules/software.nix
./modules/networking.nix ./modules/networking.nix
./modules/gui.nix ./modules/gui.nix
./modules/datasync.nix ./modules/datasync.nix
./modules/audio.nix
]; ];
} }

2
modules/gui.nix
View File

@ -2,7 +2,7 @@
{ {
# Display manager # Display manager
service.xserver.displayManager = { services.xserver.displayManager = {
defaultSession = "sway"; defaultSession = "sway";
sddm = { sddm = {
enable = true; enable = true;

4
modules/networking.nix
View File

@ -9,10 +9,10 @@
# Set hostname and hostid # Set hostname and hostid
networking = { networking = {
hostName = "panacea"; hostName = "panacea";
hostId = "a434d9ed230d"; hostId = "8feb0bb8";
wireless = { wireless = {
enable = true; enable = true;
} };
}; };
# Enable zeroconf # Enable zeroconf

11
modules/software.nix
View File

@ -5,11 +5,16 @@
# Monitoring # Monitoring
htop htop
# Password management # Password management
pass-wayland passff-host gitAndTools.pass-git-helper pass-wayland
passff-host
gitAndTools.pass-git-helper
# Browsers # Browsers
firefox chromium firefox
chromium
# LaTeX # LaTeX
texlive.combind.scheme-full pandoc pandoc-citeproc texlive.combind.scheme-full
pandoc
pandoc-citeproc
]; ];
# Fonts declaration # Fonts declaration