mirror of
https://github.com/blahai/nyx.git
synced 2025-01-18 19:10:21 +00:00
Add artemis & fix novideo stuff
This commit is contained in:
parent
5edcb857af
commit
452e600c5f
4 changed files with 48 additions and 15 deletions
|
@ -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 {
|
||||
|
|
21
systems/artemis/default.nix
Normal file
21
systems/artemis/default.nix
Normal 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;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
17
systems/artemis/hardware.nix
Normal file
17
systems/artemis/hardware.nix
Normal 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";}];
|
||||
}
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue