diff --git a/sys/nix/configuration.nix b/sys/nix/configuration.nix index 426e03b..f8e0394 100644 --- a/sys/nix/configuration.nix +++ b/sys/nix/configuration.nix @@ -1,10 +1,9 @@ -{ - inputs, - config, - pkgs, - ... +{ inputs +, config +, pkgs +, ... }: { - disabledModules = ["services/hardware/udev.nix"]; + disabledModules = [ "services/hardware/udev.nix" ]; imports = [ ./hardware-configuration.nix ../generic.nix @@ -17,14 +16,15 @@ efi.canTouchEfiVariables = true; }; # kernelPackages = pkgs.linuxPackages_zen; - kernelPackages = let - linux_six_pkg = { - fetchurl, - buildLinux, - ... - } @ args: - buildLinux (args - // rec { + kernelPackages = + let + linux_six_pkg = + { fetchurl + , buildLinux + , ... + } @ args: + buildLinux (args + // rec { version = "6.0.0-rc1"; modDirVersion = version; src = fetchurl { @@ -32,13 +32,13 @@ sha256 = "b7273835119dced6d9b5f9378ea43da275968e1142c78c3e3e3484c57b0b7cdd"; }; - kernelPatches = []; + kernelPatches = [ ]; extraMeta.branch = "master"; } - // (args.argsOverride or {})); - linux_six = pkgs.callPackage linux_six_pkg {}; - in + // (args.argsOverride or { })); + linux_six = pkgs.callPackage linux_six_pkg { }; + in pkgs.recurseIntoAttrs (pkgs.linuxPackagesFor linux_six); extraModprobeConfig = "options hid_apple fnmode=1"; }; @@ -57,7 +57,7 @@ ]; }; - environment.systemPackages = [pkgs.mySddmTheme]; + environment.systemPackages = [ pkgs.mySddmTheme ]; services = { gnome = { glib-networking.enable = true; @@ -90,7 +90,7 @@ windowManager.awesome.enable = true; - videoDrivers = ["nvidia"]; + videoDrivers = [ "nvidia" ]; }; pipewire = { @@ -138,13 +138,17 @@ hardware = { nvidia = { - package = { - open = config.boot.kernelPackages.nvidia_x11.open.overrideAttrs (old: { - useProfiles = true; - }); - passthru.outPath = "lol"; - type = "derivation"; - }; + package = + let + p = config.boot.kernelPackages.nvidia_x11; + in + rec { + open = p.open.overrideAttrs (old: { }); + bin = open; + out = open.out; + inherit (p) settings useProfiles; + type = "derivation"; + }; modesetting.enable = true; }; opengl = { @@ -154,7 +158,7 @@ i2c.enable = true; }; - nix.settings.trusted-users = ["root" "marshall"]; + nix.settings.trusted-users = [ "root" "marshall" ]; xdg.portal.enable = true;