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

nix: use by default quickshell from source (#939)

This commit is contained in:
Lucas
2025-12-07 23:11:22 -03:00
committed by GitHub
parent 54b253099d
commit f6a776a692
5 changed files with 43 additions and 13 deletions

View File

@@ -4,13 +4,13 @@
lib, lib,
dmsPkgs, dmsPkgs,
... ...
}: let } @ args: let
cfg = config.programs.dankMaterialShell; cfg = config.programs.dankMaterialShell;
jsonFormat = pkgs.formats.json {}; jsonFormat = pkgs.formats.json {};
common = import ./common.nix {inherit config pkgs lib dmsPkgs;}; common = import ./common.nix {inherit config pkgs lib dmsPkgs;};
in { in {
imports = [ imports = [
./options.nix (import ./options.nix args)
(lib.mkRemovedOptionModule ["programs" "dankMaterialShell" "enableNightMode"] "Night mode is now always available.") (lib.mkRemovedOptionModule ["programs" "dankMaterialShell" "enableNightMode"] "Night mode is now always available.")
(lib.mkRenamedOptionModule ["programs" "dankMaterialShell" "enableSystemd"] ["programs" "dankMaterialShell" "systemd" "enable"]) (lib.mkRenamedOptionModule ["programs" "dankMaterialShell" "enableSystemd"] ["programs" "dankMaterialShell" "systemd" "enable"])
]; ];

View File

@@ -4,12 +4,12 @@
lib, lib,
dmsPkgs, dmsPkgs,
... ...
}: let } @ args: let
cfg = config.programs.dankMaterialShell; cfg = config.programs.dankMaterialShell;
common = import ./common.nix {inherit config pkgs lib dmsPkgs;}; common = import ./common.nix {inherit config pkgs lib dmsPkgs;};
in { in {
imports = [ imports = [
./options.nix (import ./options.nix args)
]; ];
config = lib.mkIf cfg.enable config = lib.mkIf cfg.enable

View File

@@ -1,6 +1,6 @@
{ {
pkgs,
lib, lib,
dmsPkgs,
... ...
}: let }: let
inherit (lib) types; inherit (lib) types;
@@ -62,7 +62,9 @@ in {
description = "Add needed dependencies to have system sound support"; description = "Add needed dependencies to have system sound support";
}; };
quickshell = { quickshell = {
package = lib.mkPackageOption pkgs "quickshell" {}; package = lib.mkPackageOption dmsPkgs "quickshell" {
extraDescription = "The quickshell package to use (defaults to be built from source, in the commit 26531f due to unreleased features used by DMS).";
};
}; };
}; };
} }

36
flake.lock generated
View File

@@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1762435535, "lastModified": 1762835999,
"narHash": "sha256-QhzRn7pYN35IFpKjjxJAj3GPJECuC+VLhoGem3ezycc=", "narHash": "sha256-UykYGrGFOFTmDpKTLNxj1wvd1gbDG4TkqLNSbV0TYwk=",
"owner": "AvengeMedia", "owner": "AvengeMedia",
"repo": "dgop", "repo": "dgop",
"rev": "6cf638dde818f9f8a2e26d0243179c43cb3458d7", "rev": "799301991cd5dcea9b64245f9d500dcc76615653",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -22,11 +22,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1762363567, "lastModified": 1764950072,
"narHash": "sha256-YRqMDEtSMbitIMj+JLpheSz0pwEr0Rmy5mC7myl17xs=", "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ae814fd3904b621d8ab97418f1d0f2eb0d3716f4", "rev": "f61125a668a320878494449750330ca58b78c557",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -36,10 +36,32 @@
"type": "github" "type": "github"
} }
}, },
"quickshell": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1764663772,
"narHash": "sha256-sHqLmm0wAt3PC4vczJeBozI1/f4rv9yp3IjkClHDXDs=",
"ref": "refs/heads/master",
"rev": "26531fc46ef17e9365b03770edd3fb9206fcb460",
"revCount": 713,
"type": "git",
"url": "https://git.outfoxxed.me/quickshell/quickshell"
},
"original": {
"rev": "26531fc46ef17e9365b03770edd3fb9206fcb460",
"type": "git",
"url": "https://git.outfoxxed.me/quickshell/quickshell"
}
},
"root": { "root": {
"inputs": { "inputs": {
"dgop": "dgop", "dgop": "dgop",
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs",
"quickshell": "quickshell"
} }
} }
}, },

View File

@@ -7,12 +7,17 @@
url = "github:AvengeMedia/dgop"; url = "github:AvengeMedia/dgop";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
quickshell = {
url = "git+https://git.outfoxxed.me/quickshell/quickshell?rev=26531fc46ef17e9365b03770edd3fb9206fcb460";
inputs.nixpkgs.follows = "nixpkgs";
};
}; };
outputs = { outputs = {
self, self,
nixpkgs, nixpkgs,
dgop, dgop,
quickshell,
... ...
}: let }: let
forEachSystem = fn: forEachSystem = fn:
@@ -22,6 +27,7 @@
buildDmsPkgs = pkgs: { buildDmsPkgs = pkgs: {
dms-shell = self.packages.${pkgs.stdenv.hostPlatform.system}.default; dms-shell = self.packages.${pkgs.stdenv.hostPlatform.system}.default;
dgop = dgop.packages.${pkgs.stdenv.hostPlatform.system}.dgop; dgop = dgop.packages.${pkgs.stdenv.hostPlatform.system}.dgop;
quickshell = quickshell.packages.${pkgs.stdenv.hostPlatform.system}.default;
}; };
mkModuleWithDmsPkgs = path: args @ {pkgs, ...}: { mkModuleWithDmsPkgs = path: args @ {pkgs, ...}: {
imports = [ imports = [