lytedev/nix
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/main'

Browse source
This commit is contained in:
Daniel Flanagan 2023-10-25 11:07:45 -05:00
commit 8a2e78dfba
Signed by: lytedev
GPG key ID: 5B2020A0F9921EF4
3 changed files with 19 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
flake.lock
View file

@ -321,11 +321,11 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1697456312, "lastModified": 1697723726,
"narHash": "sha256-roiSnrqb5r+ehnKCauPLugoU8S36KgmWraHgRqVYndo=", "narHash": "sha256-SaTWPkI8a5xSHX/rrKzUe+/uVNy6zCGMXgoeMb7T9rg=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ca012a02bf8327be9e488546faecae5e05d7d749", "rev": "7c9cc5a6e5d38010801741ac830a3f8fd667a7a0",
"type": "github" "type": "github"
}, },
"original": { "original": {

28
nixos/foxtrot/default.nix
View file

@ -26,8 +26,6 @@
inputs.hardware.nixosModules.common-pc-laptop-ssd inputs.hardware.nixosModules.common-pc-laptop-ssd
]; ];
nixpkgs.overlays = [outputs.overlays.modifications];
# TODO: hibernation? does sleep suffice? # TODO: hibernation? does sleep suffice?
# TODO: perform a hardware scan # TODO: perform a hardware scan
@ -36,6 +34,7 @@
efi.canTouchEfiVariables = true; efi.canTouchEfiVariables = true;
systemd-boot.enable = true; systemd-boot.enable = true;
}; };
kernelPackages = pkgs.linuxPackages_6_5;
kernelParams = ["amdgpu.sg_display=0"]; kernelParams = ["amdgpu.sg_display=0"];
initrd.availableKernelModules = ["xhci_pci" "nvme" "thunderbolt"]; initrd.availableKernelModules = ["xhci_pci" "nvme" "thunderbolt"];
kernelModules = ["kvm-amd"]; kernelModules = ["kvm-amd"];
@ -43,22 +42,23 @@
hardware.bluetooth.enable = true; hardware.bluetooth.enable = true;
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
services.printing.enable = true; services.printing.enable = true;
services.power-profiles-daemon.enable = false;
services.tlp = {
enable = true;
settings = {
CPU_SCALING_GOVERNOR_ON_AC = "performance";
CPU_SCALING_GOVERNOR_ON_BAT = "powersave";
boot.supportedFilesystems = CPU_ENERGY_PERF_POLICY_ON_BAT = "power";
pkgs.lib.mkForce ["btrfs" "cifs" "f2fs" "jfs" "ntfs" "reiserfs" "vfat" "xfs"]; CPU_ENERGY_PERF_POLICY_ON_AC = "performance";
boot.kernelPackages = pkgs.linuxPackagesFor ( CPU_MIN_PERF_ON_AC = 0;
pkgs.linux_6_5.override { CPU_MAX_PERF_ON_AC = 100;
argsOverride = { CPU_MIN_PERF_ON_BAT = 0;
src = pkgs.fetchurl { CPU_MAX_PERF_ON_BAT = 20;
url = "https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.5.7.tar.xz";
sha256 = "sha256-DQnqRIAFyc/lOD5Mcqhys5GIuSj4xE4UawOxt4Ufu4w=";
}; };
version = "6.5.7";
modDirVersion = "6.5.7";
}; };
} powerManagement.powertop.enable = true;
);
networking = { networking = {
firewall = { firewall = {

4
overlays/default.nix
View file

@ -6,10 +6,6 @@
# You can change versions, add patches, set compilation flags, anything really. # You can change versions, add patches, set compilation flags, anything really.
# https://nixos.wiki/wiki/Overlays # https://nixos.wiki/wiki/Overlays
modifications = final: prev: { modifications = final: prev: {
linux_6_5 = prev.linux_6_5.override {
patches = [];
kernelPatches = [];
};
}; };
# When applied, the unstable nixpkgs set (declared in the flake inputs) will # When applied, the unstable nixpkgs set (declared in the flake inputs) will