Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
dan = {
isNormalUser = true;
initialPassword = "pw123";
extraGroups = ["wheel" "docker" "video" "networkmanager"];
extraGroups = ["wheel" "docker" "i2c" "video" "networkmanager"];
packages = [pkgs.home-manager];
};
underdel = {
Expand Down
22 changes: 20 additions & 2 deletions hosts/DanPC/NixOS/hardware-configuration.nix
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,25 @@
"nvidia_uvm"
"nvidia_drm"
];
initrd.kernelModules = ["nvidia" "nvidia_modeset" "nvidia_uvm" "nvidia_drm"];
kernelModules = ["kvm-amd"];
initrd.kernelModules = [
"nvidia"
"nvidia_modeset"
"nvidia_uvm"
"nvidia_drm"
];
kernelModules = [
"kvm-amd"

# for OpenRGB https://github.com/NixOS/nixpkgs/issues/267915
"i2c-dev"
"i2c-piix4"
];
kernelParams = [
"nvidia_drm.fbdev=1"
"nvidia_drm.modeset=1"

# for OpenRGB https://github.com/NixOS/nixpkgs/issues/267915
"acpi_enforce_resources=lax"
];
extraModulePackages = [];
};
Expand Down Expand Up @@ -67,4 +81,8 @@

nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;

# for OpenRGB
hardware.i2c.enable = true;
services.hardware.openrgb.motherboard = "amd";
}
33 changes: 18 additions & 15 deletions hosts/configuration.nix
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,20 @@
};

mullvad-vpn.enable = true;

fprintd.enable = true;
pcscd.enable = true;
hardware.openrgb = {
enable = true;
package = pkgs.openrgb-with-all-plugins;
};
cron = {
enable = true;
systemCronJobs = [
# update nix index for comma every week
"0 0 * * 6 dan nix run 'nixpkgs#nix-index' --extra-experimental-features 'nix-command flakes' >> /tmp/update-comma-index.log"
];
};
};

location.provider = "geoclue2";
Expand Down Expand Up @@ -207,6 +221,10 @@
nix-output-monitor
minikube
amazon-ecr-credential-helper

# for openrgb
i2c-tools
liquidctl
];
};

Expand Down Expand Up @@ -245,13 +263,6 @@
};
};

services.fprintd.enable = true;
# services.fprintd.tod.enable = true;
#services.fprintd.tod.driver = pkgs.libfprint-2-tod1-goodix; # try this driver)
# services.fprintd.tod.driver = pkgs.libfprint-2-tod1-vfs0090; # or this one

services.pcscd.enable = true;

# Screen Sharing
xdg.portal = {
enable = true;
Expand All @@ -272,12 +283,4 @@
};
};
};

# update nix index for comma every week
services.cron = {
enable = true;
systemCronJobs = [
"0 0 * * 6 dan nix run 'nixpkgs#nix-index' --extra-experimental-features 'nix-command flakes' >> /tmp/update-comma-index.log"
];
};
}
44 changes: 33 additions & 11 deletions hosts/framnix/NixOS/hardware-configuration.nix
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,25 @@

boot = {
loader.grub.device = "/dev/nvme0n1";
initrd.availableKernelModules = ["xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod"];
initrd.availableKernelModules = [
"xhci_pci"
"thunderbolt"
"nvme"
"usb_storage"
"sd_mod"
];
kernelParams = [
# for OpenRGB https://github.com/NixOS/nixpkgs/issues/267915
"i2c-dev"
"i2c-piix4"
];
initrd.kernelModules = [];
kernelModules = ["kvm-intel"];
kernelModules = [
"kvm-intel"

# for OpenRGB https://github.com/NixOS/nixpkgs/issues/267915
"acpi_enforce_resources=lax"
];

# Framework Laptops have auto brightness detection which has to be disabled
# otherwise the brightness keys don't work
Expand Down Expand Up @@ -49,21 +65,27 @@

nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
powerManagement.cpuFreqGovernor = lib.mkDefault "performance";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;

nixpkgs.config.packageOverrides = pkgs: {
vaapiIntel = pkgs.vaapiIntel.override {enableHybridCodec = true;};
};

hardware.graphics = {
enable = true;
extraPackages = with pkgs; [
intel-media-driver # LIBVA_DRIVER_NAME=iHD
vaapiIntel # LIBVA_DRIVER_NAME=i965 (older but works better for Firefox/Chromium)
vaapiVdpau
libvdpau-va-gl
];
hardware = {
cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
graphics = {
enable = true;
extraPackages = with pkgs; [
intel-media-driver # LIBVA_DRIVER_NAME=iHD
vaapiIntel # LIBVA_DRIVER_NAME=i965 (older but works better for Firefox/Chromium)
vaapiVdpau
libvdpau-va-gl
];
};
# for OpenRGB
i2c.enable = true;
};

services.fwupd.enable = true;

services.hardware.openrgb.motherboard = "intel";
}
Loading