jopejoe1/nix-conf
1
0
Fork 0
mirror of https://codeberg.org/jopejoe1/nix-conf.git synced 2025-01-04 10:16:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

clean up kuraokami

Browse source
This commit is contained in:
Johannes Jöns 2024-07-10 22:12:06 +02:00
parent 54f12d97dd
commit d83c996009
2 changed files with 42 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
systems/kuraokami/default.nix
View file

@ -3,9 +3,9 @@
{ {
imports = [ imports = [
./hardware.nix ./hardware.nix
#nixos-hardware.nixosModules.common-cpu-intel nixos-hardware.nixosModules.common-cpu-intel
nixos-hardware.nixosModules.common-gpu-intel #nixos-hardware.nixosModules.common-gpu-intel
nixos-hardware.nixosModules.common-gpu-nvidia #nixos-hardware.nixosModules.common-gpu-nvidia
nixos-hardware.nixosModules.common-pc nixos-hardware.nixosModules.common-pc
nixos-hardware.nixosModules.common-hidpi nixos-hardware.nixosModules.common-hidpi
nixos-hardware.nixosModules.common-pc-ssd nixos-hardware.nixosModules.common-pc-ssd
@ -86,32 +86,46 @@
time.timeZone = "Europe/Berlin"; time.timeZone = "Europe/Berlin";
hardware = { hardware = {
opengl = { graphics = {
enable = true; enable = true;
driSupport32Bit = true; enable32Bit = true;
extraPackages = with pkgs; [ ];
extraPackages32 = with pkgs.pkgsi686Linux; [ ];
}; };
nvidia = { nvidia = {
package = config.boot.kernelPackages.nvidiaPackages.stable; #package = config.boot.kernelPackages.nvidiaPackages.stable;
modesetting.enable = true; #modesetting.enable = true;
}; };
gpgSmartcards.enable = true; gpgSmartcards.enable = true;
}; };
boot.kernelModules = [ "i2c-nct6775" ]; boot.kernelModules = [ "i2c-nct6775" ];
boot.kernelPackages = pkgs.linuxKernel.packages.linux_zen;
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
localPkgs.prismlauncher-withExtraStuff localPkgs.prismlauncher-withExtraStuff
mixxx mixxx
picard picard
goverlay goverlay
strawberry (strawberry-qt6.overrideAttrs (finalAttrs: previousAttrs: {
whatsapp-for-linux version = "1.1.0-rc3";
teams-for-linux src = fetchFromGitHub {
owner = "strawberrymusicplayer";
repo = "strawberry";
rev = "1.1.0-rc3";
hash = "sha256-4LhFxCi0ixMAjVaNVrQrLc0Vf1Z2dhnw6DTfTqtpiC4=";
};
buildInputs = previousAttrs.buildInputs ++ [
kdsingleapplication
gst_all_1.gst-plugins-rs
kdePackages.qtsvg
kdePackages.qtimageformats
];
}))
libreoffice-qt libreoffice-qt
webex
jitsi-meet-electron jitsi-meet-electron
thunderbird thunderbird
python3 vesktop
]; ];
programs = { programs = {
@ -138,4 +152,9 @@
++ map (x: "gccarch-${x}") (lib.systems.architectures.inferiors.alderlake or [ ]); ++ map (x: "gccarch-${x}") (lib.systems.architectures.inferiors.alderlake or [ ]);
boot.binfmt.emulatedSystems = [ "riscv64-linux" "aarch64-linux" ]; boot.binfmt.emulatedSystems = [ "riscv64-linux" "aarch64-linux" ];
programs.nix-ld = {
enable = true;
libraries = with pkgs; [ libz xz xorg.libX11 freetype zstd dbus ];
};
} }

22
systems/kuraokami/hardware.nix
View file

@ -6,25 +6,25 @@
{ {
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
hardware.nvidia.prime = { hardware.nvidia = {
offload.enable = false; open = true;
sync.enable = false; prime = {
offload.enable = false;
sync.enable = false;
# Bus ID of the Intel GPU. You can find it using lspci, either under 3D or VGA # Bus ID of the Intel GPU. You can find it using lspci, either under 3D or VGA
intelBusId = "PCI:0:2:0"; intelBusId = "PCI:0:2:0";
# Bus ID of the NVIDIA GPU. You can find it using lspci, either under 3D or VGA # Bus ID of the NVIDIA GPU. You can find it using lspci, either under 3D or VGA
nvidiaBusId = "PCI:1:0:0"; nvidiaBusId = "PCI:1:0:0";
};
}; };
boot.initrd.availableKernelModules = [ "vmd" "xhci_pci" "ahci" "nvme" "usbhid" "sd_mod" "sr_mod" ]; boot.initrd.availableKernelModules = [ "vmd" "xhci_pci" "ahci" "nvme" "usbhid" "sd_mod" "sr_mod" ];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ]; boot.kernelModules = [ "kvm-intel" "nouveau" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
zramSwap.enable = true;
fileSystems = { fileSystems = {
"/" = { "/" = {
device = "/dev/disk/by-uuid/ec151a68-5886-4747-b5e3-2f9bdb89e162"; device = "/dev/disk/by-uuid/ec151a68-5886-4747-b5e3-2f9bdb89e162";