diff --git a/common/desktop_environment/sway/home_manager/sway.nix b/common/desktop_environment/sway/home_manager/sway.nix
index 236e820..1db35b0 100644
--- a/common/desktop_environment/sway/home_manager/sway.nix
+++ b/common/desktop_environment/sway/home_manager/sway.nix
@@ -157,7 +157,7 @@ in
         bars = [ ]; # Use Waybar via Home Manager
         startup = [
           {
-            command = "swaymsg workspace number 7 ; swaymsg workspace number 1";
+            command = "exec sh -c 'sleep 0.01; swaymsg workspace number 7 ; sleep 0.01; swaymsg workspace number 1'";
           }
           { command = "pgrep waybar >/dev/null || waybar"; }
         ];
diff --git a/hosts/oren/configuration.nix b/hosts/oren/configuration.nix
index e8deea1..268baf6 100644
--- a/hosts/oren/configuration.nix
+++ b/hosts/oren/configuration.nix
@@ -1,12 +1,22 @@
 {
+  pkgs,
+  lib,
+  config,
   ...
 }:
 {
   system.stateVersion = "24.11"; # Did you read the comment?
-
+  environment.systemPackages = with pkgs; [
+    # [Laptop] Battery status
+    acpi
+    bluez # bluetoothctl command
+  ];
+  hardware.enableAllFirmware = true;
+  hardware.bluetooth.enable = true;
   networking.networkmanager.enable = true;
   environment.shellAliases = {
     wifi = "nmtui";
+    battery = "acpi";
   };
   boot.kernelModules = [
     "rtl8192ce"
@@ -14,4 +24,6 @@
     "rtlwifi"
     "mac80211"
   ];
+
+  services.tlp.enable = true;
 }
diff --git a/hosts/oren/flake.lock b/hosts/oren/flake.lock
index 8dbd918..28c778f 100644
--- a/hosts/oren/flake.lock
+++ b/hosts/oren/flake.lock
@@ -29,22 +29,17 @@
       "inputs": {
         "home-manager": "home-manager",
         "nix-flatpak": "nix-flatpak",
-        "nixpkgs": "nixpkgs_2",
         "ragenix": "ragenix"
       },
       "locked": {
-        "lastModified": 1756930893,
-        "narHash": "sha256-4AwhJE8YURVU8+vPAkIVn2kQiIK7DoEDQVGSx6I7g0g=",
-        "ref": "refs/heads/master",
-        "rev": "1118b319d86673ac8552a0c590a13fa5b29655dd",
-        "revCount": 634,
-        "type": "git",
-        "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles"
+        "path": "../../common",
+        "type": "path"
       },
       "original": {
-        "type": "git",
-        "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles"
-      }
+        "path": "../../common",
+        "type": "path"
+      },
+      "parent": []
     },
     "crane": {
       "locked": {
@@ -108,11 +103,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1753592768,
-        "narHash": "sha256-oV695RvbAE4+R9pcsT9shmp6zE/+IZe6evHWX63f2Qg=",
+        "lastModified": 1756245065,
+        "narHash": "sha256-aAZNbGcWrVRZgWgkQbkabSGcDVRDMgON4BipMy69gvI=",
         "owner": "rycee",
         "repo": "home-manager",
-        "rev": "fc3add429f21450359369af74c2375cb34a2d204",
+        "rev": "54b2879ce622d44415e727905925e21b8f833a98",
         "type": "github"
       },
       "original": {
@@ -194,22 +189,6 @@
       }
     },
     "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1753694789,
-        "narHash": "sha256-cKgvtz6fKuK1Xr5LQW/zOUiAC0oSQoA9nOISB0pJZqM=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "dc9637876d0dcc8c9e5e22986b857632effeb727",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_3": {
       "locked": {
         "lastModified": 1741379970,
         "narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=",
@@ -225,7 +204,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_4": {
+    "nixpkgs_3": {
       "locked": {
         "lastModified": 1756886854,
         "narHash": "sha256-6tooT142NLcFjt24Gi4B0G1pgWLvfw7y93sYEfSHlLI=",
@@ -241,7 +220,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_5": {
+    "nixpkgs_4": {
       "locked": {
         "lastModified": 1755648324,
         "narHash": "sha256-+2TxwJEXWXGC7JBsRGUHtmQ66lRGPcDI2kFKTTU5e2s=",
@@ -1141,7 +1120,7 @@
         "agenix": "agenix",
         "crane": "crane",
         "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs_2",
         "rust-overlay": "rust-overlay"
       },
       "locked": {
@@ -1161,14 +1140,14 @@
     "root": {
       "inputs": {
         "common": "common",
-        "nixpkgs": "nixpkgs_4",
+        "nixpkgs": "nixpkgs_3",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "ros_neovim": "ros_neovim"
       }
     },
     "ros_neovim": {
       "inputs": {
-        "nixpkgs": "nixpkgs_5",
+        "nixpkgs": "nixpkgs_4",
         "nvim_plugin-Almo7aya/openingh.nvim": "nvim_plugin-Almo7aya/openingh.nvim",
         "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim": "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim",
         "nvim_plugin-JoosepAlviste/nvim-ts-context-commentstring": "nvim_plugin-JoosepAlviste/nvim-ts-context-commentstring",
diff --git a/hosts/oren/flake.nix b/hosts/oren/flake.nix
index fa08e8f..d2745e1 100644
--- a/hosts/oren/flake.nix
+++ b/hosts/oren/flake.nix
@@ -4,8 +4,8 @@
     nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
 
     # Use relative to get current version for testing
-    # common.url = "path:../../common";
-    common.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles";
+    common.url = "path:../../common";
+    # common.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles";
 
     ros_neovim.url = "git+https://git.joshuabell.xyz/ringofstorms/nvim";
   };
@@ -52,7 +52,6 @@
                     "occ" = "oc -c";
 
                     "ollamal" = "ollama list | tail -n +2 | awk '{print $1}' | fzf --ansi --preview 'ollama show {}'";
-                    "battery" = "cat /sys/class/power_supply/BAT1/capacity";
                   };
 
                   environment.systemPackages = with pkgs; [
@@ -95,13 +94,11 @@
                         enable = true;
                         packages = [
                           "org.signal.Signal"
-                          "com.discordapp.Discord"
+                          "dev.vencord.Vesktop"
                           "md.obsidian.Obsidian"
                           "com.spotify.Client"
                           "org.videolan.VLC"
                           "com.bitwarden.desktop"
-                          "org.openscad.OpenSCAD"
-                          "org.blender.Blender"
                           "im.riot.Riot"
                           "com.rustdesk.RustDesk"
                           "com.google.Chrome"