Salastil/DankMaterialShell
1
0
Fork 0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2026-01-29 07:52:50 -05:00
Code Packages Releases Activity

nix: match upstream package format (#918)

Browse Source
This commit is contained in:
Lucas
2025-12-05 18:11:18 -03:00
committed by GitHub
parent c3233fbf61
commit 2c23d0249c
5 changed files with 49 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
distro/nix/common.nix
View File

@@ -7,7 +7,7 @@
}: let
cfg = config.programs.dankMaterialShell;
in {
qmlPath = "${dmsPkgs.dankMaterialShell}/etc/xdg/quickshell/dms";
qmlPath = "${dmsPkgs.dms-shell}/share/quickshell/dms";
packages =
[
@@ -19,7 +19,7 @@ in {
pkgs.libsForQt5.qt5ct
pkgs.kdePackages.qt6ct
dmsPkgs.dmsCli
dmsPkgs.dms-shell
]
++ lib.optional cfg.enableSystemMonitoring dmsPkgs.dgop
++ lib.optionals cfg.enableClipboard [pkgs.cliphist pkgs.wl-clipboard]

2
distro/nix/greeter.nix
View File

@@ -20,7 +20,7 @@
"--command"
cfg.compositor.name
"-p"
"${dmsPkgs.dankMaterialShell}/etc/xdg/quickshell/dms"
"${dmsPkgs.dms-shell}/share/quickshell/dms"
]
++ lib.optionals (cfg.compositor.customConfig != "") [
"-C"

4
distro/nix/home.nix
View File

@@ -66,7 +66,7 @@ in {
};
Service = {
ExecStart = lib.getExe dmsPkgs.dmsCli + " run --session";
ExecStart = lib.getExe dmsPkgs.dms-shell + " run --session";
Restart = "on-failure";
};
@@ -89,6 +89,6 @@ in {
}
];
home.packages = common.packages ++ [dmsPkgs.dankMaterialShell];
home.packages = common.packages;
};
}

6
distro/nix/nixos.nix
View File

@@ -14,7 +14,7 @@ in {
config = lib.mkIf cfg.enable
{
environment.etc."xdg/quickshell/dms".source = "${dmsPkgs.dankMaterialShell}/etc/xdg/quickshell/dms";
environment.etc."xdg/quickshell/dms".source = "${dmsPkgs.dms-shell}/share/quickshell/dms";
systemd.user.services.dms = lib.mkIf cfg.systemd.enable {
description = "DankMaterialShell";
@@ -26,11 +26,11 @@ in {
restartTriggers = lib.optional cfg.systemd.restartIfChanged common.qmlPath;
serviceConfig = {
ExecStart = lib.getExe dmsPkgs.dmsCli + " run --session";
ExecStart = lib.getExe dmsPkgs.dms-shell + " run --session";
Restart = "on-failure";
};
};
environment.systemPackages = [cfg.quickshell.package dmsPkgs.dankMaterialShell] ++ common.packages;
environment.systemPackages = [cfg.quickshell.package] ++ common.packages;
};
}