From 9d1fac3570d780b61609f35516e4d4c8eb617841 Mon Sep 17 00:00:00 2001
From: purian23 <purian23@gmail.com>
Date: Thu, 13 Nov 2025 23:47:00 -0500
Subject: [PATCH] Relocate Nix dir under distro/nix

---
 README.md                       | 9 +++++----
 {nix => distro/nix}/default.nix | 0
 {nix => distro/nix}/greeter.nix | 2 +-
 {nix => distro/nix}/niri.nix    | 0
 flake.nix                       | 6 +++---
 5 files changed, 9 insertions(+), 8 deletions(-)
 rename {nix => distro/nix}/default.nix (100%)
 rename {nix => distro/nix}/greeter.nix (98%)
 rename {nix => distro/nix}/niri.nix (100%)

diff --git a/README.md b/README.md
index a215b9a6..76272917 100644
--- a/README.md
+++ b/README.md
@@ -36,8 +36,10 @@ DankMaterialShell/
 │   ├── cmd/            # dms CLI and dankinstall binaries
 │   ├── internal/       # System integration, IPC, distro support
 │   └── pkg/            # Shared packages
-├── distro/             # Distribution packaging (Fedora RPM specs)
-├── nix/                # NixOS/home-manager modules
+├── distro/             # Distribution packaging
+│   ├── fedora/         # Fedora RPM specs
+│   ├── debian/         # Debian packaging
+│   └── nix/            # NixOS/home-manager modules
 └── flake.nix           # Nix flake for declarative installation
 ```
 
@@ -136,8 +138,7 @@ See component-specific documentation:
 
 - **[quickshell/](quickshell/)** - QML shell development, widgets, and modules
 - **[core/](core/)** - Go backend, CLI tools, and system integration
-- **[distro/](distro/)** - Distribution packaging
-- **[nix/](nix/)** - NixOS and home-manager modules
+- **[distro/](distro/)** - Distribution packaging (Fedora, Debian, NixOS)
 
 ### Building from Source
 
diff --git a/nix/default.nix b/distro/nix/default.nix
similarity index 100%
rename from nix/default.nix
rename to distro/nix/default.nix
diff --git a/nix/greeter.nix b/distro/nix/greeter.nix
similarity index 98%
rename from nix/greeter.nix
rename to distro/nix/greeter.nix
index ac736b40..04dba7ca 100644
--- a/nix/greeter.nix
+++ b/distro/nix/greeter.nix
@@ -14,7 +14,7 @@
         export PATH=$PATH:${lib.makeBinPath [ cfg.quickshell.package config.programs.${cfg.compositor.name}.package ]}
         ${lib.escapeShellArgs ([
             "sh"
-            "${../quickshell/Modules/Greetd/assets/dms-greeter}"
+            "${../../quickshell/Modules/Greetd/assets/dms-greeter}"
             "--cache-dir"
             "/var/lib/dmsgreeter"
             "--command"
diff --git a/nix/niri.nix b/distro/nix/niri.nix
similarity index 100%
rename from nix/niri.nix
rename to distro/nix/niri.nix
diff --git a/flake.nix b/flake.nix
index 110c2d67..cfae738a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -84,16 +84,16 @@
         homeModules.dankMaterialShell.default = {pkgs, ...}: let
             dmsPkgs = buildDmsPkgs pkgs;
         in {
-            imports = [./nix/default.nix];
+            imports = [./distro/nix/default.nix];
             _module.args.dmsPkgs = dmsPkgs;
         };
 
-        homeModules.dankMaterialShell.niri = import ./nix/niri.nix;
+        homeModules.dankMaterialShell.niri = import ./distro/nix/niri.nix;
 
         nixosModules.greeter = {pkgs, ...}: let
             dmsPkgs = buildDmsPkgs pkgs;
         in {
-            imports = [./nix/greeter.nix];
+            imports = [./distro/nix/greeter.nix];
             _module.args.dmsPkgs = dmsPkgs;
         };
     };