diff --git a/flake.lock b/flake.lock
index 7b23fbd..bdba53f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -932,6 +932,22 @@
         "type": "github"
       }
     },
+    "quickshell": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1783436659,
+        "narHash": "sha256-rh0BJlcRM8nFet9aYIaZMxe7M6BMNJOrSgJi3cPQ+Tc=",
+        "ref": "refs/heads/main",
+        "rev": "68d4240fcbc605ee36a0e71797c04c0ac33f3e19",
+        "revCount": 25,
+        "type": "git",
+        "url": "https://git.voidarc.co.uk/voidarc/quickshell"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.voidarc.co.uk/voidarc/quickshell"
+      }
+    },
     "root": {
       "inputs": {
         "davinci": "davinci",
@@ -942,6 +958,7 @@
         "nixpkgs": "nixpkgs_5",
         "nvim": "nvim",
         "otter-launcher": "otter-launcher_2",
+        "quickshell": "quickshell",
         "sls-steam": "sls-steam",
         "wrappers": "wrappers_3"
       }
diff --git a/flake.nix b/flake.nix
index 5ce755c..8302b8e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -21,6 +21,10 @@
     };
     sls-steam.url = "github:AceSLS/SLSsteam";
     davinci.url = "git+https://git.voidarc.co.uk/voidarc/nixos.davinci";
+		quickshell = {
+      url = "git+https://git.voidarc.co.uk/voidarc/quickshell";
+			flake = false;
+		};
 
     # Flake parts
     flake-parts.url = "github:hercules-ci/flake-parts";
diff --git a/modules/features/quickshell/default.nix b/modules/features/quickshell/default.nix
new file mode 100644
index 0000000..a42c3f9
--- /dev/null
+++ b/modules/features/quickshell/default.nix
@@ -0,0 +1,29 @@
+{
+  self,
+  moduleWithSystem,
+  inputs,
+  ...
+}: {
+  flake.nixosModules.quickshell = moduleWithSystem ({
+    pkgs,
+    self',
+    inputs',
+    ...
+  }: {
+    environment.systemPackages = with self'.packages; [
+      quickshell
+    ];
+  });
+  perSystem = {
+    pkgs,
+    lib,
+    self',
+    ...
+  }: {
+    packages.quickshell = inputs.wrappers.wrappers.quickshell.wrap {
+      inherit pkgs;
+      configDir = inputs.quickshell;
+      configFile = "${inputs.quickshell}/shell.qml";
+    };
+  };
+}