diff --git a/modules/home/cli/neovim.nix b/modules/home/cli/neovim.nix
index a195172..6d70f46 100644
--- a/modules/home/cli/neovim.nix
+++ b/modules/home/cli/neovim.nix
@@ -297,6 +297,7 @@
           }
           '';
       }
+      luasnip
       mason-lspconfig-nvim
       {
         plugin = mason-nvim;
diff --git a/modules/home/desktop/sway/waybar.nix b/modules/home/desktop/sway/waybar.nix
index 6fbcf69..9d39b6d 100644
--- a/modules/home/desktop/sway/waybar.nix
+++ b/modules/home/desktop/sway/waybar.nix
@@ -1,4 +1,5 @@
-_: {
+{hostConfig, ...}: 
+{
   programs.waybar = {
     enable = true;
     systemd = {
@@ -15,8 +16,13 @@ _: {
           "sway/workspaces"
           "sway/mode"
         ];
-        modules-right = [
-          "network"
+        modules-right = [ "network" ]
+          ++ (if hostConfig.laptop then
+          [ "custom/sep"
+          "backlight"
+          "battery"]
+          else null
+          ) ++ [ 
           "custom/sep"
           "memory"
           "cpu"
@@ -96,6 +102,41 @@ _: {
           "format" = "{temperatureC}°C  ";
           "thermal-zone" = "6";
         };
+        "backlight" = {
+          "format" = "{percent}% {icon}";
+          "format-icons" = [
+            "󰌶"
+            "󱩏"
+            "󱩐"
+            "󱩐"
+            "󱩑"
+            "󱩒"
+            "󱩓"
+            "󱩔"
+            "󱩕"
+            "󱩖"
+            "󰛨"
+          ];
+        };
+        "battery" = {
+          "tooltip" = false;
+          "states" = {
+            "full" = 100;
+            "warning" = 30;
+            "critical" = 15;
+          };
+          "format" = "{capacity}% {icon}";
+          "format-charging" = "{capacity}% 󰓦";
+          "format-plugged" = "{capacity}% ";
+          "format-alt" = "{time} {icon}";
+          "format-icons" = [
+            " "
+            " "
+            " "
+            " "
+            " "
+          ];
+        };
       };
     };
     style = ''