diff --git a/configuration.nix b/configuration.nix index db53216..53b8571 100644 --- a/configuration.nix +++ b/configuration.nix @@ -167,22 +167,22 @@ # lemonake.packages.${pkgs.system}.wayvr-dashboard-git - (monado.overrideAttrs (oldAttrs: rec { - src = fetchFromGitLab { - domain = "gitlab.freedesktop.org"; - owner = "monado"; - repo = "monado"; - rev = "9abe461c"; - hash = "sha256-c/I7wFoLPZ///yU/AoqgL9Fz3iSp5jH9E2vTXaKE4Vs="; - }; - patches = []; - # (pkgs.fetchpatch { - # url = "https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2425.diff"; - # sha256 = "0hhfk86z1yq5gn9bzqpv46nb9bdx3fygi55b4ayzmnamva7rcajp"; - # }) - # ]; - })) - ]; + # (monado.overrideAttrs (oldAttrs: rec { + # src = fetchFromGitLab { + # domain = "gitlab.freedesktop.org"; + # owner = "monado"; + # repo = "monado"; + # rev = "9abe461c"; + # hash = "sha256-c/I7wFoLPZ///yU/AoqgL9Fz3iSp5jH9E2vTXaKE4Vs="; + # }; + # patches = []; + # # (pkgs.fetchpatch { + # # url = "https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2425.diff"; + # # sha256 = "0hhfk86z1yq5gn9bzqpv46nb9bdx3fygi55b4ayzmnamva7rcajp"; + # # }) + # # ]; + # })) + # ]; # # github:PassiveLemon/lemonake/master/pkgs/wayvr-dashboard diff --git a/hardware-configuration.nix b/hardware-configuration.nix index 633de5e..695a1eb 100644 --- a/hardware-configuration.nix +++ b/hardware-configuration.nix @@ -8,25 +8,24 @@ [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "thunderbolt" "usbhid" "usb_storage" "sd_mod" ]; + boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "thunderbolt" "usbhid" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ]; - fileSystems."/" = - { device = "/dev/disk/by-uuid/f20d561e-283e-4fc9-9f06-33cd4dcb7208"; + { device = "/dev/disk/by-uuid/bf8632a8-5ad0-4dc1-ae44-6502948b7345"; fsType = "ext4"; }; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/A7F6-EC69"; + { device = "/dev/disk/by-uuid/223A-C71C"; fsType = "vfat"; options = [ "fmask=0077" "dmask=0077" ]; }; swapDevices = - [ { device = "/dev/disk/by-uuid/33c7ad78-35f3-4965-80aa-11d1c9af9dcc"; } + [ { device = "/dev/disk/by-uuid/b6ea0e2e-16cb-47ce-b890-384fe35865d7"; } ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking @@ -34,9 +33,8 @@ # 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.enp9s0.useDHCP = lib.mkDefault true; + # networking.interfaces.enp116s0u2u1c2.useDHCP = lib.mkDefault true; # networking.interfaces.wlp10s0.useDHCP = lib.mkDefault true; - # networking.interfaces.wlp118s0f4u2.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;