diff --git a/modules/common/niri.nix b/modules/common/niri.nix
new file mode 100755
index 0000000..4f8809b
--- /dev/null
+++ b/modules/common/niri.nix
@@ -0,0 +1,298 @@
+{ inputs, config, pkgs, ... }:
+
+{
+  imports = [ inputs.niri.nixosModules.niri ];
+  nixpkgs.overlays = [ inputs.niri.overlays.niri ];
+
+  programs = {
+    niri.enable = true;
+    waybar.enable = true;
+  };
+
+  environment.systemPackages = with pkgs; [
+    mako
+    xwayland-satellite
+    (flameshot.override { enableWlrSupport = true; })
+  ];
+
+  home-manager.users.wo2w.programs = {
+    niri = {
+      settings = {
+        binds = {
+          # custom binds
+          "Mod+Space".action.spawn = [ "rofi" "-show" "drun" ];
+          "Print".action.spawn = [ "sh" "-c" "QT_QPA_PLATFORM=xcb" "flameshot" "screen" ];
+          "Shift+Print".action.spawn = [ "sh" "-c" "QT_QPA_PLATFORM=xcb" "flameshot" "gui" ];
+          "Mod+Print".action.spawn = [ "sh" "-c" "QT_CPA_PLATFORM=xcb" "flameshot" "full" ];
+
+          # default binds
+
+          # Mod-Shift-/, which is usually the same as Mod-?,
+          # shows a list of important hotkeys.
+          "Mod+Shift+Slash".action.show-hotkey-overlay = {};
+
+          # Suggested binds for running programs: terminal, app launcher, screen locker.
+          "Mod+T".action.spawn = "kitty";
+          "Super+Alt+L".action.spawn = "swaylock";
+
+          # You can also use a shell. Do this if you need pipes, multiple commands, etc.
+          # Note: the entire command goes as a single argument in the end.
+          # Mod+T { spawn "bash" "-c" "notify-send hello && exec alacritty"; }
+
+          # Example volume keys mappings for PipeWire & WirePlumber.
+          # The allow-when-locked=true property makes them work even when the session is locked.
+          "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" ];
+          };
+
+          "Mod+Q".action.close-window = {};
+
+          "Mod+Left".action.focus-column-left = {};
+          "Mod+Down".action.focus-window-down = {};
+          "Mod+Up".action.focus-window-up = {};
+          "Mod+Right".action.focus-column-right = {};
+          "Mod+H".action.focus-column-left = {};
+          "Mod+J".action.focus-window-down = {};
+          "Mod+K".action.focus-window-up = {};
+          "Mod+L".action.focus-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.
+          # Mod+J     { focus-window-or-workspace-down; }
+          # Mod+K     { focus-window-or-workspace-up; }
+          # Mod+Ctrl+J     { move-window-down-or-to-workspace-down; }
+          # Mod+Ctrl+K     { move-window-up-or-to-workspace-up; }
+
+          "Mod+Home".action.focus-column-first = {};
+          "Mod+End".action.focus-column-last = {};
+          "Mod+Ctrl+Home".action.move-column-to-first = {};
+          "Mod+Ctrl+End".action.move-column-to-last = {};
+
+          "Mod+Shift+Left".action.focus-monitor-left = {};
+          "Mod+Shift+Down".action.focus-monitor-down = {};
+          "Mod+Shift+Up".action.focus-monitor-up = {};
+          "Mod+Shift+Right".action.focus-monitor-right = {};
+          "Mod+Shift+H".action.focus-monitor-left = {};
+          "Mod+Shift+J".action.focus-monitor-down = {};
+          "Mod+Shift+K".action.focus-monitor-up = {};
+          "Mod+Shift+L".action.focus-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; }
+          # ...
+
+          # And you can also move a whole workspace to another monitor:
+          # Mod+Shift+Ctrl+Left  { move-workspace-to-monitor-left; }
+          # ...
+
+          "Mod+Page_Down".action.focus-workspace-down = {};
+          "Mod+Page_Up".action.focus-workspace-up = {};
+          "Mod+U".action.focus-workspace-down = {};
+          "Mod+I".action.focus-workspace-up = {};
+          "Mod+Ctrl+Page_Down".action.move-column-to-workspace-down = {};
+          "Mod+Ctrl+Page_Up".action.move-column-to-workspace-up = {};
+          "Mod+Ctrl+U".action.move-column-to-workspace-down = {};
+          "Mod+Ctrl+I".action.move-column-to-workspace-up = {};
+
+          # Alternatively, there are commands to move just a single window:
+          # Mod+Ctrl+Page_Down { move-window-to-workspace-down; }
+          # ...
+
+          "Mod+Shift+Page_Down".action.move-workspace-down = {};
+          "Mod+Shift+Page_Up".action.move-workspace-up = {};
+          "Mod+Shift+U".action.move-workspace-down = {};
+          "Mod+Shift+I".action.move-workspace-up = {};
+
+          # You can bind mouse wheel scroll ticks using the following syntax.
+          # These binds will change direction based on the natural-scroll setting.
+          #
+          # To avoid scrolling through workspaces really fast, you can use
+          # the cooldown-ms property. The bind will be rate-limited to this value.
+          # You can set a cooldown on any bind, but it's most useful for the wheel.
+          "Mod+WheelScrollDown" = {
+            cooldown-ms = 150;
+            action.focus-workspace-down = {};
+          };
+          "Mod+WheelScrollUp" = {
+            cooldown-ms = 150;
+            action.focus-workspace-up = {};
+          };
+          "Mod+Ctrl+WheelScrollDown" = {
+            cooldown-ms = 150;
+            action.move-column-to-workspace-down = {};
+          };
+          "Mod+Ctrl+WheelScrollUp" = {
+            cooldown-ms = 150;
+            action.move-column-to-workspace-up = {};
+          };
+
+          "Mod+WheelScrollRight".action.focus-column-right = {};
+          "Mod+WheelScrollLeft".action.focus-column-left = {};
+          "Mod+Ctrl+WheelScrollRight".action.move-column-right = {};
+          "Mod+Ctrl+WheelScrollLeft".action.move-column-left = {};
+
+          # Usually scrolling up and down with Shift in applications results in
+          # horizontal scrolling; these binds replicate that.
+          "Mod+Shift+WheelScrollDown".action.focus-column-right = {};
+          "Mod+Shift+WheelScrollUp".action.focus-column-left = {};
+          "Mod+Ctrl+Shift+WheelScrollDown".action.move-column-right = {};
+          "Mod+Ctrl+Shift+WheelScrollUp".action.move-column-left = {};
+
+          # Similarly, you can bind touchpad scroll "ticks".
+          # Touchpad scrolling is continuous, so for these binds it is split into
+          # discrete intervals.
+          # These binds are also affected by touchpad's natural-scroll, so these
+          # example binds are "inverted", since we have natural-scroll enabled for
+          # touchpads by default.
+          # Mod+TouchpadScrollDown { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.02+"; }
+          # Mod+TouchpadScrollUp   { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.02-"; }
+
+          # You can refer to workspaces by index. However, keep in mind that
+          # niri is a dynamic workspace system, so these commands are kind of
+          # "best effort". Trying to refer to a workspace index bigger than
+          # the current workspace count will instead refer to the bottommost
+          # (empty) workspace.
+          #
+          # For example, with 2 workspaces + 1 empty, indices 3, 4, 5 and so on
+          # will all refer to the 3rd workspace.
+          "Mod+1".action.focus-workspace = 1;
+          "Mod+2".action.focus-workspace = 2;
+          "Mod+3".action.focus-workspace = 3;
+          "Mod+4".action.focus-workspace = 4;
+          "Mod+5".action.focus-workspace = 5;
+          "Mod+6".action.focus-workspace = 6;
+          "Mod+7".action.focus-workspace = 7;
+          "Mod+8".action.focus-workspace = 8;
+          "Mod+9".action.focus-workspace = 9;
+          "Mod+Ctrl+1".action.move-column-to-workspace = 1;
+          "Mod+Ctrl+2".action.move-column-to-workspace = 2;
+          "Mod+Ctrl+3".action.move-column-to-workspace = 3;
+          "Mod+Ctrl+4".action.move-column-to-workspace = 4;
+          "Mod+Ctrl+5".action.move-column-to-workspace = 5;
+          "Mod+Ctrl+6".action.move-column-to-workspace = 6;
+          "Mod+Ctrl+7".action.move-column-to-workspace = 7;
+          "Mod+Ctrl+8".action.move-column-to-workspace = 8;
+          "Mod+Ctrl+9".action.move-column-to-workspace = 9;
+
+          # Alternatively, there are commands to move just a single window:
+          # Mod+Ctrl+1 { move-window-to-workspace 1; }
+
+          # Switches focus between the current and the previous workspace.
+          # Mod+Tab { focus-workspace-previous; }
+
+          "Mod+Comma".action.consume-window-into-column = {};
+          "Mod+Period".action.expel-window-from-column = {};
+
+          # There are also commands that consume or expel a single window to the side.
+          "Mod+BracketLeft".action.consume-or-expel-window-left = {};
+          "Mod+BracketRight".action.consume-or-expel-window-right = {};
+
+          "Mod+R".action.switch-preset-column-width = {};
+          "Mod+Shift+R".action.reset-window-height = {};
+          "Mod+F".action.maximize-column = {};
+          "Mod+Shift+F".action.fullscreen-window = {};
+          "Mod+C".action.center-column = {};
+
+          # Finer width adjustments.
+          # This command can also:
+          # * set width in pixels: "1000"
+          # * adjust width in pixels: "-5" or "+5"
+          # * set width as a percentage of screen width: "25%"
+          # * adjust width as a percentage of screen width: "-10%" or "+10%"
+          # Pixel sizes use logical, or scaled, pixels. I.e. on an output with scale 2.0,
+          # set-column-width "100" will make the column occupy 200 physical screen pixels.
+          "Mod+Minus".action.set-column-width = "-10%";
+          "Mod+Equal".action.set-column-width = "+10%";
+
+          # Finer height adjustments when in column with other windows.
+          "Mod+Shift+Minus".action.set-window-height = "-10%";
+          "Mod+Shift+Equal".action.set-window-height = "+10%";
+
+          "Ctrl+Print".action.screenshot-screen = {};
+          "Alt+Print".action.screenshot-window = {};
+
+          # The quit action will show a confirmation dialog to avoid accidental exits.
+          "Mod+Shift+E".action.quit = {};
+
+          # Powers off the monitors. To turn them back on, do any input like
+          # moving the mouse or pressing any other key.
+          "Mod+Shift+P".action.power-off-monitors = {};
+        };
+
+        spawn-at-startup = [
+          { command = [ "" ]; }
+        ];
+
+        window-rules = [
+          {
+            matches = [{ title = "^Bitwarden$"; }];
+            block-out-from = "screencast";
+          }
+          {
+            matches = [{ title = "PolicyKit1 KDE Agent$"; }];
+            block-out-from = "screencast";
+            open-floating = true;
+          }
+          # put steam notifications in the bottom right
+          {
+            matches = [{ 
+              app-id = "steam";
+              title = "^notificationtoasts_\d+_desktop$";
+             }];
+            default-floating-position = {
+              x = 10;
+              y = 10;
+              relative-to = "bottom-right";
+            };
+          }
+        ];
+      };
+    };
+
+    rofi = {
+      enable = true;
+      package = pkgs.rofi-wayland;
+      plugins = with pkgs; [
+        rofi-calc
+      ];
+    };
+
+    hyprlock = {
+      enable = true;
+      settings = {
+        
+      };
+    };
+  };
+}
\ No newline at end of file
diff --git a/modules/nixos/niri.nix b/modules/nixos/niri.nix
deleted file mode 100755
index 719e703..0000000
--- a/modules/nixos/niri.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ inputs, config, ... }:
-
-{
-  imports = [ inputs.niri.nixosModules.niri ];
-
-  programs.niri = {
-    enable = true;
-    settings = {
-      binds = {
-        "Mod+Space".action.spawn = [ "rofi" "-show" "drun" ];
-        "Print".action.spawn = "spectacle";
-        "Mod+Shift+S".action.spawn = [ "spectacle" "-r" ];
-      };
-
-      window-rules = {
-        bitwarden = {
-          matches."^Bitwarden".title = true;
-          block-out-from = "screencast";
-        };
-      };
-    };
-  };
-
-  environment.systemPackages = with pkgs; [
-    rofi-wayland
-    mako
-    waybar
-    xwayland-satellite
-  ];
-}
\ No newline at end of file