diff --git a/flake.nix b/flake.nix
index 6ed3e07..2b1bbb1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -31,6 +31,14 @@
     };
 
 
+    quickshell = {
+      url = "git+https://git.outfoxxed.me/outfoxxed/quickshell";
+      inputs.nixpkgs.follows = "nixpkgs";
+
+    # caelestia = {
+    #   url = "git+https://git.sakamoto.dev/kenji/caelestia-nix";
+    #   inputs.nixpkgs.follows = "nixpkgs";
+    # };
   };
 
   outputs = {
diff --git a/hosts/hakase/configuration.nix b/hosts/hakase/configuration.nix
index ea93733..bdb1d30 100644
--- a/hosts/hakase/configuration.nix
+++ b/hosts/hakase/configuration.nix
@@ -9,6 +9,7 @@
   imports = [
     inputs.home-manager.nixosModules.home-manager
     ./hardware-configuration.nix
+    ../../modules/default/desktop.nix
   ];
 
   environment.systemPackages = with pkgs; [
@@ -84,6 +85,7 @@
     libinput.enable = true;
     blueman.enable = true;
     printing.enable = true;
+    openssh.enable = true;
     pipewire = {
       enable = true;
       alsa.enable = true;
diff --git a/modules/default/desktop.nix b/modules/default/desktop.nix
index 6be9853..cdb3ae3 100644
--- a/modules/default/desktop.nix
+++ b/modules/default/desktop.nix
@@ -1,5 +1,7 @@
 {
   imports = [
     ../../packages/steam/home.nix
+
+    # ../../packages/quickshell/default.nix
   ];
 }
diff --git a/packages/quickshell/default.nix b/packages/quickshell/default.nix
index e69de29..12e759f 100644
--- a/packages/quickshell/default.nix
+++ b/packages/quickshell/default.nix
@@ -0,0 +1,8 @@
+{inputs, ...}: {
+  imports = [
+    inputs.caelestia.nixosModules.default
+    {
+      services.caelestia-shell.enable = true;
+    }
+  ];
+}
diff --git a/packages/quickshell/home.nix b/packages/quickshell/home.nix
index a678dad..e3c7708 100644
--- a/packages/quickshell/home.nix
+++ b/packages/quickshell/home.nix
@@ -1,13 +1,38 @@
-{pkgs, ...}: let
-  caelestia-shell = pkgs.fetchFromGitea {
-    domain = "git.sakamoto.dev"; # Or your self-hosted instance, e.g., "codeberg.org"
-    owner = "kenji";
-    repo = "caelestia-dots";
-    rev = "main"; # Or a specific commit hash or tag like "v1.0"
-    hash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"; # !!! REPLACE THIS HASH !!!
+{
+  config,
+  pkgs,
+  lib,
+  system,
+  ...
+}: let
+  # Fetch the entire repository from Gitea
+  # This creates a path in the Nix store containing the repo's contents
+  caelestia = pkgs.fetchFromGithub {
+    owner = "liperium"; # The repository owner
+    repo = "caelestia-shell"; # The repository name
+    rev = "main"; # Or a specific commit hash/tag like "v1.0"
+    hash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="; # Set this to "" or a dummy value first
   };
 in {
-  home.file.".config/quickshell" = {
-    source = caelestia-shell;
+  home.packages = with pkgs; [
+    inputs.quickshell.packages.${system}.default
+    fish
+    jq
+    fd
+    (pkgs.python3.withPackages (python-pkgs:
+      with python-pkgs; [
+        aubio
+        pyaudio
+        numpy
+      ]))
+    cava
+    bluez
+    ddcutil
+    brightnessctl
+    curl
+    material-symbols
+  ];
+  home.file.".config/quickshell/caelestia" = {
+    source = caelestia;
   };
 }