diff --git a/hosts/canopus/hardware-configuration.nix b/hosts/canopus/hardware-configuration.nix index fe51089..0ea9028 100755 --- a/hosts/canopus/hardware-configuration.nix +++ b/hosts/canopus/hardware-configuration.nix @@ -1,33 +1,32 @@ # 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 + "/installer/scan/not-detected.nix") - ]; + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "usbhid" "usb_storage" "sd_mod" "sdhci_pci"]; - boot.initrd.kernelModules = []; - boot.kernelModules = ["kvm-amd"]; - boot.extraModulePackages = []; + boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "usb_storage" "usbhid" "sd_mod" "sdhci_pci" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-amd" ]; + boot.extraModulePackages = [ ]; - fileSystems."/" = { - device = "/dev/disk/by-uuid/e79e5cdf-4197-4f44-96c7-3ab9ba9878bb"; - fsType = "ext4"; - }; + fileSystems."/" = + { device = "/dev/disk/by-uuid/b76b1267-0c4e-425b-aec5-968aece6e55d"; + fsType = "ext4"; + }; - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/ADC4-BC71"; - fsType = "vfat"; - }; + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/2A0B-D264"; + fsType = "vfat"; + options = [ "fmask=0022" "dmask=0022" ]; + }; - swapDevices = []; + swapDevices = + [ { device = "/dev/disk/by-uuid/f3c7073e-2e51-490f-8668-09faeed74043"; } + ]; # 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 diff --git a/overlays/default.nix b/overlays/default.nix index 65710e6..8ba34d1 100755 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -11,7 +11,7 @@ # buildInputs = oldAttrs.buildInputs; #}); - awesome = inputs.nixpkgs-f2k.packages.${prev.system}.awesome-git.override {lua = prev.luajit;}; + awesome = inputs.nixpkgs-f2k.packages.${prev.system}.awesome-luajit-git; }; # When applied, the unstable nixpkgs set (declared in the flake inputs) will