diff --git a/flake.lock b/flake.lock
index 3b0c482..e69d731 100755
--- a/flake.lock
+++ b/flake.lock
@@ -126,6 +126,22 @@
         "type": "github"
       }
     },
+    "flake-compat_5": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1733328505,
+        "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
     "flake-parts": {
       "inputs": {
         "nixpkgs-lib": [
@@ -708,6 +724,7 @@
         "pre-commit-hooks-nix": "pre-commit-hooks-nix",
         "sops-nix": "sops-nix_2",
         "systems": "systems_5",
+        "waybar": "waybar",
         "yazi": "yazi"
       }
     },
@@ -950,6 +967,27 @@
         "type": "github"
       }
     },
+    "waybar": {
+      "inputs": {
+        "flake-compat": "flake-compat_5",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1738399335,
+        "narHash": "sha256-OvtDGDUX0P5oz/LzhzeAcGfd6ihlUHPMKR4CZgnScTA=",
+        "owner": "Alexays",
+        "repo": "Waybar",
+        "rev": "0d5a4f82eca6df03b73908244d1dcd5fec2c3584",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Alexays",
+        "repo": "Waybar",
+        "type": "github"
+      }
+    },
     "yazi": {
       "inputs": {
         "flake-utils": "flake-utils_5",
diff --git a/flake.nix b/flake.nix
index 9ae0171..88e74d6 100755
--- a/flake.nix
+++ b/flake.nix
@@ -37,6 +37,10 @@
       url = "github:helix-editor/helix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    waybar = {
+      url = "github:Alexays/Waybar";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs =
diff --git a/home/modules/gui/apps/code/vsCode/config/extensions.nix b/home/modules/gui/apps/code/vsCode/config/extensions.nix
index c8add2a..d61d771 100755
--- a/home/modules/gui/apps/code/vsCode/config/extensions.nix
+++ b/home/modules/gui/apps/code/vsCode/config/extensions.nix
@@ -7,6 +7,7 @@ with pkgs.vscode-extensions;
   esbenp.prettier-vscode
   haskell.haskell
   james-yu.latex-workshop
+  bbenoist.nix
   # jnoortheen.nix-ide
   mattn.lisp
   mkhl.direnv
diff --git a/home/modules/gui/desktop/hypr/hyprland/config/exec-once.nix b/home/modules/gui/desktop/hypr/hyprland/config/exec-once.nix
index 575b2b1..2e2db3d 100755
--- a/home/modules/gui/desktop/hypr/hyprland/config/exec-once.nix
+++ b/home/modules/gui/desktop/hypr/hyprland/config/exec-once.nix
@@ -21,8 +21,9 @@ in
   "pactl set-default-sink bluez_output.00_16_94_35_0D_5F.1"
   "pactl set-default-source alsa_input.usb-Focusrite_Scarlett_2i2_USB_Y818KFJ0C671CE-00.HiFi__Mic1__source"
   "bluetoothctl power on"
+  "gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark'"
   "gsettings set org.gnome.desktop.interface cursor-theme 'catppuccin-mocha-dark-cursors'"
   "gsettings set org.gnome.desktop.interface cursor-size ${builtins.toString cursor.size}"
-  "systemctl --user import-environment PATH"
-  "systemctl --user restart xdg-desktop-portal.service"
+  # "systemctl --user import-environment PATH"
+  # "systemctl --user restart xdg-desktop-portal.service"
 ]
diff --git a/home/modules/gui/desktop/hypr/hyprland/config/misc.nix b/home/modules/gui/desktop/hypr/hyprland/config/misc.nix
index 444225f..0c661bb 100755
--- a/home/modules/gui/desktop/hypr/hyprland/config/misc.nix
+++ b/home/modules/gui/desktop/hypr/hyprland/config/misc.nix
@@ -1,7 +1,7 @@
 {
   focus_on_activate = 1;
   force_default_wallpaper = 0;
-  # disable_hyprland_logo = true;
-  # disable_splash_rendering = true;
-  # disable_hyprland_qtutils_check = true;
+  disable_hyprland_logo = true;
+  disable_splash_rendering = true;
+  disable_hyprland_qtutils_check = true;
 }
diff --git a/home/modules/gui/desktop/hypr/hyprland/config/windowrulev2.nix b/home/modules/gui/desktop/hypr/hyprland/config/windowrulev2.nix
index b9c7355..b1bc723 100755
--- a/home/modules/gui/desktop/hypr/hyprland/config/windowrulev2.nix
+++ b/home/modules/gui/desktop/hypr/hyprland/config/windowrulev2.nix
@@ -61,7 +61,6 @@ let
   ];
 
   pinWindows = builtins.map (x: "pin, " + x) [
-    "title:^${bitwarden}$"
     "title:^${picture}$"
     "title:^${discord-popout}$"
   ];
