diff --git a/flake.lock b/flake.lock
index 134449f..5c175c4 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2252,6 +2252,26 @@
         "type": "github"
       }
     },
+    "quickshell": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1773129285,
+        "narHash": "sha256-7G6x33z271v/jhBC5Le7NPOZhv9902+MfCkC9poMwf0=",
+        "ref": "refs/heads/master",
+        "rev": "bd6217927739a79c1c4ff279051f9625cd4b2b5e",
+        "revCount": 752,
+        "type": "git",
+        "url": "https://git.outfoxxed.me/outfoxxed/quickshell"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.outfoxxed.me/outfoxxed/quickshell"
+      }
+    },
     "root": {
       "inputs": {
         "aagl": "aagl",
@@ -2281,6 +2301,7 @@
         "note": "note",
         "proton-cachyos": "proton-cachyos",
         "pyprland": "pyprland",
+        "quickshell": "quickshell",
         "secrets": "secrets",
         "stylix": "stylix",
         "upfast": "upfast",
diff --git a/flake.nix b/flake.nix
index 1b2563a..15d2d0f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -167,6 +167,13 @@
       url = "github:Daaboulex/cachyos-settings-nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
+    # Quickshell for a better shell
+    quickshell = {
+      url = "git+https://git.outfoxxed.me/outfoxxed/quickshell";
+
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs = {
diff --git a/modules/linux/home-manager/hyprland.nix b/modules/linux/home-manager/hyprland.nix
index 2b34bca..6183242 100644
--- a/modules/linux/home-manager/hyprland.nix
+++ b/modules/linux/home-manager/hyprland.nix
@@ -129,7 +129,7 @@ in {
           "systemctl --user start hyprpolkitagent"
           "systemctl --user start hyprpaper"
           "systemctl --user start hypridle"
-          "systemctl --user start waybar"
+          # "systemctl --user start waybar"
           "pypr"
         ];
 
diff --git a/modules/linux/home-manager/wayland.nix b/modules/linux/home-manager/wayland.nix
index 4d182da..6a54644 100644
--- a/modules/linux/home-manager/wayland.nix
+++ b/modules/linux/home-manager/wayland.nix
@@ -19,6 +19,7 @@
       waylock
       inputs.pyprland.packages.${pkgs.stdenv.hostPlatform.system}.pyprland
       hyprshutdown
+      inputs.quickshell.packages.${pkgs.stdenv.hostPlatform.system}.default
     ];
 
     # Enable and setup tofi