✨ Monitor specific configs in hosts

hosts/desktop/common.nix

@@ -0,0 +1,4 @@
+{
+  monitor1 = "DP-1";
+  monitor2 = "DP-3";
+}

hosts/desktop/home-manager/default.nix

@@ -6,6 +6,8 @@
 {
   imports = [
     (lib.custom.relativeToRoot "shared/home-manager")
+    ./hyprpaper.nix
+    ./settings.nix
   ];
 
   programs.git.signing.key = "706F53DD087A91DE";

hosts/desktop/home-manager/hyprpaper.nix

@@ -0,0 +1,29 @@
+# Wallpapers
+{
+  lib,
+  theme,
+  ...
+}:
+
+{
+  services.hyprpaper.settings =
+    let
+      wallpaper1 = builtins.toString theme.wallpaper.monitor1;
+      wallpaper2 = builtins.toString theme.wallpaper.monitor2;
+    in
+    {
+      preload = lib.mkDefault [
+        wallpaper1
+        wallpaper2
+      ];
+
+      wallpaper =
+        let
+          common = import ../common.nix;
+        in
+        lib.mkDefault [
+          "${common.monitor1},${wallpaper1}"
+          "${common.monitor2},${wallpaper2}"
+        ];
+    };
+}

hosts/desktop/home-manager/settings.nix

@@ -0,0 +1,12 @@
+{ lib, ... }:
+
+{
+  wayland.windowManager.hyprland.settings.monitor =
+    let
+      common = import ../common.nix;
+    in
+    lib.mkForce [
+      "${common.monitor1}, 3440x1440@175, 0x0, 1"
+      "${common.monitor2}, 3840x2160@60, 3440x0, 1.5, transform, 1"
+    ];
+}

hosts/thinkpad/common.nix

@@ -1,25 +1,4 @@
-rec {
+{
-  default = {
+  # Empty matches all monitors
-    browser = "zen";
-    calculator = "gnome-calculator";
-    fileManager = "nautilus";
-    imageViewer = "loupe";
-    lockScreen = "hyprlock";
-    terminal = "kitty";
-  };
-
-  dir = {
-    home = "/home/${username}";
-    pictures = "${dir.home}/Pictures";
-  };
-
-  keymaps = {
-    layout = "gb,no";
-    options = "grp:alt_shift_toggle"; # Toggle using ALT + SHIFT
-  };
-
-  # Empty matches all
   monitor1 = "";
-
-  username = "martin";
 }

hosts/thinkpad/home-manager/hyprland/hyprpaper.nix

@@ -1,23 +0,0 @@
-# Wallpapers
-{
-  lib,
-  theme,
-  common,
-  ...
-}:
-
-{
-  services.hyprpaper.settings =
-    let
-      monitor1 = builtins.toString theme.wallpaper.monitor1;
-    in
-    {
-      preload = lib.mkDefault [
-        monitor1
-      ];
-
-      wallpaper = lib.mkDefault [
-        "${common.monitor1},${monitor1}"
-      ];
-    };
-}

hosts/thinkpad/home-manager/hyprland/settings.nix

@@ -1,12 +1,15 @@
 {
   lib,
-  common,
   ...
 }:
 
 {
   wayland.windowManager.hyprland.settings = {
-    monitor = lib.mkDefault [
+    monitor =
+      let
+        common = import ../common.nix;
+      in
+      lib.mkForce [
         "${common.monitor1}, 1920x1080@60.05, 0x0, 1"
       ];
 

shared/common.nix

@@ -18,10 +18,6 @@ rec {
     options = "grp:alt_shift_toggle"; # Toggle using ALT + SHIFT
   };
 
-  # Empty matches all
-  monitor1 = "DP-1";
-  monitor2 = "DP-3";
-
   username = "martin";
 
   root = ../.;

shared/home-manager/hyprland/default.nix

@@ -1,4 +1,4 @@
-# Home configurations for Hyprland. For system configs, see ./modules/hyprland
+# Home configurations for Hyprland. For system configs, see ./shared/modules/hyprland
 {
   imports = [
     ./binds.nix

shared/home-manager/hyprland/hyprpaper.nix

@@ -1,7 +1,6 @@
 # Wallpapers
 {
   pkgs,
-  common,
   theme,
   ...
 }:
@@ -13,8 +12,7 @@
     enable = true;
     settings =
       let
-        monitor1 = builtins.toString theme.wallpaper.monitor1;
+        defaultWallpaper = builtins.toString theme.wallpaper.default;
-        monitor2 = builtins.toString theme.wallpaper.monitor2;
       in
       {
         ipc = "on";
@@ -22,13 +20,11 @@
         splash_offset = 2.0;
 
         preload = [
-          monitor1
+          defaultWallpaper
-          monitor2
         ];
 
         wallpaper = [
-          "${common.monitor1},${monitor1}"
+          ",${defaultWallpaper}"
-          "${common.monitor2},${monitor2}"
         ];
       };
   };

shared/home-manager/hyprland/settings.nix

@@ -10,8 +10,7 @@ in
 {
   wayland.windowManager.hyprland.settings = {
     monitor = [
-      "${common.monitor1}, 3440x1440@175, 0x0, 1"
+      ", preferred, auto, 1"
-      "${common.monitor2}, 3840x2160@60, 3440x0, 1.5, transform, 1"
     ];
 
     # Autostart

shared/theme.nix

@@ -5,8 +5,9 @@ rec {
 
   nerdFont = "JetBrainsMono";
 
-  wallpaper = {
+  wallpaper = rec {
     lockscreen = ./assets/catppuccin_page_curl.png;
+    default = monitor1;
     monitor1 = ./assets/nixos_waves.png;
     monitor2 = ./assets/ekg_v2.png;
   };