这是indexloc提供的服务，不要输入任何密码
Skip to content

aaaaaa #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 17, 2022
Merged

aaaaaa #31

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 32 additions & 28 deletions sys/nix/configuration.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -17,28 +16,29 @@
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 {
url = "https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/snapshot/linux-master.tar.gz";
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";
};
Expand All @@ -57,7 +57,7 @@
];
};

environment.systemPackages = [pkgs.mySddmTheme];
environment.systemPackages = [ pkgs.mySddmTheme ];
services = {
gnome = {
glib-networking.enable = true;
Expand Down Expand Up @@ -90,7 +90,7 @@

windowManager.awesome.enable = true;

videoDrivers = ["nvidia"];
videoDrivers = [ "nvidia" ];
};

pipewire = {
Expand Down Expand Up @@ -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 = {
Expand All @@ -154,7 +158,7 @@
i2c.enable = true;
};

nix.settings.trusted-users = ["root" "marshall"];
nix.settings.trusted-users = [ "root" "marshall" ];

xdg.portal.enable = true;

Expand Down