From ba5aa0f531154c2c64639865849be746500353d0 Mon Sep 17 00:00:00 2001 From: Kyler Olsen Date: Wed, 7 May 2025 22:39:10 -0600 Subject: [PATCH] Setting up on MoonK4 --- hardware-configuration.nix | 22 ++++++++++------------ home/home.nix | 5 +++++ sys/configuration.nix | 9 +++++++-- sys/hyprland.nix | 2 +- 4 files changed, 23 insertions(+), 15 deletions(-) diff --git a/hardware-configuration.nix b/hardware-configuration.nix index e38390d..7d76458 100644 --- a/hardware-configuration.nix +++ b/hardware-configuration.nix @@ -4,24 +4,20 @@ { config, lib, pkgs, modulesPath, ... }: { - imports = [ ]; + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = [ "ata_piix" "ohci_pci" "ehci_pci" "ahci" "sd_mod" "sr_mod" ]; + boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" ]; boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/ec8ceed7-4d76-46ce-b270-a9c505a1b336"; + { device = "/dev/disk/by-uuid/6cc799fb-b823-4f6f-b4af-da6a9e0974a4"; fsType = "ext4"; }; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/E842-22E1"; - fsType = "vfat"; - options = [ "fmask=0077" "dmask=0077" ]; - }; - swapDevices = [ ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking @@ -29,8 +25,10 @@ # still possible to use this option, but it's recommended to use it in conjunction # with explicit per-interface declarations with `networking.interfaces..useDHCP`. networking.useDHCP = lib.mkDefault true; - # networking.interfaces.enp0s3.useDHCP = lib.mkDefault true; + # networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true; + # networking.interfaces.enp6s0.useDHCP = lib.mkDefault true; + # networking.interfaces.wlp0s20f0u3.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - virtualisation.virtualbox.guest.enable = true; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; } diff --git a/home/home.nix b/home/home.nix index bbe18ef..0ac102d 100644 --- a/home/home.nix +++ b/home/home.nix @@ -22,6 +22,11 @@ programs.home-manager.enable = true; + programs.git = { + userEmail = "kylerolsen17@gmail.com"; + userName = "Kyler Olsen"; + }; + # This value determines the Home Manager release that your configuration is # compatible with. This helps avoid breakage when a new Home Manager release # introduces backwards incompatible changes. diff --git a/sys/configuration.nix b/sys/configuration.nix index 2a013b4..721ac47 100644 --- a/sys/configuration.nix +++ b/sys/configuration.nix @@ -7,8 +7,13 @@ ./hyprland.nix ]; - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; + # boot.loader.systemd-boot.enable = true; + # boot.loader.efi.canTouchEfiVariables = true; + # boot.loader.efi.efiSysMountPoint = "/boot"; + + boot.loader.grub.enable = true; + boot.loader.grub.device = "/dev/nvme0n1"; + boot.loader.grub.useOSProber = true; networking.hostName = "moonk4-l"; # Define your hostname. # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. diff --git a/sys/hyprland.nix b/sys/hyprland.nix index 06f77b7..4ff1c92 100644 --- a/sys/hyprland.nix +++ b/sys/hyprland.nix @@ -8,7 +8,7 @@ default_session = { command = "${pkgs.greetd.greetd}/bin/agreety --cmd Hyprland"; }; - } + }; }; programs.hyprland = {