1
0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2026-01-30 00:12:50 -05:00

Relocate Nix dir under distro/nix

This commit is contained in:
purian23
2025-11-13 23:47:00 -05:00
parent b7aeaa7fc5
commit 9d1fac3570
5 changed files with 9 additions and 8 deletions

View File

@@ -36,8 +36,10 @@ DankMaterialShell/
│ ├── cmd/ # dms CLI and dankinstall binaries │ ├── cmd/ # dms CLI and dankinstall binaries
│ ├── internal/ # System integration, IPC, distro support │ ├── internal/ # System integration, IPC, distro support
│ └── pkg/ # Shared packages │ └── pkg/ # Shared packages
├── distro/ # Distribution packaging (Fedora RPM specs) ├── distro/ # Distribution packaging
├── nix/ # NixOS/home-manager modules │ ├── fedora/ # Fedora RPM specs
│ ├── debian/ # Debian packaging
│ └── nix/ # NixOS/home-manager modules
└── flake.nix # Nix flake for declarative installation └── flake.nix # Nix flake for declarative installation
``` ```
@@ -136,8 +138,7 @@ See component-specific documentation:
- **[quickshell/](quickshell/)** - QML shell development, widgets, and modules - **[quickshell/](quickshell/)** - QML shell development, widgets, and modules
- **[core/](core/)** - Go backend, CLI tools, and system integration - **[core/](core/)** - Go backend, CLI tools, and system integration
- **[distro/](distro/)** - Distribution packaging - **[distro/](distro/)** - Distribution packaging (Fedora, Debian, NixOS)
- **[nix/](nix/)** - NixOS and home-manager modules
### Building from Source ### Building from Source

View File

@@ -14,7 +14,7 @@
export PATH=$PATH:${lib.makeBinPath [ cfg.quickshell.package config.programs.${cfg.compositor.name}.package ]} export PATH=$PATH:${lib.makeBinPath [ cfg.quickshell.package config.programs.${cfg.compositor.name}.package ]}
${lib.escapeShellArgs ([ ${lib.escapeShellArgs ([
"sh" "sh"
"${../quickshell/Modules/Greetd/assets/dms-greeter}" "${../../quickshell/Modules/Greetd/assets/dms-greeter}"
"--cache-dir" "--cache-dir"
"/var/lib/dmsgreeter" "/var/lib/dmsgreeter"
"--command" "--command"

View File

@@ -84,16 +84,16 @@
homeModules.dankMaterialShell.default = {pkgs, ...}: let homeModules.dankMaterialShell.default = {pkgs, ...}: let
dmsPkgs = buildDmsPkgs pkgs; dmsPkgs = buildDmsPkgs pkgs;
in { in {
imports = [./nix/default.nix]; imports = [./distro/nix/default.nix];
_module.args.dmsPkgs = dmsPkgs; _module.args.dmsPkgs = dmsPkgs;
}; };
homeModules.dankMaterialShell.niri = import ./nix/niri.nix; homeModules.dankMaterialShell.niri = import ./distro/nix/niri.nix;
nixosModules.greeter = {pkgs, ...}: let nixosModules.greeter = {pkgs, ...}: let
dmsPkgs = buildDmsPkgs pkgs; dmsPkgs = buildDmsPkgs pkgs;
in { in {
imports = [./nix/greeter.nix]; imports = [./distro/nix/greeter.nix];
_module.args.dmsPkgs = dmsPkgs; _module.args.dmsPkgs = dmsPkgs;
}; };
}; };