Add shared monitor configuration across window managers

- Define monitors option in hardware.nix with explicit dimensions
- Pass monitors to home-manager via extraSpecialArgs
- Update hyprland and sway to consume shared monitor config
- Removes hardcoded monitor definitions from WM modules
This commit is contained in:
Bryan Ramos 2026-03-08 15:25:59 -04:00
parent 2be7ed502c
commit d1144e96d3
Signed by: bryan
GPG key ID: 6ABDCD144D6643C8
4 changed files with 111 additions and 73 deletions

View file

@ -1,76 +1,100 @@
{ config, lib, pkgs, modulesPath, ... }: { config, lib, pkgs, modulesPath, ... }:
with lib;
{ {
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
boot = { options.monitors = mkOption {
initrd = { type = types.listOf (types.submodule {
availableKernelModules = [ "vmd" "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ]; options = {
kernelModules = [ "dm-snapshot" ]; name = mkOption { type = types.str; example = "HDMI-A-1"; };
}; width = mkOption { type = types.int; };
extraModulePackages = [ ]; height = mkOption { type = types.int; };
kernelPackages = pkgs.linuxPackages_zen; x = mkOption { type = types.int; };
kernelParams = [ "intel_iommu=on" ]; y = mkOption { type = types.int; };
kernelModules = [ "kvm-intel" "virtio" "vfio-pci" "coretemp" ]; scale = mkOption { type = types.float; };
refreshRate = mkOption { type = types.int; };
};
});
default = [];
description = "System monitor configuration";
}; };
environment.systemPackages = with pkgs; [ config = {
linuxHeaders monitors = [
{ name = "HDMI-A-1"; width = 1920; height = 1080; x = 0; y = 0; scale = 1.0; refreshRate = 60; }
{ name = "DP-1"; width = 1920; height = 1080; x = 1920; y = 0; scale = 1.0; refreshRate = 60; }
];
vulkan-headers boot = {
vulkan-loader initrd = {
vulkan-tools availableKernelModules = [ "vmd" "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
vulkan-extension-layer kernelModules = [ "dm-snapshot" ];
};
mesa extraModulePackages = [ ];
mesa-demos kernelPackages = pkgs.linuxPackages_zen;
kernelParams = [ "intel_iommu=on" ];
cudaPackages.cudatoolkit kernelModules = [ "kvm-intel" "virtio" "vfio-pci" "coretemp" ];
cudaPackages.cudnn
];
fileSystems = {
"/" = {
device = "/dev/disk/by-uuid/495f5e7b-d9e4-4663-88c5-7021e7292535";
fsType = "ext4";
}; };
"/home" = { environment.systemPackages = with pkgs; [
device = "/dev/disk/by-uuid/cd0e5c29-716d-47f2-92f4-46ee9fca5af3"; linuxHeaders
fsType = "ext4";
};
"/boot" = { vulkan-headers
device = "/dev/disk/by-uuid/C061-EE77"; vulkan-loader
fsType = "vfat"; vulkan-tools
}; vulkan-extension-layer
};
hardware = { mesa
cpu = { mesa-demos
intel = {
updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; cudaPackages.cudatoolkit
cudaPackages.cudnn
];
fileSystems = {
"/" = {
device = "/dev/disk/by-uuid/495f5e7b-d9e4-4663-88c5-7021e7292535";
fsType = "ext4";
};
"/home" = {
device = "/dev/disk/by-uuid/cd0e5c29-716d-47f2-92f4-46ee9fca5af3";
fsType = "ext4";
};
"/boot" = {
device = "/dev/disk/by-uuid/C061-EE77";
fsType = "vfat";
}; };
}; };
nvidia = {
open = true; hardware = {
modesetting.enable = true; cpu = {
nvidiaSettings = true; intel = {
package = config.boot.kernelPackages.nvidiaPackages.stable; updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
};
};
nvidia = {
open = true;
modesetting.enable = true;
nvidiaSettings = true;
package = config.boot.kernelPackages.nvidiaPackages.stable;
};
graphics = {
enable = true;
enable32Bit = true;
};
}; };
graphics = {
virtualisation.libvirtd = {
enable = true; enable = true;
enable32Bit = true; qemu = {
runAsRoot = true;
};
}; };
};
virtualisation.libvirtd = { nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
enable = true; powerManagement.cpuFreqGovernor = lib.mkDefault "performance";
qemu = {
runAsRoot = true;
};
}; };
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
powerManagement.cpuFreqGovernor = lib.mkDefault "performance";
} }

View file

@ -3,6 +3,9 @@
{ {
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = {
monitors = config.monitors;
};
home-manager.users.${config.user.name} = { home-manager.users.${config.user.name} = {
imports = [ ../../../../../user ]; imports = [ ../../../../../user ];

View file

@ -1,4 +1,4 @@
{ pkgs, lib, config, ... }: { pkgs, lib, config, monitors ? [], ... }:
with lib; with lib;
let let
@ -9,6 +9,9 @@ let
sha256 = "1ph5m9s57076jx6042iipqx2ifzadmd5z4lf5l49wgq4jb92mp16"; sha256 = "1ph5m9s57076jx6042iipqx2ifzadmd5z4lf5l49wgq4jb92mp16";
}; };
toHyprlandMonitor = m:
"${m.name}, ${toString m.width}x${toString m.height}@${toString m.refreshRate}, ${toString m.x}x${toString m.y}, ${toString m.scale}";
in in
{ options.modules.user.gui.wm.hyprland = { enable = mkEnableOption "Enable Hyprland WM"; }; { options.modules.user.gui.wm.hyprland = { enable = mkEnableOption "Enable Hyprland WM"; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
@ -21,10 +24,9 @@ in
"$terminal" = "${pkgs.alacritty}/bin/alacritty"; "$terminal" = "${pkgs.alacritty}/bin/alacritty";
"$menu" = "rofi -show drun -show-icons -drun-icon-theme Qogir -font 'Noto Sans 14'"; "$menu" = "rofi -show drun -show-icons -drun-icon-theme Qogir -font 'Noto Sans 14'";
monitor = [ monitor = if monitors != []
"HDMI-A-1, 1920x1080, 0x0, 1" then map toHyprlandMonitor monitors
"DP-1, 1920x1080, 1920x0, 1" else [ ", preferred, auto, 1" ];
];
exec-once = [ exec-once = [
"waybar" "waybar"

View file

@ -1,4 +1,4 @@
{ pkgs, lib, config, ... }: { pkgs, lib, config, monitors ? [], ... }:
with lib; with lib;
let let
@ -17,6 +17,21 @@ let
done done
''; '';
toSwayOutput = m: {
"${m.name}" = {
resolution = "${toString m.width}x${toString m.height}@${toString m.refreshRate}Hz";
position = "${toString m.x} ${toString m.y}";
scale = toString m.scale;
bg = "${wallpaper} fill";
};
};
outputConfig = if monitors != []
then lib.mkMerge (map toSwayOutput monitors)
else {
"*" = { bg = "${wallpaper} fill"; };
};
in in
{ options.modules.user.gui.wm.sway = { enable = mkEnableOption "Enable Sway WM"; }; { options.modules.user.gui.wm.sway = { enable = mkEnableOption "Enable Sway WM"; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
@ -37,13 +52,7 @@ in
names = [ "Terminus" ]; names = [ "Terminus" ];
}; };
output = { output = outputConfig;
DP-2 = {
resolution = "3440x1440@59.973Hz";
position = "0,0";
bg = "${wallpaper} fill";
};
};
modifier = "Mod1"; modifier = "Mod1";
menu = "rofi -show drun -show-icons -drun-icon-theme Qogir -font 'Noto Sans 14'"; menu = "rofi -show drun -show-icons -drun-icon-theme Qogir -font 'Noto Sans 14'";
terminal = "${pkgs.alacritty}/bin/alacritty"; terminal = "${pkgs.alacritty}/bin/alacritty";