From 90eb3e45303dc72a590fdfc69ea247d4c3bbec61 Mon Sep 17 00:00:00 2001 From: uttarayan21 Date: Fri, 5 Apr 2024 20:38:38 +0530 Subject: [PATCH] feat(device): add monitors to device --- flake.nix | 8 ++++++++ linux/hyprland.nix | 30 +++++++++++++++--------------- linux/ironbar/default.nix | 4 ++-- 3 files changed, 25 insertions(+), 17 deletions(-) diff --git a/flake.nix b/flake.nix index 8320f55b..b5c4d1e7 100644 --- a/flake.nix +++ b/flake.nix @@ -98,6 +98,10 @@ system = "x86_64-linux"; user = "servius"; isNix = true; + monitors = { + primary = "DP-1"; + secondary = "DP-4"; + }; } { name = "genzai"; @@ -135,6 +139,10 @@ if (builtins.hasAttr "hasGui" device) then device.hasGui else true; + monitors = + if (builtins.hasAttr "monitors" device) + then device.monitors + else null; system = device.system; name = device.name; user = device.user; diff --git a/linux/hyprland.nix b/linux/hyprland.nix index fa8a2348..74404cf1 100644 --- a/linux/hyprland.nix +++ b/linux/hyprland.nix @@ -14,8 +14,8 @@ systemd.target = "hyprland-session.target"; settings.preload = wallpapers.all; settings.wallpapers = { - "DP-3" = wallpapers.skull; - "DP-1" = wallpapers.frieren_3; + "${device.monitors.primary}" = wallpapers.skull; + "${device.monitors.secondary}" = wallpapers.frieren_3; }; }; programs.hyprlock = { @@ -28,8 +28,8 @@ source = "${pkgs.catppuccinThemes.hyprland}/themes/mocha.conf"; monitor = [ ",preferred,auto,auto" - "DP-3, 2560x1440@170, 0x0, 1, transform, 0" - "DP-1, 2560x1440@170, -1440x-800,1, transform, 1" + "${device.monitors.primary}, 2560x1440@170, 0x0, 1, transform, 0" + "${device.monitors.secondary}, 2560x1440@170, -1440x-800,1, transform, 1" ",highrr,auto,1" ]; @@ -226,18 +226,18 @@ "$mainMod, mouse:272, movewindow" "$mainMod, mouse:273, resizewindow" ]; - + # ${device.monitors.primary} workspace = [ - "1, monitor:DP-3" - "2, monitor:DP-3" - "3, monitor:DP-3" - "4, monitor:DP-3" - "5, monitor:DP-3" - "6, monitor:DP-3" - "7, monitor:DP-3" - "8, monitor:DP-1" - "9, monitor:DP-1" - "10, monitor:DP-1" + "1, monitor:${device.monitors.primary}" + "2, monitor:${device.monitors.primary}" + "3, monitor:${device.monitors.primary}" + "4, monitor:${device.monitors.primary}" + "5, monitor:${device.monitors.primary}" + "6, monitor:${device.monitors.primary}" + "7, monitor:${device.monitors.primary}" + "8, monitor:${device.monitors.secondary}" + "9, monitor:${device.monitors.secondary}" + "10, monitor:${device.monitors.secondary}" ]; }; }; diff --git a/linux/ironbar/default.nix b/linux/ironbar/default.nix index 42998c3d..538209f1 100644 --- a/linux/ironbar/default.nix +++ b/linux/ironbar/default.nix @@ -8,7 +8,7 @@ programs.ironbar = { enable = device.hasGui; config.monitors = { - DP-1 = { + "${device.monitors.secondary}" = { position = "bottom"; start = [ { @@ -33,7 +33,7 @@ {type = "clock";} ]; }; - DP-3 = { + "${device.monitors.primary}" = { position = "bottom"; icon_theme = "Papirus-Dark"; end = [