diff --git a/home-manager/modules/ezpcusr.nix b/home-manager/modules/ezpcusr.nix
index 04118e2..258ba4f 100644
--- a/home-manager/modules/ezpcusr.nix
+++ b/home-manager/modules/ezpcusr.nix
@@ -112,11 +112,6 @@ in {
       default = {};
       type = types.submodule {
         options = {
-          enable = mkOption {
-            type = types.bool;
-            default = true;
-            description = "Enable ezpcusr's screensaver";
-          };
           lockTime = mkOption {
             type = types.int;
             default = 300;
@@ -172,7 +167,7 @@ in {
 
   config = lib.mkIf cfg.enable {
     services.swayidle = {
-      enable = true;
+      enable = lib.mkDefault true;
 
       events = [
         {
@@ -374,106 +369,106 @@ in {
       enable = lib.mkDefault true;
       systemd = {
         enable = lib.mkDefault true;
-        target = "sway-session.target";
+        target = lib.mkDefault "sway-session.target";
       };
 
       settings.mainbar = {
-        position = "left";
-        height = null;
+        position = lib.mkDefault "left";
+        height = lib.mkDefault null;
 
         modules-left = ["sway/workspaces" "custom/spacer" "custom/weather-temp" "custom/weather-precip" "custom/weather-wind"];
         modules-center = ["clock#1" "clock#2" "custom/spacer" "custom/media" "custom/spacer" "clock#3" "custom/spacer" "clock#4"];
         modules-right = ["pulseaudio" "custom/spacer" "memory" "custom/spacer" "cpu"] ++ lib.optionals cfg.battery ["custom/spacer" "battery"] ++ ["custom/spacer" "tray"];
 
         "custom/spacer" = {
-          format = "〜";
-          rotate = 90;
-          tooltip = false;
+          format = lib.mkDefault "〜";
+          rotate = lib.mkDefault 90;
+          tooltip = lib.mkDefault false;
         };
 
         "custom/weather-temp" = {
-          exec = "${pkgs.curl}/bin/curl 'wttr.in/${cfg.location}?format=%c+%t' || echo ERR";
-          on-click = "${pkgs.xdg-utils}/bin/xdg-open 'https://weather.com/weather/today/l/85625'";
-          on-click-right = "${pkgs.xdg-utils}/bin/xdg-open 'https://wttr.in/${cfg.location}'";
-          interval = 900;
+          exec = lib.mkDefault "${pkgs.curl}/bin/curl 'wttr.in/${cfg.location}?format=%c+%t' || echo ERR";
+          on-click = lib.mkDefault "${pkgs.xdg-utils}/bin/xdg-open 'https://weather.com/weather/today/l/85625'";
+          on-click-right = lib.mkDefault "${pkgs.xdg-utils}/bin/xdg-open 'https://wttr.in/${cfg.location}'";
+          interval = lib.mkDefault 900;
         };
         "custom/weather-precip" = {
-          exec = "${pkgs.curl}/bin/curl 'wttr.in/${cfg.location}?format=🌧️+%p'";
-          on-click = "${pkgs.xdg-utils}/bin/xdg-open 'https://www.lightningmaps.org/'";
-          on-click-right = "${pkgs.xdg-utils}/bin/xdg-open 'https://wttr.in/${cfg.location}'";
-          interval = 900;
+          exec = lib.mkDefault "${pkgs.curl}/bin/curl 'wttr.in/${cfg.location}?format=🌧️+%p'";
+          on-click = lib.mkDefault "${pkgs.xdg-utils}/bin/xdg-open 'https://www.lightningmaps.org/'";
+          on-click-right = "lib.mkDefault ${pkgs.xdg-utils}/bin/xdg-open 'https://wttr.in/${cfg.location}'";
+          interval = lib.mkDefault 900;
         };
         "custom/weather-wind" = {
-          exec = "${pkgs.curl}/bin/curl 'wttr.in/${cfg.location}?format=🌬️+%w'";
-          on-click = "${pkgs.xdg-utils}/bin/xdg-open 'https://www.ventusky.com/";
-          on-click-right = "${pkgs.xdg-utils}/bin/xdg-open 'https://wttr.in/${cfg.location}'";
-          interval = 900;
+          exec = lib.mkDefault "${pkgs.curl}/bin/curl 'wttr.in/${cfg.location}?format=🌬️+%w'";
+          on-click = lib.mkDefault "${pkgs.xdg-utils}/bin/xdg-open 'https://www.ventusky.com/";
+          on-click-right = lib.mkDefault "${pkgs.xdg-utils}/bin/xdg-open 'https://wttr.in/${cfg.location}'";
+          interval = lib.mkDefault 900;
         };
 
         "custom/media" = {
-          rotate = 90;
-          max-length = 60;
-          on-click = "${pkgs.playerctl}/bin/playerctl play-pause";
-          exec = "${pkgs.playerctl}/bin/playerctl metadata --format '{{ emoji(status) }} {{ artist }} - {{ title }}' --follow";
+          rotate = lib.mkDefault 90;
+          max-length = lib.mkDefault 60;
+          on-click = lib.mkDefault "${pkgs.playerctl}/bin/playerctl play-pause";
+          exec = lib.mkDefault "${pkgs.playerctl}/bin/playerctl metadata --format '{{ emoji(status) }} {{ artist }} - {{ title }}' --follow";
         };
 
         "sway/workspaces" = {
-          disable-scroll = true;
+          disable-scroll = lib.mkDefault true;
         };
 
         "clock#1" = {
-          tooltip = false;
-          format = "{:%a}";
+          tooltip = lib.mkDefault false;
+          format = lib.mkDefault "{:%a}";
         };
         "clock#2" = {
-          tooltip = false;
-          format = "{:%m-%d}";
+          tooltip = lib.mkDefault false;
+          format = lib.mkDefault "{:%m-%d}";
         };
         "clock#3" = {
-          tooltip = false;
-          format = "{:%I:%M %p}";
+          tooltip = lib.mkDefault false;
+          format = lib.mkDefault "{:%I:%M %p}";
         };
         "clock#4" = {
-          tooltip = false;
-          timezone = "Etc/UTC";
-          format = "{:%H:%M} UTC";
+          tooltip = lib.mkDefault false;
+          timezone = lib.mkDefault "Etc/UTC";
+          format = lib.mkDefault "{:%H:%M} UTC";
         };
 
         pulseaudio = {
-          format = "{icon} {volume}%";
-          format-bluetooth = "{icon} {volume}%";
-          format-muted = "MUTE";
+          format = lib.mkDefault "{icon} {volume}%";
+          format-bluetooth = lib.mkDefault "{icon} {volume}%";
+          format-muted = lib.mkDefault "MUTE";
           format-icons = {
-            headphone = "";
-            default = "";
+            headphone = lib.mkDefault "";
+            default = lib.mkDefault "";
           };
-          on-click = "${pkgs.pulseaudio}/bin/pactl set-source-mute @DEFAULT_SOURCE@ toggle";
-          on-click-right = "${pkgs.pavucontrol}/bin/pavucontrol";
+          on-click = lib.mkDefault "${pkgs.pulseaudio}/bin/pactl set-source-mute @DEFAULT_SOURCE@ toggle";
+          on-click-right = lib.mkDefault "${pkgs.pavucontrol}/bin/pavucontrol";
         };
 
         memory = {
-          interval = 20;
-          format = " {}%";
+          interval = lib.mkDefault 20;
+          format = lib.mkDefault " {}%";
         };
 
         cpu = {
-          interval = 20;
-          format = " {usage}%";
+          interval = lib.mkDefault 20;
+          format = lib.mkDefault " {usage}%";
         };
 
         battery = {
           states = {
-            good = 90;
-            warning = 25;
-            critical = 10;
+            good = lib.mkDefault 90;
+            warning = lib.mkDefault 25;
+            critical = lib.mkDefault 10;
           };
-          format = "{icon} {capacity}%";
+          format = lib.mkDefault "{icon} {capacity}%";
           format-icons = ["" "" "" "" "" "" "" "" "" ""];
         };
 
         tray = {
-          icon-size = 18;
-          spacing = 5;
+          icon-size = lib.mkDefault 18;
+          spacing = lib.mkDefault 5;
         };
       };