From d9e5fdb0df7de78ee5400935db8d877134e412c8 Mon Sep 17 00:00:00 2001
From: John Ogle <john@ogle.fyi>
Date: Tue, 10 Sep 2024 10:40:06 -0700
Subject: [PATCH] Merge i3+sway configs

---
 home/home-default.nix                      |  3 +--
 home/modules/{sway => i3+sway}/default.nix | 15 +++++++++++----
 home/modules/i3/default.nix                | 12 ------------
 3 files changed, 12 insertions(+), 18 deletions(-)
 rename home/modules/{sway => i3+sway}/default.nix (57%)
 delete mode 100644 home/modules/i3/default.nix

diff --git a/home/home-default.nix b/home/home-default.nix
index e0cf0c7..2379330 100644
--- a/home/home-default.nix
+++ b/home/home-default.nix
@@ -108,8 +108,7 @@ in
   imports = [
     ./modules/emacs
     ./modules/lutris
-    ./modules/i3
-    ./modules/sway
+    ./modules/i3+sway
   ];
 
   programs.bash.enable = true;
diff --git a/home/modules/sway/default.nix b/home/modules/i3+sway/default.nix
similarity index 57%
rename from home/modules/sway/default.nix
rename to home/modules/i3+sway/default.nix
index 004df3d..4f7664d 100644
--- a/home/modules/sway/default.nix
+++ b/home/modules/i3+sway/default.nix
@@ -1,12 +1,19 @@
 { config, lib, pkgs, ... }:
 
-{
-  wayland.windowManager.sway = {
-    enable = true;
-    config = {
+let
+  shared_config = {
       modifier = "Mod4";
       terminal = "kitty";
       defaultWorkspace = "workspace number 1";
     };
+in {
+  xsession.windowManager.i3 = {
+    enable = true;
+    config = shared_config;
+  };
+
+  wayland.windowManager.sway = {
+    enable = true;
+    config = shared_config;
   };
 }
diff --git a/home/modules/i3/default.nix b/home/modules/i3/default.nix
deleted file mode 100644
index 61d6661..0000000
--- a/home/modules/i3/default.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  xsession.windowManager.i3 = {
-    enable = true;
-    config = {
-      modifier = "Mod4";
-      terminal = "kitty";
-      defaultWorkspace = "workspace number 1";
-    };
-  };
-}