mirror of
https://github.com/kaesaecracker/nixos-configuration.git
synced 2025-01-18 18:40:14 +01:00
lp2 config
This commit is contained in:
parent
0ce50fb0de
commit
b3f1de1a7d
|
@ -29,15 +29,7 @@ in {
|
||||||
mangohud
|
mangohud
|
||||||
vulkan-tools
|
vulkan-tools
|
||||||
glxinfo
|
glxinfo
|
||||||
|
lutris
|
||||||
(lutris.override {
|
|
||||||
extraPkgs = pkgs: [
|
|
||||||
# List package dependencies here
|
|
||||||
];
|
|
||||||
extraLibraries = pkgs: [
|
|
||||||
# List library dependencies here
|
|
||||||
];
|
|
||||||
})
|
|
||||||
];
|
];
|
||||||
|
|
||||||
programs = {
|
programs = {
|
||||||
|
|
|
@ -25,6 +25,7 @@ in {
|
||||||
caffeine
|
caffeine
|
||||||
appindicator
|
appindicator
|
||||||
gsconnect
|
gsconnect
|
||||||
|
battery-health-charging
|
||||||
]);
|
]);
|
||||||
|
|
||||||
dconf.settings = {
|
dconf.settings = {
|
||||||
|
|
|
@ -9,6 +9,7 @@ in {
|
||||||
options.my.hardware.intel = {
|
options.my.hardware.intel = {
|
||||||
cpu = lib.mkEnableOption "intel cpu";
|
cpu = lib.mkEnableOption "intel cpu";
|
||||||
iGpu = lib.mkEnableOption "intel integrated gpu";
|
iGpu = lib.mkEnableOption "intel integrated gpu";
|
||||||
|
xe = lib.mkEnableOption "intel xe gpu";
|
||||||
};
|
};
|
||||||
|
|
||||||
config = lib.mkMerge [
|
config = lib.mkMerge [
|
||||||
|
@ -35,5 +36,18 @@ in {
|
||||||
nvtop-intel
|
nvtop-intel
|
||||||
];
|
];
|
||||||
})
|
})
|
||||||
|
(lib.mkIf cfg.xe {
|
||||||
|
hardware.opengl = {
|
||||||
|
extraPackages = with pkgs; [
|
||||||
|
intel-media-driver
|
||||||
|
vaapiIntel
|
||||||
|
vaapiVdpau
|
||||||
|
libvdpau-va-gl
|
||||||
|
];
|
||||||
|
};
|
||||||
|
environment.systemPackages = with pkgs; [
|
||||||
|
nvtop-intel
|
||||||
|
];
|
||||||
|
})
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,40 +1,35 @@
|
||||||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
{...}: {
|
||||||
# and may be overwritten by future invocations. Please make changes
|
config = {
|
||||||
# to /etc/nixos/configuration.nix instead.
|
my.hardware = {
|
||||||
{ config, lib, pkgs, modulesPath, ... }:
|
enableCommonDesktopSettings = true;
|
||||||
|
intel = {
|
||||||
{
|
cpu = true;
|
||||||
imports =
|
xe = true;
|
||||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
};
|
||||||
];
|
|
||||||
|
|
||||||
boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" ];
|
|
||||||
boot.initrd.kernelModules = [ ];
|
|
||||||
boot.kernelModules = [ "kvm-intel" ];
|
|
||||||
boot.extraModulePackages = [ ];
|
|
||||||
|
|
||||||
fileSystems."/" =
|
|
||||||
{ device = "/dev/disk/by-uuid/e4dad0c8-26a1-45e9-bbd9-48565eb6574e";
|
|
||||||
fsType = "btrfs";
|
|
||||||
options = [ "subvol=@" ];
|
|
||||||
};
|
};
|
||||||
|
|
||||||
boot.initrd.luks.devices."luks-2c654ff2-3c42-48d3-a1e3-9545679afaa3".device = "/dev/disk/by-uuid/2c654ff2-3c42-48d3-a1e3-9545679afaa3";
|
boot.initrd = {
|
||||||
|
availableKernelModules = ["xhci_pci" "thunderbolt" "nvme"];
|
||||||
fileSystems."/boot" =
|
luks.devices = {
|
||||||
{ device = "/dev/disk/by-uuid/E2B7-2BC1";
|
"luks-2c654ff2-3c42-48d3-a1e3-9545679afaa3" = {
|
||||||
fsType = "vfat";
|
device = "/dev/disk/by-uuid/2c654ff2-3c42-48d3-a1e3-9545679afaa3";
|
||||||
|
};
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
swapDevices = [ ];
|
fileSystems = {
|
||||||
|
"/" = {
|
||||||
|
device = "/dev/disk/by-uuid/e4dad0c8-26a1-45e9-bbd9-48565eb6574e";
|
||||||
|
fsType = "btrfs";
|
||||||
|
options = ["subvol=@"];
|
||||||
|
};
|
||||||
|
|
||||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
"/boot" = {
|
||||||
# (the default) this is the recommended approach. When using systemd-networkd it's
|
device = "/dev/disk/by-uuid/E2B7-2BC1";
|
||||||
# still possible to use this option, but it's recommended to use it in conjunction
|
fsType = "vfat";
|
||||||
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
|
};
|
||||||
networking.useDHCP = lib.mkDefault true;
|
};
|
||||||
# networking.interfaces.wlo1.useDHCP = lib.mkDefault true;
|
|
||||||
|
|
||||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
swapDevices = [];
|
||||||
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
lib,
|
lib,
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
unstable-commit-sha = "e92039b55bcd58469325ded85d4f58dd5a4eaf58";
|
unstable-commit-sha = "e92b6015881907e698782c77641aa49298330223";
|
||||||
ultrastable-commit-sha = "5de0b32be6e85dc1a9404c75131316e4ffbc634c";
|
ultrastable-commit-sha = "5de0b32be6e85dc1a9404c75131316e4ffbc634c";
|
||||||
in {
|
in {
|
||||||
options.my.allowUnfreePackages = lib.mkOption {
|
options.my.allowUnfreePackages = lib.mkOption {
|
||||||
|
|
Loading…
Reference in a new issue