diff --git a/dot_config/flake/flake.nix b/dot_config/flake/flake.nix
index d3eadd7..401d1a5 100644
--- a/dot_config/flake/flake.nix
+++ b/dot_config/flake/flake.nix
@@ -36,6 +36,11 @@
       inputs.quickshell.follows = "quickshell";
     };
 
+    dankMaterialShell = {
+      url = "github:AvengeMedia/DankMaterialShell/v0.1.10";
+      inputs.nixpkgs.follows = "nixpkgs-unstable";
+    };
+
     # Theming
     firefox-gnome-theme = {
       url = "github:rafaelmardojai/firefox-gnome-theme";
@@ -53,6 +58,7 @@
     # helix,
     niri,
     noctalia,
+    dankMaterialShell,
     quickshell,
     ...
   } @ inputs: let
diff --git a/dot_config/flake/home/niri.nix b/dot_config/flake/home/niri.nix
index 5e16fb0..fd2da0a 100644
--- a/dot_config/flake/home/niri.nix
+++ b/dot_config/flake/home/niri.nix
@@ -2,18 +2,17 @@
   pkgs,
   inputs,
   config,
+  lib,
   ...
-}: let
-  noctalia = inputs.noctalia.packages.${pkgs.system}.default;
-in {
+}: {
   imports = [
     ./darkman.nix
+    # inputs.niri.homeModules.niri.default
+    inputs.dankMaterialShell.homeModules.dankMaterialShell.default
+    inputs.dankMaterialShell.homeModules.dankMaterialShell.niri
   ];
 
   home.packages = with pkgs; [
-    noctalia
-    inputs.quickshell.packages.${system}.default
-
     glib
     xdg-desktop-portal-gnome
     xdg-desktop-portal-gtk
@@ -25,8 +24,11 @@ in {
     wlsunset
   ];
 
-  home.shellAliases = {
-    restart-shell = "${noctalia} kill && niri msg action spawn -- \"${noctalia}\"";
+  programs.dankMaterialShell = {
+    enable = true;
+    quickshell.package = pkgs.unstable.quickshell;
+    niri.enableKeybinds = true;
+    niri.enableSpawn = true;
   };
 
   gtk = {
@@ -283,16 +285,6 @@ in {
       #     }
     };
 
-    # Add lines like this to spawn processes at startup.
-    # Note that running niri as a session supports xdg-desktop-autostart,
-    # which may be more convenient to use.
-    # See the binds section below for more spawn examples.
-
-    # // This line starts waybar, a commonly used bar for Wayland compositors.
-    spawn-at-startup = [
-      {argv = ["noctalia-shell"];}
-    ];
-
     # Uncomment this line to ask the clients to omit their client-side decorations if possible.
     # If the client will specifically ask for CSD, the request will be honored.
     # Additionally, clients will be informed that they are tiled, removing some client-side rounded corners.
@@ -409,27 +401,27 @@ in {
         hotkey-overlay.title = "Open a Terminal: ghostty";
         action = spawn "ghostty";
       };
-      "Mod+Space" = {
-        hotkey-overlay.title = "Application launcher";
-        action = spawn ["noctalia-shell" "ipc" "call" "launcher" "toggle"];
-      };
+      # "Mod+Space" = {
+      #   hotkey-overlay.title = "Application launcher";
+      # action = spawn ["noctalia-shell" "ipc" "call" "launcher" "toggle"];
+      # };
 
-      "XF86AudioRaiseVolume" = {
-        allow-when-locked = true;
-        action = spawn ["wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.1+"];
-      };
-      "XF86AudioLowerVolume" = {
-        allow-when-locked = true;
-        action = spawn ["wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.1-"];
-      };
-      "XF86AudioMute" = {
-        allow-when-locked = true;
-        action = spawn ["wpctl" "set-mute" "@DEFAULT_AUDIO_SINK@" "toggle"];
-      };
-      XF86AudioMicMute = {
-        allow-when-locked = true;
-        action = spawn ["wpctl" "set-mute" "@DEFAULT_AUDIO_SOURCE@" "toggle"];
-      };
+      # "XF86AudioRaiseVolume" = {
+      #   allow-when-locked = true;
+      #   action = spawn ["wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.1+"];
+      # };
+      # "XF86AudioLowerVolume" = {
+      #   allow-when-locked = true;
+      #   action = spawn ["wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.1-"];
+      # };
+      # "XF86AudioMute" = {
+      #   allow-when-locked = true;
+      #   action = spawn ["wpctl" "set-mute" "@DEFAULT_AUDIO_SINK@" "toggle"];
+      # };
+      # XF86AudioMicMute = {
+      #   allow-when-locked = true;
+      #   action = spawn ["wpctl" "set-mute" "@DEFAULT_AUDIO_SOURCE@" "toggle"];
+      # };
 
       # Open/close the Overview: a zoomed-out view of workspaces and windows.
       # You can also move the mouse into the top-left hot corner,
@@ -606,7 +598,7 @@ in {
       "Mod+BracketRight".action = consume-or-expel-window-right;
 
       # Consume one window from the right to the bottom of the focused column.
-      "Mod+Comma".action = consume-window-into-column;
+      "Mod+Comma".action = lib.mkForce consume-window-into-column;
       # Expel the bottom window from the focused column to the right.
       "Mod+Period".action = expel-window-from-column;
 
@@ -645,7 +637,7 @@ in {
       #     Mod+Shift+Equal { set-window-height "+10%"; }
 
       # // Move the focused window between the floating and the tiling layout.
-      "Mod+V".action = toggle-window-floating;
+      "Mod+V".action = lib.mkForce toggle-window-floating;
       "Mod+Shift+V".action = switch-focus-between-floating-and-tiling;
 
       # Toggle tabbed column display mode.