Add artemis & fix novideo stuff

This commit is contained in:
blahai 2025-01-12 21:11:42 +02:00
parent 5edcb857af
commit 452e600c5f
Signed by: blahai
SSH key fingerprint: SHA256:ZfCryi+V64yG+vC1ZIIsqgvBCmA31tTi7RJ6M8CvpRc
4 changed files with 48 additions and 15 deletions

View file

@ -5,13 +5,7 @@
...
}: let
inherit (config.olympus) device;
inherit
(lib.modules)
mkIf
mkMerge
mkDefault
;
inherit (lib.validators) isWayland;
inherit (lib.modules) mkIf mkMerge mkDefault;
isHybrid = device.gpu == "hybrid-nv";
in {
@ -21,8 +15,6 @@ in {
services.xserver = mkMerge [
{videoDrivers = ["nvidia"];}
# xorg settings
];
boot = {
@ -36,13 +28,10 @@ in {
environment = {
sessionVariables = mkMerge [
{LIBVA_DRIVER_NAME = "nvidia";}
(mkIf (isWayland config) {
# GBM_BACKEND = "nvidia-drm"; # breaks firefox apparently
{
LIBVA_DRIVER_NAME = "nvidia";
WLR_DRM_DEVICES = mkDefault "/dev/dri/card1";
})
}
];
systemPackages = builtins.attrValues {

View file

@ -0,0 +1,21 @@
{
imports = [
./hardware.nix
];
olympus = {
device = {
cpu = "amd";
gpu = "nvidia";
};
system = {
boot = {
loader = "systemd-boot";
loadRecommendedModules = true;
enableKernelTweaks = true;
initrd.enableTweaks = true;
plymouth.enable = false;
};
};
};
}

View file

@ -0,0 +1,17 @@
{
fileSystems = {
"/" = {
device = "/dev/disk/by-label/root";
fsType = "ext4";
options = ["auto"];
};
"/boot" = {
device = "/dev/disk/by-label/BOOT";
fsType = "vfat";
options = ["fmask=0022" "dmask=0022"];
};
};
swapDevices = [{device = "/dev/disk/by-label/swap";}];
}

View file

@ -56,6 +56,12 @@ in {
graphical
];
# Brothers desktop (will set up later)
artemis.modules = [
desktop
graphical
];
# Other desktop (will set up later)
aphrodite.modules = [
desktop