This commit is contained in:
muon 2024-11-29 11:23:58 +00:00
parent 32a36f5f80
commit e72fa70fae
3 changed files with 30 additions and 19 deletions

View file

@ -5,14 +5,13 @@ in {
# Hardware # Hardware
imports = [ ./hardware-configuration.nix ]; imports = [ ./hardware-configuration.nix ];
boot.supportedFilesystems = [ "zfs" "ntfs" ];
environment.systemPackages = with inputs.nix-alien.packages.${system}; environment.systemPackages = with inputs.nix-alien.packages.${system};
[ nix-alien ]; [ nix-alien ];
# System # System
mods.user.name = "muon"; mods.user.name = "muon";
networking.hostName = "muho"; networking.hostName = "muho";
networking.hostId = "56e55e83";
mods.home.file = ./home.nix; mods.home.file = ./home.nix;
# Modules # Modules

View file

@ -4,29 +4,40 @@
{ config, lib, pkgs, modulesPath, ... }: { config, lib, pkgs, modulesPath, ... }:
{ {
imports = imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
[ (modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ]; boot.initrd.availableKernelModules =
[ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-amd" ]; boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
boot.supportedFilesystems = [ "zfs" "ntfs" ];
services.zfs.autoScrub.enable = true;
services.zfs.autoSnapshot.enable = true;
fileSystems."/" = fileSystems."/" = {
{ device = "/dev/disk/by-uuid/034b9530-2c01-4108-9dbb-44557eddf6d5"; device = "/dev/disk/by-uuid/034b9530-2c01-4108-9dbb-44557eddf6d5";
fsType = "ext4"; fsType = "ext4";
}; };
fileSystems."/boot" = fileSystems."/boot" = {
{ device = "/dev/disk/by-uuid/9D45-AA14"; device = "/dev/disk/by-uuid/9D45-AA14";
fsType = "vfat"; fsType = "vfat";
options = [ "fmask=0077" "dmask=0077" ]; options = [ "fmask=0077" "dmask=0077" ];
}; };
# fileSystems."/storage0" = {
# device = "storage0";
# fsType = "zfs";
# };
# fileSystems."/storage1" = {
# device = "storage1";
# fsType = "zfs";
# };
swapDevices = swapDevices =
[ { device = "/dev/disk/by-uuid/f7ce07eb-563c-4c65-b465-b6c1ab88aede"; } [{ device = "/dev/disk/by-uuid/f7ce07eb-563c-4c65-b465-b6c1ab88aede"; }];
];
# 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
@ -36,5 +47,6 @@
# networking.interfaces.enp4s0.useDHCP = lib.mkDefault true; # networking.interfaces.enp4s0.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; hardware.cpu.amd.updateMicrocode =
lib.mkDefault config.hardware.enableRedistributableFirmware;
} }

View file

@ -8,7 +8,7 @@
config = lib.mkIf config.mods.boot.enable { config = lib.mkIf config.mods.boot.enable {
boot.loader = lib.mkIf config.mods.xorg.enable { boot.loader = lib.mkIf config.mods.xorg.enable {
timeout = 0; timeout = 1;
efi.canTouchEfiVariables = true; efi.canTouchEfiVariables = true;
grub = { grub = {
enable = true; enable = true;