From da28819606886ef6bd18aba4d40d3abfeecb6efa Mon Sep 17 00:00:00 2001
From: sajenim <its.jassy@pm.me>
Date: Fri, 7 Jul 2023 22:24:26 +0800
Subject: [PATCH] collapse dev dirs

---
 flake.lock                                                | 8 ++++----
 flake.nix                                                 | 6 +++---
 home-manager/common/desktop/default.nix                   | 2 +-
 .../common/desktop/xmobar/{xmobar-config => }/flake.lock  | 0
 .../common/desktop/xmobar/{xmobar-config => }/flake.nix   | 0
 .../desktop/xmobar/{xmobar-config => }/src/xmobar-top.hs  | 0
 .../xmobar/{xmobar-config => }/xmobar-config.cabal        | 0
 .../common/desktop/xmonad/{xmonad-config => }/flake.lock  | 0
 .../common/desktop/xmonad/{xmonad-config => }/flake.nix   | 0
 .../desktop/xmonad/{xmonad-config => }/src/xmonad.hs      | 0
 .../xmonad/{xmonad-config => }/xmonad-config.cabal        | 0
 11 files changed, 8 insertions(+), 8 deletions(-)
 rename home-manager/common/desktop/xmobar/{xmobar-config => }/flake.lock (100%)
 rename home-manager/common/desktop/xmobar/{xmobar-config => }/flake.nix (100%)
 rename home-manager/common/desktop/xmobar/{xmobar-config => }/src/xmobar-top.hs (100%)
 rename home-manager/common/desktop/xmobar/{xmobar-config => }/xmobar-config.cabal (100%)
 rename home-manager/common/desktop/xmonad/{xmonad-config => }/flake.lock (100%)
 rename home-manager/common/desktop/xmonad/{xmonad-config => }/flake.nix (100%)
 rename home-manager/common/desktop/xmonad/{xmonad-config => }/src/xmonad.hs (100%)
 rename home-manager/common/desktop/xmonad/{xmonad-config => }/xmonad-config.cabal (100%)

diff --git a/flake.lock b/flake.lock
index c97bd51..be2f271 100644
--- a/flake.lock
+++ b/flake.lock
@@ -205,11 +205,11 @@
       "locked": {
         "lastModified": 1,
         "narHash": "sha256-9yA3EWDaaAmIpotcyodU2TOU9hiKU6mGhx1CDmqab2o=",
-        "path": "home-manager/common/desktop/xmobar/xmobar-config",
+        "path": "home-manager/common/desktop/xmobar",
         "type": "path"
       },
       "original": {
-        "path": "home-manager/common/desktop/xmobar/xmobar-config",
+        "path": "home-manager/common/desktop/xmobar",
         "type": "path"
       }
     },
@@ -222,11 +222,11 @@
       "locked": {
         "lastModified": 1,
         "narHash": "sha256-E4BkxlATBwtD2VV2R9RU27T7ih7NCvif/n50RV6mgiY=",
-        "path": "home-manager/common/desktop/xmonad/xmonad-config",
+        "path": "home-manager/common/desktop/xmonad",
         "type": "path"
       },
       "original": {
-        "path": "home-manager/common/desktop/xmonad/xmonad-config",
+        "path": "home-manager/common/desktop/xmonad",
         "type": "path"
       }
     }
diff --git a/flake.nix b/flake.nix
index 0e17d60..540c801 100644
--- a/flake.nix
+++ b/flake.nix
@@ -15,9 +15,9 @@
 
     # Add any other flake you might need
 
-    # Developer environments
-    xmonad-config.url = "path:home-manager/common/desktop/xmonad/xmonad-config";
-    xmobar-config.url = "path:home-manager/common/desktop/xmobar/xmobar-config";
+    # Development environments
+    xmonad-config.url = "path:home-manager/common/desktop/xmonad";
+    xmobar-config.url = "path:home-manager/common/desktop/xmobar";
   };
 
   outputs = { self, nixpkgs, home-manager, ... }@inputs:
diff --git a/home-manager/common/desktop/default.nix b/home-manager/common/desktop/default.nix
index 1fd7a1c..02cbbe9 100644
--- a/home-manager/common/desktop/default.nix
+++ b/home-manager/common/desktop/default.nix
@@ -19,7 +19,7 @@
   xsession.windowManager.xmonad = {
     enable = true;
     enableContribAndExtras = true;
-    config = ./xmonad/xmonad-config/src/xmonad.hs;
+    config = ./xmonad/src/xmonad.hs;
   };
 
   home.file.".xinitrc".source = ./xinitrc;
diff --git a/home-manager/common/desktop/xmobar/xmobar-config/flake.lock b/home-manager/common/desktop/xmobar/flake.lock
similarity index 100%
rename from home-manager/common/desktop/xmobar/xmobar-config/flake.lock
rename to home-manager/common/desktop/xmobar/flake.lock
diff --git a/home-manager/common/desktop/xmobar/xmobar-config/flake.nix b/home-manager/common/desktop/xmobar/flake.nix
similarity index 100%
rename from home-manager/common/desktop/xmobar/xmobar-config/flake.nix
rename to home-manager/common/desktop/xmobar/flake.nix
diff --git a/home-manager/common/desktop/xmobar/xmobar-config/src/xmobar-top.hs b/home-manager/common/desktop/xmobar/src/xmobar-top.hs
similarity index 100%
rename from home-manager/common/desktop/xmobar/xmobar-config/src/xmobar-top.hs
rename to home-manager/common/desktop/xmobar/src/xmobar-top.hs
diff --git a/home-manager/common/desktop/xmobar/xmobar-config/xmobar-config.cabal b/home-manager/common/desktop/xmobar/xmobar-config.cabal
similarity index 100%
rename from home-manager/common/desktop/xmobar/xmobar-config/xmobar-config.cabal
rename to home-manager/common/desktop/xmobar/xmobar-config.cabal
diff --git a/home-manager/common/desktop/xmonad/xmonad-config/flake.lock b/home-manager/common/desktop/xmonad/flake.lock
similarity index 100%
rename from home-manager/common/desktop/xmonad/xmonad-config/flake.lock
rename to home-manager/common/desktop/xmonad/flake.lock
diff --git a/home-manager/common/desktop/xmonad/xmonad-config/flake.nix b/home-manager/common/desktop/xmonad/flake.nix
similarity index 100%
rename from home-manager/common/desktop/xmonad/xmonad-config/flake.nix
rename to home-manager/common/desktop/xmonad/flake.nix
diff --git a/home-manager/common/desktop/xmonad/xmonad-config/src/xmonad.hs b/home-manager/common/desktop/xmonad/src/xmonad.hs
similarity index 100%
rename from home-manager/common/desktop/xmonad/xmonad-config/src/xmonad.hs
rename to home-manager/common/desktop/xmonad/src/xmonad.hs
diff --git a/home-manager/common/desktop/xmonad/xmonad-config/xmonad-config.cabal b/home-manager/common/desktop/xmonad/xmonad-config.cabal
similarity index 100%
rename from home-manager/common/desktop/xmonad/xmonad-config/xmonad-config.cabal
rename to home-manager/common/desktop/xmonad/xmonad-config.cabal