Salastil/DankMaterialShell
1
0
Fork 0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2026-04-03 20:32:07 -04:00
Code Packages Releases Activity

fix and cleanup flake (#178)

Browse Source 
- switch to nixpkgs-unstable
- use a more sensible set in `forEachSystem`
- fix typos in options
- add hotkey-overlay title for binds
- use the new `dms` cli tool instead of qs ipc calls
This commit is contained in:
Rishi Vora
2025-09-08 22:32:32 +05:30
committed by GitHub
parent 079faa0d40
commit 9d416ddbd6
3 changed files with 219 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
alejandra.toml Normal file
View File

@@ -0,0 +1 @@
indentation = "FourSpaces"

43
flake.lock generated
View File

@@ -1,5 +1,25 @@
{ {
"nodes": { "nodes": {
"dgop": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1757252286,
"narHash": "sha256-QwWQzlxAGvIi6VAc8DQ6ONCKKwtPyaHQW1cQyGbP7Og=",
"owner": "AvengeMedia",
"repo": "dgop",
"rev": "a65a02ddf8bade9c109d055e644e4bd851183bd5",
"type": "github"
},
"original": {
"owner": "AvengeMedia",
"repo": "dgop",
"type": "github"
}
},
"dms-cli": { "dms-cli": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@@ -7,11 +27,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1757112511, "lastModified": 1757296630,
"narHash": "sha256-WE1cUTr53VJG06YAkpYG+HvdXp4fFyqZwXqsABOXYFY=", "narHash": "sha256-3H236F5oIKkqpfnwrvZQs4Y5imKb6JCMFGDkHs8VDjQ=",
"owner": "AvengeMedia", "owner": "AvengeMedia",
"repo": "danklinux", "repo": "danklinux",
"rev": "563c7fdcba0e8c6ac0f4b3292308e8bcbb553da6", "rev": "dac591711ab30d6b071a5cec674a3d2e04665ee1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -22,16 +42,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1754214453, "lastModified": 1757034884,
"narHash": "sha256-Q/I2xJn/j1wpkGhWkQnm20nShYnG7TI99foDBpXm1SY=", "narHash": "sha256-PgLSZDBEWUHpfTRfFyklmiiLBE1i1aGCtz4eRA3POao=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5b09dc45f24cf32316283e62aec81ffee3c3e376", "rev": "ca77296380960cd497a765102eeb1356eb80fed0",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-unstable", "ref": "nixpkgs-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@@ -43,11 +63,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1753595452, "lastModified": 1756981260,
"narHash": "sha256-vqkSDvh7hWhPvNjMjEDV4KbSCv2jyl2Arh73ZXe274k=", "narHash": "sha256-GhuD9QVimjynHI0OOyZsqJsnlXr2orowh9H+HYz4YMs=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "a5431dd02dc23d9ef1680e67777fed00fe5f7cda", "rev": "6eb12551baf924f8fdecdd04113863a754259c34",
"revCount": 665, "revCount": 672,
"type": "git", "type": "git",
"url": "https://git.outfoxxed.me/quickshell/quickshell" "url": "https://git.outfoxxed.me/quickshell/quickshell"
}, },
@@ -58,6 +78,7 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"dgop": "dgop",
"dms-cli": "dms-cli", "dms-cli": "dms-cli",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"quickshell": "quickshell" "quickshell": "quickshell"

124
flake.nix
View File

@@ -1,8 +1,8 @@
{ {
description = "Dank material shell."; description = "Dank Material Shell";
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs?ref=nixpkgs-unstable";
quickshell = { quickshell = {
url = "git+https://git.outfoxxed.me/quickshell/quickshell"; url = "git+https://git.outfoxxed.me/quickshell/quickshell";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@@ -17,14 +17,22 @@
}; };
}; };
outputs = { self, nixpkgs, quickshell, dgop, dms-cli, ... }: outputs = {
let self,
nixpkgs,
quickshell,
dgop,
dms-cli,
...
}: let
forEachSystem = fn: forEachSystem = fn:
nixpkgs.lib.genAttrs nixpkgs.lib.genAttrs
nixpkgs.lib.platforms.linux ["aarch64-darwin" "aarch64-linux" "x86_64-darwin" "x86_64-linux"]
(system: fn system nixpkgs.legacyPackages.${system}); (system: fn system nixpkgs.legacyPackages.${system});
in { in {
packages = forEachSystem (system: pkgs: rec { formatter = forEachSystem (_: pkgs: pkgs.alejandra);
packages = forEachSystem (system: pkgs: {
dankMaterialShell = pkgs.stdenvNoCC.mkDerivation { dankMaterialShell = pkgs.stdenvNoCC.mkDerivation {
name = "dankMaterialShell"; name = "dankMaterialShell";
src = ./.; src = ./.;
@@ -35,66 +43,67 @@
''; '';
}; };
quickshell = quickshell.packages.${system}.default;
default = self.packages.${system}.dankMaterialShell; default = self.packages.${system}.dankMaterialShell;
}); });
homeModules.dankMaterialShell = { config, pkgs, lib, ... }: homeModules.dankMaterialShell = {
let cfg = config.programs.dankMaterialShell; config,
pkgs,
lib,
...
}: let
cfg = config.programs.dankMaterialShell;
inherit (lib.types) bool;
in { in {
options.programs.dankMaterialShell = { options.programs.dankMaterialShell = {
enable = lib.mkEnableOption "DankMaterialShell"; enable = lib.mkEnableOption "DankMaterialShell";
enableKeybinds = enableKeybinds = lib.mkEnableOption "DankMaterialShell niri keybinds";
lib.mkEnableOption "DankMaterialShell Niri keybinds"; enableSystemd = lib.mkEnableOption "DankMaterialShell systemd startup";
enableSystemd = enableSpawn = lib.mkEnableOption "DankMaterialShell niri spawn-at-startup";
lib.mkEnableOption "DankMaterialShell systemd startup";
enableSpawn =
lib.mkEnableOption "DankMaterialShell Niri spawn-at-startup";
enableSystemMonitoring = lib.mkOption { enableSystemMonitoring = lib.mkOption {
type = lib.types.bool; type = bool;
default = true; default = true;
description = "Add needed dependencies to use system monitoring widgets"; description = "Add needed dependencies to use system monitoring widgets";
}; };
enableClipboard = lib.mkOption { enableClipboard = lib.mkOption {
type = lib.types.bool; type = bool;
default = true; default = true;
description = "Add needed dependencies to use the clipboard widget"; description = "Add needed dependencies to use the clipboard widget";
}; };
enableVPN = lib.mkOption { enableVPN = lib.mkOption {
type = lib.types.bool; type = bool;
default = true; default = true;
description = "Add needed dependencies to use the VPN widget"; description = "Add needed dependencies to use the VPN widget";
}; };
enableBrigthnessControl = lib.mkOption { enableBrightnessControl = lib.mkOption {
type = lib.types.bool; type = bool;
default = true; default = true;
description = "Add needed dependencies to have brightness/backlight support"; description = "Add needed dependencies to have brightness/backlight support";
}; };
enableNightMode = lib.mkOption { enableNightMode = lib.mkOption {
type = lib.types.bool; type = bool;
default = true; default = true;
description = "Add needed dependencies to have night mode support"; description = "Add needed dependencies to have night mode support";
}; };
enableDynamicTheming = lib.mkOption { enableDynamicTheming = lib.mkOption {
type = lib.types.bool; type = bool;
default = true; default = true;
description = "Add needed dependencies to have dynamic theming support"; description = "Add needed dependencies to have dynamic theming support";
}; };
enableAudioWavelenght = lib.mkOption { enableAudioWavelength = lib.mkOption {
type = lib.types.bool; type = bool;
default = true; default = true;
description = "Add needed dependencies to have audio wavelenght support"; description = "Add needed dependencies to have audio waveleng support";
}; };
enableCalendarEvents = lib.mkOption { enableCalendarEvents = lib.mkOption {
type = lib.types.bool; type = bool;
default = true; default = true;
description = "Add calendar events support via khal"; description = "Add calendar events support via khal";
}; };
quickshell = { quickshell = {
package = lib.mkPackageOption pkgs "quickshell" { package = lib.mkPackageOption pkgs "quickshell" {};
default = quickshell.packages.${pkgs.system}.quickshell;
nullable = false;
};
}; };
}; };
@@ -102,10 +111,12 @@
programs.quickshell = { programs.quickshell = {
enable = true; enable = true;
package = cfg.quickshell.package; package = cfg.quickshell.package;
configs.DankMaterialShell = "${
configs.dms = "${
self.packages.${pkgs.system}.dankMaterialShell self.packages.${pkgs.system}.dankMaterialShell
}/etc/xdg/quickshell/DankMaterialShell"; }/etc/xdg/quickshell/DankMaterialShell";
activeConfig = lib.mkIf cfg.enableSystemd "DankMaterialShell"; activeConfig = lib.mkIf cfg.enableSystemd "dms";
systemd = lib.mkIf cfg.enableSystemd { systemd = lib.mkIf cfg.enableSystemd {
enable = true; enable = true;
target = "graphical-session.target"; target = "graphical-session.target";
@@ -115,38 +126,55 @@
programs.niri.settings = lib.mkMerge [ programs.niri.settings = lib.mkMerge [
(lib.mkIf cfg.enableKeybinds { (lib.mkIf cfg.enableKeybinds {
binds = with config.lib.niri.actions; let binds = with config.lib.niri.actions; let
quickShellIpc = spawn "${cfg.quickshell.package}/bin/qs" "-c" "DankMaterialShell" "ipc" "call"; dms-ipc = spawn "dms" "ipc";
in { in {
"Mod+Space".action = quickShellIpc "spotlight" "toggle"; "Mod+Space" = {
"Mod+V".action = quickShellIpc "clipboard" "toggle"; action = dms-ipc "spotlight" "toggle";
"Mod+M".action = quickShellIpc "processlist" "toggle"; hotkey-overlay.title = "Toggle Spotlight";
"Mod+Comma".action = quickShellIpc "settings" "toggle"; };
"Super+Alt+L".action = quickShellIpc "lock" "lock"; "Mod+V" = {
action = dms-ipc "clipboard" "toggle";
hotkey-overlay.title = "Toggle Clipboard Manager";
};
"Mod+M" = {
action = dms-ipc "processlist" "toggle";
hotkey-overlay.title = "Toggle Process List";
};
"Mod+Comma" = {
action = dms-ipc "settings" "toggle";
hotkey-overlay.title = "Toggle Settings";
};
"Super+Alt+L" = {
action = dms-ipc "lock" "lock";
hotkey-overlay.title = "Toggle Lock Screen";
};
"XF86AudioRaiseVolume" = { "XF86AudioRaiseVolume" = {
allow-when-locked = true; allow-when-locked = true;
action = quickShellIpc "audio" "increment" "3"; action = dms-ipc "audio" "increment" "3";
}; };
"XF86AudioLowerVolume" = { "XF86AudioLowerVolume" = {
allow-when-locked = true; allow-when-locked = true;
action = quickShellIpc "audio" "decrement" "3"; action = dms-ipc "audio" "decrement" "3";
}; };
"XF86AudioMute" = { "XF86AudioMute" = {
allow-when-locked = true; allow-when-locked = true;
action = quickShellIpc "audio" "mute"; action = dms-ipc "audio" "mute";
}; };
"XF86AudioMicMute" = { "XF86AudioMicMute" = {
allow-when-locked = true; allow-when-locked = true;
action = quickShellIpc "audio" "micmute"; action = dms-ipc "audio" "micmute";
}; };
}; };
}) })
(lib.mkIf (cfg.enableSpawn) { (lib.mkIf cfg.enableSpawn {
spawn-at-startup = spawn-at-startup = [
[{ command = [ "${cfg.quickshell.package}/bin/qs" "-c" "DankMaterialShell" ]; }]; {command = ["dms" "run"];}
];
}) })
]; ];
home.packages = [ home.packages =
[
pkgs.material-symbols pkgs.material-symbols
pkgs.inter pkgs.inter
pkgs.fira-code pkgs.fira-code
@@ -159,10 +187,10 @@
++ lib.optional cfg.enableSystemMonitoring dgop.packages.${pkgs.system}.dgop ++ lib.optional cfg.enableSystemMonitoring dgop.packages.${pkgs.system}.dgop
++ lib.optionals cfg.enableClipboard [pkgs.cliphist pkgs.wl-clipboard] ++ lib.optionals cfg.enableClipboard [pkgs.cliphist pkgs.wl-clipboard]
++ lib.optionals cfg.enableVPN [pkgs.glib pkgs.networkmanager] ++ lib.optionals cfg.enableVPN [pkgs.glib pkgs.networkmanager]
++ lib.optional cfg.enableBrigthnessControl pkgs.brightnessctl ++ lib.optional cfg.enableBrightnessControl pkgs.brightnessctl
++ lib.optional cfg.enableNightMode pkgs.gammastep ++ lib.optional cfg.enableNightMode pkgs.gammastep
++ lib.optional cfg.enableDynamicTheming pkgs.matugen ++ lib.optional cfg.enableDynamicTheming pkgs.matugen
++ lib.optional cfg.enableAudioWavelenght pkgs.cava ++ lib.optional cfg.enableAudioWavelength pkgs.cava
++ lib.optional cfg.enableCalendarEvents pkgs.khal; ++ lib.optional cfg.enableCalendarEvents pkgs.khal;
}; };
}; };