diff --git a/home/crow/bulwark.nix b/home/crow/bulwark.nix
index 9b2069a..0bda51d 100644
--- a/home/crow/bulwark.nix
+++ b/home/crow/bulwark.nix
@@ -1,5 +1,8 @@
 {...}: {
   imports = [
     common/core
+    common/optional/desktops/niri.nix
+    common/optional/desktops/sway
+    common/optional/browsers/firefox.nix
   ];
 }
diff --git a/home/crow/common/core/default.nix b/home/crow/common/core/default.nix
index e8773bc..b15fa40 100644
--- a/home/crow/common/core/default.nix
+++ b/home/crow/common/core/default.nix
@@ -18,7 +18,6 @@ in {
     #./${platform.nix}
     ./xdg.nix
     ./direnv.nix
-    ./firefox.nix
     ./tmux.nix
     ./git.nix
   ];
diff --git a/home/crow/common/optional/desktops/niri.nix b/home/crow/common/optional/desktops/niri.nix
index d25a57a..da88c76 100644
--- a/home/crow/common/optional/desktops/niri.nix
+++ b/home/crow/common/optional/desktops/niri.nix
@@ -4,19 +4,19 @@
   config,
   ...
 }: {
+  imports = [
+    inputs.niri-flake.homeModules.niri
+  ];
   nixpkgs.overlays = [
     inputs.niri-flake.overlays.niri
   ];
-  home.packages = [
-    pkgs.niri
-  ];
 
   programs.niri = {
     enable = true;
     settings = {
       binds = with config.lib.niri.actions; {
         "Mod+Shift+Slash".action = show-hotkey-overlay;
-        "Mod+Enter" = {
+        "Mod+Return" = {
           hotkey-overlay.title = "Open terminal";
           action = spawn "foot";
         };
@@ -44,10 +44,7 @@
         gaps = 16;
       };
       spawn-at-startup = [
-        "waybar"
-        "swaync"
-        "udiskie"
-        "/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1"
+        {command = ["waybar"];}
       ];
     };
   };
diff --git a/home/crow/common/optional/desktops/sway/default.nix b/home/crow/common/optional/desktops/sway/default.nix
index 1e40cab..5a5c57d 100644
--- a/home/crow/common/optional/desktops/sway/default.nix
+++ b/home/crow/common/optional/desktops/sway/default.nix
@@ -1,12 +1,11 @@
-{config, ...}: {
-  home.file."${config.xdg.configHome}/sway/sway.conf" = {
-    source = ./sway.conf;
-  };
-
+{
+  lib,
+  config,
+  ...
+}: {
   wayland.windowManager.sway = {
     enable = true;
-    systemd.enable = true;
-    xwayland = true;
+    config = null;
+    extraConfig = builtins.readFile ./sway.conf;
   };
 }
-
diff --git a/home/crow/common/optional/desktops/sway/sway.conf b/home/crow/common/optional/desktops/sway/sway.conf
index c454e2d..7bed64c 100644
--- a/home/crow/common/optional/desktops/sway/sway.conf
+++ b/home/crow/common/optional/desktops/sway/sway.conf
@@ -7,32 +7,6 @@ exec systemctl --user import-environment XDG_SESSION_TYPE XDG_CURRENT_DESKTOP
 exec dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway
 
 
-################
-### MONITORS ###
-################
-
-#include /home/crow/.config/sway/monitors.conf
-output HDMI-A-1 mode 1920x1080@74.973Hz
-output HDMI-A-1 pos 0 0
-output HDMI-A-1 transform 270
-
-output DP-1 mode 2560x1440@169.831Hz
-output DP-1 pos 1080 215
-
-# Backgrounds
-output HDMI-A-1 background /home/crow/.config/sway/background-2 fill
-output DP-1 background /home/crow/.config/sway/background-1 fill
-
-# Assign specific workspaces to specific outputs
-workspace 1 output HDMI-A-1 # Firefox
-workspace 2 output HDMI-A-1 # Comms
-workspace 3 output DP-1 # Terminal
-workspace 5 output DP-1 # Mudlet
-
-# Assign wacom tablet to primary monitor
-input type:tablet_tool map_to_output DP-1
-
-
 ###################
 ### MY PROGRAMS ###
 ###################
diff --git a/hosts/common/users/primary/nixos.nix b/hosts/common/users/primary/nixos.nix
index 0bac19a..0b16eab 100644
--- a/hosts/common/users/primary/nixos.nix
+++ b/hosts/common/users/primary/nixos.nix
@@ -42,6 +42,7 @@ in {
         shell = pkgs.zsh;
         hashedPasswordFile = config.users.users.${hostSpec.username}.hashedPasswordFile;
         hashedPassword = config.users.users.${hostSpec.username}.hashedPassword;
+        password = "test";
         openssh.authorizedKeys.keys = config.users.users.${hostSpec.username}.openssh.authorizedKeys.keys; # root's ssh keys are mainly used for remote deployment.
       };
     };