diff --git a/flake.nix b/flake.nix
index 1c72454..cf1a552 100644
--- a/flake.nix
+++ b/flake.nix
@@ -133,7 +133,10 @@
       homeConfigurations.lelgenio = home-manager.lib.homeManagerConfiguration {
         inherit pkgs;
 
-        extraSpecialArgs = { inherit inputs; };
+        extraSpecialArgs = {
+            inherit inputs;
+            osConfig = {};
+        };
 
         modules = [ ./user/home.nix ];
       };
diff --git a/user/waybar/default.nix b/user/waybar/default.nix
index 304d463..90113e2 100644
--- a/user/waybar/default.nix
+++ b/user/waybar/default.nix
@@ -20,7 +20,7 @@ in
           "tray"
           "custom/caffeine"
           "pulseaudio"
-          (lib.optional osConfig.services.vpn.enable "custom/vpn")
+          (lib.optional (osConfig.services.vpn.enable or false) "custom/vpn")
           "network"
           "battery"
         ];
@@ -110,7 +110,7 @@ in
           interval = 1;
           tooltip = false;
         };
-        "custom/vpn" = lib.mkIf osConfig.services.vpn.enable {
+        "custom/vpn" = lib.mkIf (osConfig.services.vpn.enable or false) {
           format = "{}";
           exec = ''
             mullvad status | grep "^Connected" > /dev/null \