diff --git a/hardware-configuration/fire.nix b/hardware-configuration/fire.nix index 19a497d..2442818 100644 --- a/hardware-configuration/fire.nix +++ b/hardware-configuration/fire.nix @@ -4,13 +4,12 @@ [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.loader.grub.useOSProber = true; hardware.enableRedistributableFirmware = true; hardware.enableAllFirmware = true; hardware.microsoft-surface.kernelVersion = "stable"; - boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usbhid" "usb_storage" "sd_mod" ]; + boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; @@ -32,5 +31,4 @@ nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; - virtualisation.hypervGuest.enable = true; } diff --git a/home-manager/wayland/quickshell.nix b/home-manager/wayland/quickshell.nix index 1957dcd..ca968a6 100644 --- a/home-manager/wayland/quickshell.nix +++ b/home-manager/wayland/quickshell.nix @@ -1,5 +1,7 @@ { pkgs, lib, quickshell-toki-night, ... }: -{ +let + quickshell = quickshell-toki-night.packages.${pkgs.stdenv.hostPlatform.system}.default; +in { systemd.user.services.quickshell = { Install.WantedBy = [ "graphical-session.target" ]; @@ -10,6 +12,6 @@ PartOf = [ "graphical-session.target" ]; }; - Service.ExecStart = lib.getExe quickshell-toki-night.packages.${pkgs.system}.default; + Service.ExecStart = lib.getExe quickshell; }; }