diff --git a/nixos/desktop/plasma.nix b/nixos/desktop/plasma.nix
index b126d6f5..673f5cb9 100644
--- a/nixos/desktop/plasma.nix
+++ b/nixos/desktop/plasma.nix
@@ -3,12 +3,12 @@
   imports = [
     ./common.nix
     ./xserver.nix
+    ./sddm.nix
   ];
   # Enable the X11 windowing system.
   services.xserver.enable = true;
 
   # Enable the KDE Plasma Desktop Environment.
-  services.xserver.displayManager.sddm.enable = true;
   services.xserver.desktopManager.plasma5.enable = true;
 
   programs.kdeconnect.enable = true;
diff --git a/nixos/desktop/sddm.nix b/nixos/desktop/sddm.nix
new file mode 100644
index 00000000..7cac2063
--- /dev/null
+++ b/nixos/desktop/sddm.nix
@@ -0,0 +1,6 @@
+{ ... }:
+{
+  services.xserver.displayManager.sddm = {
+    enable = true;
+  };
+}
diff --git a/nixos/desktop/xfce.nix b/nixos/desktop/xfce.nix
index cc00f410..88dc8791 100644
--- a/nixos/desktop/xfce.nix
+++ b/nixos/desktop/xfce.nix
@@ -1,9 +1,9 @@
-{ ... }:
-
+{ pkgs, ... }:
 {
   imports = [
     ./common.nix
     ./xserver.nix
+    ./sddm.nix
   ];
   services.xserver = {
     enable = true;
@@ -13,7 +13,10 @@
       enableXfwm = false;
     };
     windowManager.bspwm.enable = true;
-    displayManager.sddm.enable = true;
     displayManager.defaultSession = "xfce+bspwm";
   };
+  programs.i3lock = {
+    enable = true;
+    package = pkgs.i3lock-fancy;
+  };
 }
diff --git a/nixos/home-manager/env/bspwm.nix b/nixos/home-manager/env/bspwm.nix
index 6c78c4e9..a9c3f205 100644
--- a/nixos/home-manager/env/bspwm.nix
+++ b/nixos/home-manager/env/bspwm.nix
@@ -13,9 +13,6 @@
       pointer_action2 = "resize_side";
       pointer_action3 = "resize_corner";
     };
-    startupPrograms = [
-      "kitty -e \"nvim\""
-    ];
     monitors = {
       "primary" = ["I" "II" "III" "IV" "V"];
     };
diff --git a/nixos/home-manager/env/rofi.nix b/nixos/home-manager/env/rofi.nix
index 4e7c3212..1af9d243 100644
--- a/nixos/home-manager/env/rofi.nix
+++ b/nixos/home-manager/env/rofi.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ ... }:
 {
   programs.rofi = {
     enable = true;
@@ -6,8 +6,4 @@
     pass.enable = true;
     terminal = "kitty";
   };
-  home.packages = with pkgs; [
-    i3lock
-    scrot
-  ];
 }
diff --git a/scripts/powermenu b/scripts/powermenu
index cf5a4e5c..bde97216 100755
--- a/scripts/powermenu
+++ b/scripts/powermenu
@@ -117,7 +117,7 @@ menu=(
   [ Reboot]="systemctl reboot"
   [ Suspend]="systemctl suspend"
   [ Hibernate]="systemctl hibernate"
-  [ Lock]="xflock"
+  [ Lock]="i3lock-fancy"
   [ Logout]="xfce4-session-logout"
   [ Cancel]=""
 )