diff --git a/flake.nix b/flake.nix
index 88cac74f..969384dd 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,3 +1,4 @@
+
 {
   description = "Dank material shell.";
 
@@ -6,140 +7,110 @@
     quickshell.url = "git+https://git.outfoxxed.me/quickshell/quickshell";
     quickshell.inputs.nixpkgs.follows = "nixpkgs";
     niri.url = "github:sodiboo/niri-flake";
-    # home-manager.url = "github:nix-community/home-manager";
+    niri.inputs.nixpkgs.follows = "nixpkgs";
   };
 
-  outputs = { self, nixpkgs, niri, ... }:
-    let pkgs = nixpkgs.legacyPackages.x86_64-linux;
+  outputs = { self, nixpkgs, niri, quickshell, ... }:
+    let
+      pkgs = nixpkgs.legacyPackages.x86_64-linux;
+      system = "x86_64-linux";
     in {
 
-      packages.x86_64-linux.dankMaterialShell = pkgs.stdenvNoCC.mkDerivation {
+      packages.${system}.dankMaterialShell = pkgs.stdenvNoCC.mkDerivation {
         name = "dankMaterialShell";
         src = ./.;
-        buildInputs = with pkgs; [
-          material-symbols
-          inter
-          fira-code
-          cava
-          wl-clipboard
-          cliphist
-          ddcutil
-          libsForQt5.qt5ct
-          kdePackages.qt6ct
-          matugen
-        ];
         installPhase = ''
           mkdir -p $out/etc/xdg/quickshell/DankMaterialShell
-          cp -r .  $out/etc/xdg/quickshell/DankMaterialShell
+          cp -r . $out/etc/xdg/quickshell/DankMaterialShell
         '';
       };
 
-      packages.x86_64-linux.default =
-        self.packages.x86_64-linux.dankMaterialShell;
+      packages.${system}.default = self.packages.${system}.dankMaterialShell;
 
-      homeModules.dankMaterialShell = { config, options, pkgs, outputs, ... }:
+      homeModules.dankMaterialShell = { config, pkgs, lib, ... }:
         let cfg = config.programs.dankMaterialShell;
         in {
           imports = [ niri.homeModules.niri ];
 
           options.programs.dankMaterialShell = {
-            enable = pkgs.lib.mkEnableOption "DankMaterialShell";
-            enableKeybinds =
-              pkgs.lib.mkEnableOption "DankMaterialShell Niri keybinds";
-            enableSystemd =
-              pkgs.lib.mkEnableOption "DankMaterialShell systemd startup";
+            enable = lib.mkEnableOption "DankMaterialShell";
+            enableKeybinds = lib.mkEnableOption "DankMaterialShell Niri keybinds";
+            enableSystemd = lib.mkEnableOption "DankMaterialShell systemd startup";
           };
 
-          config.programs.quickshell.enable = pkgs.lib.mkIf cfg.enable true;
+          config = lib.mkIf cfg.enable {
+            programs.quickshell = {
+              enable = true;
+              package = quickshell.packages.${system}.quickshell;
+              configs.DankMaterialShell = "${self.packages.${system}.dankMaterialShell}/etc/xdg/quickshell/DankMaterialShell";
+              activeConfig = lib.mkIf cfg.enableSystemd "DankMaterialShell";
+              systemd = lib.mkIf cfg.enableSystemd {
+                enable = true;
+                target = "graphical-session.target";
+              };
+            };
 
-          config.programs.quickshell.configs.DankMaterialShell =
-            pkgs.lib.mkIf cfg.enable
-            "${self.outputs.packages.x86_64-linux.dankMaterialShell}/etc/xdg/quickshell/DankMaterialShell";
+            programs.niri.settings = lib.mkMerge [
+              (lib.mkIf cfg.enableKeybinds {
+                binds = with config.lib.niri.actions; {
+                  "Mod+Space" = {
+                    hotkey-overlay.title = "Application Launcher";
+                    action = spawn "qs" "-c" "DankMaterialShell" "ipc" "call" "spotlight" "toggle";
+                  };
+                  "Mod+V" = {
+                    hotkey-overlay.title = "Clipboard Manager";
+                    action = spawn "qs" "-c" "DankMaterialShell" "ipc" "call" "clipboard" "toggle";
+                  };
+                  "Mod+M" = {
+                    hotkey-overlay.title = "Task Manager";
+                    action = spawn "qs" "-c" "DankMaterialShell" "ipc" "call" "processlist" "toggle";
+                  };
+                  "Mod+Comma" = {
+                    hotkey-overlay.title = "Settings";
+                    action = spawn "qs" "-c" "DankMaterialShell" "ipc" "call" "settings" "toggle";
+                  };
+                  "Super+Alt+L" = {
+                    hotkey-overlay.title = "Lock Screen";
+                    action = spawn "qs" "-c" "DankMaterialShell" "ipc" "call" "lock" "lock";
+                  };
+                  "XF86AudioRaiseVolume" = {
+                    allow-when-locked = true;
+                    action = spawn "qs" "-c" "DankMaterialShell" "ipc" "call" "audio" "increment" "3";
+                  };
+                  "XF86AudioLowerVolume" = {
+                    allow-when-locked = true;
+                    action = spawn "qs" "-c" "DankMaterialShell" "ipc" "call" "audio" "decrement" "3";
+                  };
+                  "XF86AudioMute" = {
+                    allow-when-locked = true;
+                    action = spawn "qs" "-c" "DankMaterialShell" "ipc" "call" "audio" "mute";
+                  };
+                  "XF86AudioMicMute" = {
+                    allow-when-locked = true;
+                    action = spawn "qs" "-c" "DankMaterialShell" "ipc" "call" "audio" "micmute";
+                  };
+                };
+              })
+              (lib.mkIf (!cfg.enableSystemd) {
+                spawn-at-startup = [{
+                  command = [ "qs" "-c" "DankMaterialShell" ];
+                }];
+              })
+            ];
 
-          config.programs.quickshell.package = pkgs.lib.mkIf cfg.enable
-            self.inputs.quickshell.packages.x86_64-linux.quickshell;
-
-          config.programs.quickshell.activeConfig =
-            pkgs.lib.mkIf cfg.enableSystemd "DankMaterialShell";
-          config.programs.quickshell.systemd.enable =
-            pkgs.lib.mkIf cfg.enableSystemd true;
-          config.programs.quickshell.systemd.target =
-            pkgs.lib.mkIf cfg.enableSystemd "graphical-session.target";
-
-          config.programs.niri.settings.binds = pkgs.lib.mkIf cfg.enableKeybinds
-            (with config.lib.niri.actions; {
-              "Mod+Space" = {
-                hotkey-overlay.title = "Application Launcher";
-                action =
-                  spawn "qs" "-c" "DankMaterialShell" "ipc" "call" "spotlight"
-                  "toggle";
-              };
-              "Mod+V" = {
-                hotkey-overlay.title = "Clipboard Manager";
-                action =
-                  spawn "qs" "-c" "DankMaterialShell" "ipc" "call" "clipboard"
-                  "toggle";
-              };
-              "Mod+M" = {
-                hotkey-overlay.title = "Task Manager";
-                action =
-                  spawn "qs" "-c" "DankMaterialShell" "ipc" "call" "processlist"
-                  "toggle";
-              };
-              "Mod+Comma" = {
-                hotkey-overlay.title = "Settings";
-                action =
-                  spawn "qs" "-c" "DankMaterialShell" "ipc" "call" "settings"
-                  "toggle";
-              };
-              "Super+Alt+L" = {
-                hotkey-overlay.title = "Lock Screen";
-                action = spawn "qs" "-c" "DankMaterialShell" "ipc" "call" "lock"
-                  "lock";
-              };
-              "XF86AudioRaiseVolume" = {
-                allow-when-locked = true;
-                action =
-                  spawn "qs" "-c" "DankMaterialShell" "ipc" "call" "audio"
-                  "increment" "3";
-              };
-              "XF86AudioLowerVolume" = {
-                allow-when-locked = true;
-                action =
-                  spawn "qs" "-c" "DankMaterialShell" "ipc" "call" "audio"
-                  "decrement" "3";
-              };
-              "XF86AudioMute" = {
-                allow-when-locked = true;
-                action =
-                  spawn "qs" "-c" "DankMaterialShell" "ipc" "call" "audio"
-                  "mute";
-              };
-              "XF86AudioMicMute" = {
-                allow-when-locked = true;
-                action =
-                  spawn "qs" "-c" "DankMaterialShell" "ipc" "call" "audio"
-                  "micmute";
-              };
-            });
-
-          config.home.packages = pkgs.lib.mkIf cfg.enable (with pkgs; [
-            material-symbols
-            inter
-            fira-code
-            cava
-            wl-clipboard
-            cliphist
-            ddcutil
-            libsForQt5.qt5ct
-            kdePackages.qt6ct
-            matugen
-          ]);
-
-          config.programs.niri.settings.spawn-at-startup =
-            pkgs.lib.mkIf (cfg.enable && !cfg.enableSystemd) [{
-              command = [ "qs" "-c" "DankMaterialShell" ];
-            }];
+            home.packages = with pkgs; [
+              material-symbols
+              inter
+              fira-code
+              cava
+              wl-clipboard
+              cliphist
+              ddcutil
+              libsForQt5.qt5ct
+              kdePackages.qt6ct
+              matugen
+            ];
+          };
         };
     };
 }