diff --git a/modules/desktop/addons/hypridle.nix b/modules/desktop/addons/hypridle.nix
index 7d7121c..94c7ea6 100644
--- a/modules/desktop/addons/hypridle.nix
+++ b/modules/desktop/addons/hypridle.nix
@@ -1,27 +1,29 @@
 {
   flake.modules.homeManager.cholli =
-    { ... }:
+    { lib, osConfig, ... }:
     {
-      services.hypridle = {
-        enable = true;
-        settings = {
-          general = {
-            after_sleep_cmd = "hyprctl dispatch dpms on";
-            ignore_dbus_inhibit = false;
-            lock_cmd = "hyprlock-blur";
-          };
+      config = lib.mkIf (osConfig.networking.hostName == "yggdrasil") {
+        services.hypridle = {
+          enable = true;
+          settings = {
+            general = {
+              after_sleep_cmd = "hyprctl dispatch dpms on";
+              ignore_dbus_inhibit = false;
+              lock_cmd = "hyprlock-blur";
+            };
 
-          listener = [
-            {
-              timeout = 600;
-              on-timeout = "loginctl lock-session";
-            }
-            {
-              timeout = 1200;
-              on-timeout = "hyprctl dispatch dpms off";
-              on-resume = "hyprctl dispatch dpms on";
-            }
-          ];
+            listener = [
+              {
+                timeout = 600;
+                on-timeout = "loginctl lock-session";
+              }
+              {
+                timeout = 1200;
+                on-timeout = "hyprctl dispatch dpms off";
+                on-resume = "hyprctl dispatch dpms on";
+              }
+            ];
+          };
         };
       };
     };
diff --git a/modules/desktop/addons/hyprlock.nix b/modules/desktop/addons/hyprlock.nix
index 3ceb547..fda7404 100644
--- a/modules/desktop/addons/hyprlock.nix
+++ b/modules/desktop/addons/hyprlock.nix
@@ -25,91 +25,99 @@
       };
 
     homeManager.cholli =
-      { inputs, pkgs, ... }:
+      {
+        inputs,
+        lib,
+        pkgs,
+        osConfig,
+        ...
+      }:
       let
         hyprlock-package = inputs.hyprlock.packages.${pkgs.system}.hyprlock;
       in
       {
-        programs.hyprlock = {
-          enable = true;
-          package = hyprlock-package;
-          settings = {
-            # inspiration from https://github.com/justinmdickey/publicdots/blob/main/.config/hypr/hyprlock.conf
-            background = [
-              {
+        config = lib.mkIf (osConfig.networking.hostName == "yggdrasil") {
+          programs.hyprlock = {
+            enable = true;
+            package = hyprlock-package;
+            settings = {
+              # inspiration from https://github.com/justinmdickey/publicdots/blob/main/.config/hypr/hyprlock.conf
+              background = [
+                {
+                  monitor = "DP-1";
+                  path = "/tmp/screenshot1.png";
+
+                  blur_passes = 1; # 0 disables blurring
+                  blur_size = 7;
+                  noise = 1.17e-2;
+                }
+                {
+                  monitor = "HDMI-A-1";
+                  path = "/tmp/screenshot2.png";
+
+                  blur_passes = 2; # 0 disables blurring
+                  blur_size = 7;
+                  noise = 1.17e-2;
+                }
+              ];
+
+              label = [
+                {
+                  monitor = "DP-1";
+                  text = "$TIME";
+                  color = "rgba(242, 243, 244, 0.75)";
+                  font_size = 95;
+                  font_family = "JetBrains Mono";
+                  position = "0, 300";
+                  halign = "center";
+                  valign = "center";
+                }
+                {
+
+                  monitor = "DP-1";
+                  text = ''cmd[update:1000] echo $(date +"%A, %B %d")'';
+                  color = "rgba(242, 243, 244, 0.75)";
+                  font_size = 22;
+                  font_family = "JetBrains Mono";
+                  position = "0, 200";
+                  halign = "center";
+                  valign = "center";
+
+                }
+              ];
+
+              image = {
                 monitor = "DP-1";
-                path = "/tmp/screenshot1.png";
+                path = "/home/cholli/Pictures/profile.png";
 
-                blur_passes = 1; # 0 disables blurring
-                blur_size = 7;
-                noise = 1.17e-2;
-              }
-              {
-                monitor = "HDMI-A-1";
-                path = "/tmp/screenshot2.png";
-
-                blur_passes = 2; # 0 disables blurring
-                blur_size = 7;
-                noise = 1.17e-2;
-              }
-            ];
-
-            label = [
-              {
-                monitor = "DP-1";
-                text = "$TIME";
-                color = "rgba(242, 243, 244, 0.75)";
-                font_size = 95;
-                font_family = "JetBrains Mono";
-                position = "0, 300";
+                position = "0, 50";
                 halign = "center";
                 valign = "center";
-              }
-              {
+              };
 
+              input-field = {
                 monitor = "DP-1";
-                text = ''cmd[update:1000] echo $(date +"%A, %B %d")'';
-                color = "rgba(242, 243, 244, 0.75)";
-                font_size = 22;
-                font_family = "JetBrains Mono";
-                position = "0, 200";
+                size = "200,50";
+                outline_thickness = 2;
+                dots_size = 0.2; # Scale of input-field height, 0.2 - 0.8
+                dots_spacing = 0.35; # Scale of dots' absolute size, 0.0 - 1.0
+                dots_center = true;
+                outer_color = "rgba(0, 0, 0, 0)";
+                inner_color = "rgba(0, 0, 0, 0.2)";
+                font_color = "rgb(111, 45, 104)";
+                fade_on_empty = false;
+                rounding = -1;
+                check_color = "rgb(30, 107, 204)";
+                placeholder_text = ''<i><span foreground="##cdd6f4">Input Password...</span></i>'';
+                hide_input = false;
+                position = "0, -100";
                 halign = "center";
                 valign = "center";
+              };
 
-              }
-            ];
-
-            image = {
-              monitor = "DP-1";
-              path = "/home/cholli/Pictures/profile.png";
-
-              position = "0, 50";
-              halign = "center";
-              valign = "center";
-            };
-
-            input-field = {
-              monitor = "DP-1";
-              size = "200,50";
-              outline_thickness = 2;
-              dots_size = 0.2; # Scale of input-field height, 0.2 - 0.8
-              dots_spacing = 0.35; # Scale of dots' absolute size, 0.0 - 1.0
-              dots_center = true;
-              outer_color = "rgba(0, 0, 0, 0)";
-              inner_color = "rgba(0, 0, 0, 0.2)";
-              font_color = "rgb(111, 45, 104)";
-              fade_on_empty = false;
-              rounding = -1;
-              check_color = "rgb(30, 107, 204)";
-              placeholder_text = ''<i><span foreground="##cdd6f4">Input Password...</span></i>'';
-              hide_input = false;
-              position = "0, -100";
-              halign = "center";
-              valign = "center";
-            };
-
-            general = {
-              auth_method = "pam";
+              general = {
+                auth_method = "pam";
+              };
             };
           };
         };
diff --git a/modules/desktop/addons/hyprpaper.nix b/modules/desktop/addons/hyprpaper.nix
index 737eef8..fde7dd6 100644
--- a/modules/desktop/addons/hyprpaper.nix
+++ b/modules/desktop/addons/hyprpaper.nix
@@ -1,26 +1,29 @@
 {
   flake.modules.homeManager.cholli =
-    { ... }:
+    { lib, osConfig, ... }:
     let
       picture-path = "/home/cholli/Pictures/firewatch.jpg";
     in
     {
-      home.file = {
-        # https://www.reddit.com/r/WidescreenWallpaper/comments/13hib3t/purple_firewatch_3840x1620/
-        "Pictures/firewatch.jpg".source = ./firewatch.jpg;
-      };
+      config = lib.mkIf (osConfig.networking.hostName == "yggdrasil") {
 
-      wayland.windowManager.hyprland.settings.exec-once = [
-        ''hyprctl hyprpaper wallpaper "DP-1,${picture-path}"''
-      ];
-
-      services.hyprpaper = {
-        enable = true;
-        settings = {
-          preload = [ picture-path ];
-          wallpaper = "DP-1,${picture-path}";
+        home.file = {
+          # https://www.reddit.com/r/WidescreenWallpaper/comments/13hib3t/purple_firewatch_3840x1620/
+          "Pictures/firewatch.jpg".source = ./firewatch.jpg;
         };
-      };
 
+        wayland.windowManager.hyprland.settings.exec-once = [
+          ''hyprctl hyprpaper wallpaper "DP-1,${picture-path}"''
+        ];
+
+        services.hyprpaper = {
+          enable = true;
+          settings = {
+            preload = [ picture-path ];
+            wallpaper = "DP-1,${picture-path}";
+          };
+        };
+
+      };
     };
 }