diff --git a/home/modules/gui/desktop/hypr/hyprland/default.nix b/home/modules/gui/desktop/hypr/hyprland/default.nix
index 319af77..589f11f 100755
--- a/home/modules/gui/desktop/hypr/hyprland/default.nix
+++ b/home/modules/gui/desktop/hypr/hyprland/default.nix
@@ -29,7 +29,14 @@ in
   wayland.windowManager.hyprland = {
     enable = true;
     xwayland.enable = true;
-    systemd.enable = false;
+    systemd = {
+      enable = true;
+      enableXdgAutostart = true;
+      extraCommands = [
+        "systemctl --user stop hyprland-session.target"
+        "systemctl --user start hyprland-session.target"
+      ];
+    };
     settings = configImports;
   };
 }
diff --git a/home/modules/gui/desktop/hypr/waybar/default.nix b/home/modules/gui/desktop/hypr/waybar/default.nix
index d513e5e..9d275e8 100755
--- a/home/modules/gui/desktop/hypr/waybar/default.nix
+++ b/home/modules/gui/desktop/hypr/waybar/default.nix
@@ -12,6 +12,7 @@ in
 {
   programs.waybar = {
     enable = true;
+    package = flake.inputs.waybar.packages.${pkgs.system}.default;
     settings = settingsPath;
     style = stylePath;
   };
diff --git a/home/modules/gui/desktop/hypr/wpaperd/default.nix b/home/modules/gui/desktop/hypr/wpaperd/default.nix
index 7d569f3..caa674f 100755
--- a/home/modules/gui/desktop/hypr/wpaperd/default.nix
+++ b/home/modules/gui/desktop/hypr/wpaperd/default.nix
@@ -3,7 +3,7 @@
     enable = true;
     settings = {
       "default" = {
-        path = "~/Files/Projects/dotfiles/home/modules/gui/desktop/wpaperd/wallpaper";
+        path = "~/Files/Projects/dotfiles/home/modules/gui/desktop/hypr/wpaperd/wallpaper";
         apply-shadow = true;
         duration = "1m";
         sorting = "random";
diff --git a/nixos/modules/hyprland/hypridle.nix b/nixos/modules/hyprland/hypridle.nix
index a4951a5..12c71f9 100755
--- a/nixos/modules/hyprland/hypridle.nix
+++ b/nixos/modules/hyprland/hypridle.nix
@@ -2,9 +2,9 @@
   flake,
   pkgs,
   ...
-}: {
+}:
+{
   services.hypridle = {
     enable = true;
-    package = flake.inputs.hypridle.packages.${pkgs.system}.hypridle;
   };
 }
diff --git a/nixos/modules/hyprland/wayland.nix b/nixos/modules/hyprland/wayland.nix
index 072afbd..9b71dc6 100755
--- a/nixos/modules/hyprland/wayland.nix
+++ b/nixos/modules/hyprland/wayland.nix
@@ -10,6 +10,8 @@
       extraPortals = builtins.attrValues {
         inherit (pkgs)
           xdg-desktop-portal-gtk
+          xdg-desktop-portal-hyprland
+          xdg-desktop-portal-wlr
           ;
       };
     };
diff --git a/systems/desktop/config/filesystem.nix b/systems/desktop/config/filesystem.nix
index 9c99511..e46b984 100755
--- a/systems/desktop/config/filesystem.nix
+++ b/systems/desktop/config/filesystem.nix
@@ -71,11 +71,11 @@ in
     in
     {
       "/" = {
-        device = "/dev/disk/by-uuid/c22a06af-8855-4938-9d04-68cd4d88d7f0";
+        device = "/dev/disk/by-uuid/58987815-99d2-4a26-b260-529a4e78b854";
         fsType = "ext4";
       };
       "/boot" = {
-        device = "/dev/disk/by-uuid/7B8C-1E95";
+        device = "/dev/disk/by-uuid/D39C-83F7";
         fsType = "vfat";
         options = desktop.boot.options;
       };
@@ -85,7 +85,7 @@ in
     // (builtins.listToAttrs (map sambaMounts sambaDrives));
 
   swapDevices = [
-    { device = "/dev/disk/by-uuid/8c9d0c0b-0bc8-442b-a3fd-02a37acd409f"; }
+    { device = "/dev/disk/by-uuid/f5d9890c-b341-47b0-8726-40afb645db56"; }
   ];
 
   systemd.tmpfiles.rules = [