From cb857853a5e54cf82e0b561e0092bd822a615a84 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Mon, 10 Apr 2023 22:06:23 +0100
Subject: [PATCH] Separate i3 from xfce config

---
 nixos/desktop/{xfce-bare.nix => i3.nix} | 12 ++++--------
 nixos/desktop/xfce-bspwm.nix            | 17 ++++++++++++++++-
 nixos/desktop/xfce-i3.nix               | 13 -------------
 3 files changed, 20 insertions(+), 22 deletions(-)
 rename nixos/desktop/{xfce-bare.nix => i3.nix} (52%)
 delete mode 100644 nixos/desktop/xfce-i3.nix

diff --git a/nixos/desktop/xfce-bare.nix b/nixos/desktop/i3.nix
similarity index 52%
rename from nixos/desktop/xfce-bare.nix
rename to nixos/desktop/i3.nix
index 392f93db..f8a3d7bb 100644
--- a/nixos/desktop/xfce-bare.nix
+++ b/nixos/desktop/i3.nix
@@ -3,16 +3,12 @@
   imports = [
     ./common.nix
     ./xserver.nix
+    ./sddm.nix
   ];
   services.xserver = {
-    enable = true;
-    desktopManager = {
-      xterm.enable = false;
-      xfce = {
-        enable = true;
-        enableXfwm = false;
-        noDesktop = true;
-      };
+    windowManager.i3.enable = true;
+    displayManager = {
+      defaultSession = "i3";
     };
   };
   programs.i3lock = {
diff --git a/nixos/desktop/xfce-bspwm.nix b/nixos/desktop/xfce-bspwm.nix
index f9c067f1..1cb43d90 100644
--- a/nixos/desktop/xfce-bspwm.nix
+++ b/nixos/desktop/xfce-bspwm.nix
@@ -1,13 +1,28 @@
-{ ... }:
+{ pkgs, ... }:
 {
   imports = [
+    ./common.nix
+    ./xserver.nix
     ./xfce-bare.nix
     ./sddm.nix
   ];
   services.xserver = {
+    enable = true;
+    desktopManager = {
+      xterm.enable = false;
+      xfce = {
+        enable = true;
+        enableXfwm = false;
+        noDesktop = true;
+      };
+    };
     windowManager.bspwm.enable = true;
     displayManager = {
       defaultSession = "xfce+bspwm";
     };
   };
+  programs.i3lock = {
+    enable = true;
+    package = pkgs.i3lock-fancy;
+  };
 }
diff --git a/nixos/desktop/xfce-i3.nix b/nixos/desktop/xfce-i3.nix
deleted file mode 100644
index b8e9fc85..00000000
--- a/nixos/desktop/xfce-i3.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ ... }:
-{
-  imports = [
-    ./xfce-bare.nix
-    ./sddm.nix
-  ];
-  services.xserver = {
-    windowManager.i3.enable = true;
-    displayManager = {
-      defaultSession = "xfce+i3";
-    };
-  };
-}