diff --git a/dot_config/flake/flake.nix b/dot_config/flake/flake.nix
index 50a7c83..0508d07 100644
--- a/dot_config/flake/flake.nix
+++ b/dot_config/flake/flake.nix
@@ -12,8 +12,16 @@
     niri = {
       url = "github:sodiboo/niri-flake";
     };
-    caelestia-shell = {
-      url = "github:jutraim/niri-caelestia-shell";
+
+    noctalia = {
+      url = "github:noctalia-dev/noctalia-shell";
+      inputs.nixpkgs.follows = "nixpkgs-unstable";
+    };
+
+    quickshell = {
+      url = "github:outfoxxed/quickshell";
+      inputs.nixpkgs.follows = "nixpkgs-unstable";
+      inputs.quickshell.follows = "quickshell";
     };
 
     darwin = {
@@ -29,7 +37,8 @@
     determinate,
     home-manager,
     niri,
-    caelestia-shell,
+    noctalia,
+    quickshell,
     darwin,
     ...
   } @ inputs: let
diff --git a/dot_config/flake/home/niri.nix b/dot_config/flake/home/niri.nix
index 9c34392..bdda960 100644
--- a/dot_config/flake/home/niri.nix
+++ b/dot_config/flake/home/niri.nix
@@ -1,32 +1,19 @@
 {
+  pkgs,
   inputs,
   config,
   ...
 }: {
   imports = [
-    # ./waybar/mechabar
     ./darkman.nix
-    inputs.caelestia-shell.homeManagerModules.default
   ];
 
   programs.fuzzel.enable = true;
 
-  programs.caelestia = {
-    enable = true;
-    # settings = {
-    #   bar.status = {
-    #     showBattery = true;
-    #   };
-
-    #   # appearance.transparency.enable = true;
-    # };
-    # cli = {
-    #   enable = true; # Also add caelestia-cli to path
-    #   settings = {
-    #     theme.enableGtk = true;
-    #   };
-    # };
-  };
+  home.packages = with pkgs; [
+    inputs.noctalia.packages.${system}.default
+    inputs.quickshell.packages.${system}.default
+  ];
 
   programs.niri.settings = {
     cursor = {
@@ -291,7 +278,7 @@
 
     # // This line starts waybar, a commonly used bar for Wayland compositors.
     spawn-at-startup = [
-      # {argv = ["caelestia-shell" "-d"];}
+      {argv = ["noctalia-shell"];}
     ];
 
     # // Uncomment this line to ask the clients to omit their client-side decorations if possible.
@@ -417,14 +404,14 @@
       "Mod+K".action = focus-window-up;
       "Mod+L".action = focus-column-right;
 
-      # Mod+Ctrl+Left  { move-column-left; }
-      # Mod+Ctrl+Down  { move-window-down; }
-      # Mod+Ctrl+Up    { move-window-up; }
-      # Mod+Ctrl+Right { move-column-right; }
-      # Mod+Ctrl+H     { move-column-left; }
-      # Mod+Ctrl+J     { move-window-down; }
-      # Mod+Ctrl+K     { move-window-up; }
-      # Mod+Ctrl+L     { move-column-right; }
+      "Mod+Ctrl+Left".action = move-column-left;
+      "Mod+Ctrl+Down".action = move-window-down;
+      "Mod+Ctrl+Up".action = move-window-up;
+      "Mod+Ctrl+Right".action = move-column-right;
+      "Mod+Ctrl+H".action = move-column-left;
+      "Mod+Ctrl+J".action = move-window-down;
+      "Mod+Ctrl+K".action = move-window-up;
+      "Mod+Ctrl+L".action = move-column-right;
 
       # // Alternative commands that move across workspaces when reaching
       # // the first or last window in a column.
@@ -447,14 +434,14 @@
       #     Mod+Shift+K     { focus-monitor-up; }
       #     Mod+Shift+L     { focus-monitor-right; }
 
-      #     Mod+Shift+Ctrl+Left  { move-column-to-monitor-left; }
-      #     Mod+Shift+Ctrl+Down  { move-column-to-monitor-down; }
-      #     Mod+Shift+Ctrl+Up    { move-column-to-monitor-up; }
-      #     Mod+Shift+Ctrl+Right { move-column-to-monitor-right; }
-      #     Mod+Shift+Ctrl+H     { move-column-to-monitor-left; }
-      #     Mod+Shift+Ctrl+J     { move-column-to-monitor-down; }
-      #     Mod+Shift+Ctrl+K     { move-column-to-monitor-up; }
-      #     Mod+Shift+Ctrl+L     { move-column-to-monitor-right; }
+      "Mod+Shift+Ctrl+Left".action = move-column-to-monitor-left;
+      "Mod+Shift+Ctrl+Down".action = move-column-to-monitor-down;
+      "Mod+Shift+Ctrl+Up".action = move-column-to-monitor-up;
+      "Mod+Shift+Ctrl+Right".action = move-column-to-monitor-right;
+      "Mod+Shift+Ctrl+H".action = move-column-to-monitor-left;
+      "Mod+Shift+Ctrl+J".action = move-column-to-monitor-down;
+      "Mod+Shift+Ctrl+K".action = move-column-to-monitor-up;
+      "Mod+Shift+Ctrl+L".action = move-column-to-monitor-right;
 
       # // Alternatively, there are commands to move just a single window:
       # // Mod+Shift+Ctrl+Left  { move-window-to-monitor-left; }