diff --git a/configuration.nix b/configuration.nix index 5bb79cb..3862ee9 100644 --- a/configuration.nix +++ b/configuration.nix @@ -10,10 +10,9 @@ ./hardware-configuration.nix ]; - # Use the GRUB 2 boot loader. - boot.loader.grub.enable = true; - boot.loader.grub.device = "/dev/vda"; - boot.loader.grub.useOSProber = true; + # Use systemd-bootloader + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; # Use latest kernel. boot.kernelPackages = pkgs.cachyosKernels.linuxPackages-cachyos-latest-zen4; @@ -136,6 +135,6 @@ # and migrated your data accordingly. # # For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion . - system.stateVersion = "26.05"; # Did you read the comment? + system.stateVersion = "26.11"; # Did you read the comment? } diff --git a/hardware-configuration.nix b/hardware-configuration.nix index 11a8cf0..6518eec 100644 --- a/hardware-configuration.nix +++ b/hardware-configuration.nix @@ -1,36 +1,33 @@ # 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, - pkgs, - modulesPath, - ... -}: +{ config, lib, pkgs, modulesPath, ... }: { - imports = [ - (modulesPath + "/profiles/qemu-guest.nix") - ]; + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = [ - "ahci" - "xhci_pci" - "virtio_pci" - "sr_mod" - "virtio_blk" - ]; + boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ]; - fileSystems."/" = { - device = "/dev/disk/by-uuid/d7ee320a-7eb9-4f7e-bc6f-76c1bc21d863"; - fsType = "ext4"; - }; + fileSystems."/" = + { device = "/dev/disk/by-uuid/667f2c84-43dc-43de-a4e8-a1d5079ae4f1"; + fsType = "ext4"; + }; - swapDevices = [ ]; + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/5ECD-6EBF"; + fsType = "vfat"; + options = [ "fmask=0077" "dmask=0077" ]; + }; + + swapDevices = + [ { device = "/dev/disk/by-uuid/d7a5eece-520e-4e6e-9523-467a07c428ef"; } + ]; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; } diff --git a/home.nix b/home.nix index ab21b00..a4fcf17 100644 --- a/home.nix +++ b/home.nix @@ -57,7 +57,9 @@ settings = { monitor = [ - "Virtual-1,1920x1080@60,auto,1" + "DP-1,1920x1080@143.85,1920x0,1" + "DP-2,1920x1080@119.98,3840x0,1" + "DP-3,1920x1080@119.98,0x0,1" ]; bind = [