Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement bar.workspaces.workspaceIconMap in nix #725

Open
wants to merge 14 commits into
base: master
Choose a base branch
from
Open

Implement bar.workspaces.workspaceIconMap in nix #725

Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
a125ce5
adding support for bar.workspaces.workspaceIconMap
agluck91 Jan 15, 2025
f4d5d04
trying the attrs field now, last one was close
agluck91 Jan 15, 2025
4826228
trying to explicitly unflatten the sructure
agluck91 Jan 15, 2025
7883c9a
testing the flake udpate on my local
agluck91 Jan 15, 2025
8b8ed3c
explicitly removing workspaceIconMap from the flattening process
agluck91 Jan 15, 2025
9be28b3
trying other type format
agluck91 Jan 15, 2025
a6b2389
trying to pretty print the config
agluck91 Jan 15, 2025
2d3d693
remove the code I think I was being dumb
agluck91 Jan 15, 2025
dfdb9d5
update the example to match the wiki
agluck91 Jan 15, 2025
9ca2e65
testing some other options for unflattening
agluck91 Jan 15, 2025
47f5791
that did not do it
agluck91 Jan 15, 2025
0d15c80
making the code a little more configurable and hopefully less brittle
agluck91 Jan 15, 2025
318e4c9
Merge branch 'master' into master
agluck91 Jan 22, 2025
436ae4f
Merge branch 'master' into master
Jas-SinghFSU Jan 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
271 changes: 156 additions & 115 deletions nix/module.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,89 +1,124 @@
self: { lib, pkgs, config, ... }:
let
self: {
lib,
pkgs,
config,
...
}: let
inherit (lib) types mkIf mkOption mkEnableOption;

cfg = config.programs.hyprpanel;

jsonFormat = pkgs.formats.json { };
jsonFormat = pkgs.formats.json {};

# No package option
package = if pkgs ? hyprpanel then pkgs.hyprpanel
else abort ''
package =
if pkgs ? hyprpanel
then pkgs.hyprpanel
else
abort ''

********************************************************************************
* HyprPanel *
*------------------------------------------------------------------------------*
* You didn't add the overlay! *
* *
* Either set 'overlay.enable = true' or manually add it to 'nixpkgs.overlays'. *
* If you use the 'nixosModule' for Home Manager and have 'useGlobalPkgs' set, *
* you will need to add the overlay yourself. *
********************************************************************************
'';
********************************************************************************
* HyprPanel *
*------------------------------------------------------------------------------*
* You didn't add the overlay! *
* *
* Either set 'overlay.enable = true' or manually add it to 'nixpkgs.overlays'. *
* If you use the 'nixosModule' for Home Manager and have 'useGlobalPkgs' set, *
* you will need to add the overlay yourself. *
********************************************************************************
'';

# Shorthand lambda for self-documenting options under settings
mkStrOption = default: mkOption { type = types.str; default = default; };
mkIntOption = default: mkOption { type = types.int; default = default; };
mkBoolOption = default: mkOption { type = types.bool; default = default; };
mkStrListOption = default: mkOption { type = types.listOf types.str; default = default; };
mkFloatOption = default: mkOption { type = types.float; default = default; };
mkStrOption = default:
mkOption {
type = types.str;
default = default;
};
mkIntOption = default:
mkOption {
type = types.int;
default = default;
};
mkBoolOption = default:
mkOption {
type = types.bool;
default = default;
};
mkStrListOption = default:
mkOption {
type = types.listOf types.str;
default = default;
};
mkFloatOption = default:
mkOption {
type = types.float;
default = default;
};
mkJsonOption = default:
mkOption {
type = types.attrsOf types.str;
default = default;
};

# TODO: Please merge https://github.com/Jas-SinghFSU/HyprPanel/pull/497
# Do not ask what these do...
flattenAttrs = attrSet: prefix:
let
process = key: value:
if builtins.isAttrs value then
flattenAttrs value "${prefix}${key}."
else
{ "${prefix}${key}" = value; };
in
builtins.foldl' (acc: key:
excludeKeys = [
"workspaceIconMap"
];
flattenAttrs = attrSet: prefix: let
process = key: value:
if builtins.elem key excludeKeys
then {"${prefix}${key}" = value;}
else if builtins.isAttrs value
then flattenAttrs value "${prefix}${key}."
else {"${prefix}${key}" = value;};
in
builtins.foldl' (
acc: key:
acc // process key attrSet.${key}
) {} (builtins.attrNames attrSet);
) {} (builtins.attrNames attrSet);

toNestedValue =
let
escapeString = s: builtins.replaceStrings [ "\"" ] [ "\\\"" ] s;
in
toNestedValue = let
escapeString = s: builtins.replaceStrings ["\""] ["\\\""] s;
in
value:
if builtins.isBool value then
if value then "true" else "false"
else if (builtins.isInt value || builtins.isFloat value) then
builtins.toString value
else if builtins.isString value then
"\"" + escapeString value + "\""
else if builtins.isList value then
let
items = builtins.map toNestedValue value;
in
"[\n" + (builtins.concatStringsSep ", " items) + "\n]"
else if builtins.isAttrs value then
let
keys = builtins.attrNames value;
toKeyValue = k: "\"${k}\": ${toNestedValue value.${k}}";
inner = builtins.concatStringsSep ", " (builtins.map toKeyValue keys);
in
"{\n" + inner + "\n}"
else
abort "Unexpected error! Please post a new issue and @benvonh...";
if builtins.isBool value
then
if value
then "true"
else "false"
else if (builtins.isInt value || builtins.isFloat value)
then builtins.toString value
else if builtins.isString value
then "\"" + escapeString value + "\""
else if builtins.isList value
then let
items = builtins.map toNestedValue value;
in
"[\n" + (builtins.concatStringsSep ", " items) + "\n]"
else if builtins.isAttrs value
then let
keys = builtins.attrNames value;
toKeyValue = k: "\"${k}\": ${toNestedValue value.${k}}";
inner = builtins.concatStringsSep ", " (builtins.map toKeyValue keys);
in
"{\n" + inner + "\n}"
else abort "Unexpected error! Please post a new issue and @benvonh...";

toNestedObject = attrSet:
let
keys = builtins.attrNames attrSet;
kvPairs = builtins.map (k: "\"${k}\": ${toNestedValue attrSet.${k}}") keys;
in
"{\n " + builtins.concatStringsSep ",\n " kvPairs + "\n}";
in
{
toNestedObject = attrSet: let
keys = builtins.attrNames attrSet;
kvPairs = builtins.map (k: "\"${k}\": ${toNestedValue attrSet.${k}}") keys;
in
"{\n " + builtins.concatStringsSep ",\n " kvPairs + "\n}";
in {
options.programs.hyprpanel = {
enable = mkEnableOption "HyprPanel";
config.enable = mkBoolOption true; # Generate config
overlay.enable = mkEnableOption "script overlay";
systemd.enable = mkEnableOption "systemd integration";
hyprland.enable = mkEnableOption "Hyprland integration";
overwrite.enable = mkEnableOption "overwrite config fix";

theme = mkOption {
type = types.str;
default = "";
Expand Down Expand Up @@ -156,7 +191,7 @@ in
bar.customModules.cava.showIcon = mkBoolOption true;
bar.customModules.cava.icon = mkStrOption "";
bar.customModules.cava.spaceCharacter = mkStrOption " ";
bar.customModules.cava.barCharacters = mkStrListOption [ "▁" "▂" "▃" "▄" "▅" "▆" "▇" "█" ];
bar.customModules.cava.barCharacters = mkStrListOption ["▁" "▂" "▃" "▄" "▅" "▆" "▇" "█"];
bar.customModules.cava.showActiveOnly = mkBoolOption false;
bar.customModules.cava.bars = mkIntOption 10;
bar.customModules.cava.channels = mkIntOption 2;
Expand Down Expand Up @@ -354,6 +389,7 @@ in
bar.workspaces.spacing = mkIntOption 1;
bar.workspaces.workspaceMask = mkBoolOption false;
bar.workspaces.workspaces = mkIntOption 5;
bar.workspaces.workspaceIconMap = mkJsonOption "{}";
dummy = mkBoolOption true;
hyprpanel.restartAgs = mkBoolOption true;
# hyprpanel.restartCommand = mkStrOption "${pkgs.procps}/bin/pkill -u $USER -USR1 hyprpanel; ${package}/bin/hyprpanel";
Expand Down Expand Up @@ -585,7 +621,6 @@ in
};

config = let

theme =
if cfg.theme != ""
then builtins.fromJSON (builtins.readFile ../themes/${cfg.theme}.json)
Expand All @@ -595,12 +630,15 @@ in

mergeSet = flatSet // (flattenAttrs cfg.override "");

fullSet = if cfg.layout == null then mergeSet else mergeSet // cfg.layout;
fullSet =
if cfg.layout == null
then mergeSet
else mergeSet // cfg.layout;

finalConfig = toNestedObject fullSet;

hyprpanel-diff = pkgs.writeShellApplication {
runtimeInputs = [ pkgs.colordiff ];
runtimeInputs = [pkgs.colordiff];
name = "hyprpanel-diff";
text = ''
cd
Expand All @@ -611,63 +649,66 @@ in
${config.xdg.configFile.hyprpanel-swap.target}
'';
};
in
mkIf cfg.enable {
# nixpkgs.overlays = if cfg.overlay.enable then [ self.overlay ] else null;
nixpkgs.overlays = lib.optionals cfg.overlay.enable [self.overlay];

in mkIf cfg.enable {

# nixpkgs.overlays = if cfg.overlay.enable then [ self.overlay ] else null;
nixpkgs.overlays = lib.optionals cfg.overlay.enable [ self.overlay ];

home.packages = [
package
hyprpanel-diff
(if pkgs ? nerd-fonts.jetbrains-mono
then pkgs.nerd-fonts.jetbrains-mono
# NOTE:(benvonh) Remove after next release 25.05
else pkgs.nerdfonts.override { fonts = [ "JetBrainsMono" ]; })
];
home.packages = [
package
hyprpanel-diff
(
if pkgs ? nerd-fonts.jetbrains-mono
then pkgs.nerd-fonts.jetbrains-mono
# NOTE:(benvonh) Remove after next release 25.05
else pkgs.nerdfonts.override {fonts = ["JetBrainsMono"];}
)
];

home.activation =
let
home.activation = let
path = "${config.xdg.configFile.hyprpanel.target}";
in
mkIf cfg.overwrite.enable {
hyprpanel = lib.hm.dag.entryBefore [ "writeBoundary" ] ''
hyprpanel = lib.hm.dag.entryBefore ["writeBoundary"] ''
[[ -L "${path}" ]] || rm -f "${path}"
'';
};

xdg.configFile.hyprpanel = mkIf cfg.config.enable {
target = "hyprpanel/config.json";
text = finalConfig;
# onChange = "${pkgs.procps}/bin/pkill -u $USER -USR1 hyprpanel || true";
onChange = "${package}/bin/hyprpanel r";
};
xdg.configFile.hyprpanel = mkIf cfg.config.enable {
target = "hyprpanel/config.json";
text = finalConfig;
# onChange = "${pkgs.procps}/bin/pkill -u $USER -USR1 hyprpanel || true";
onChange = "${package}/bin/hyprpanel r";
};

xdg.configFile.hyprpanel-swap = mkIf cfg.config.enable {
target = "hyprpanel/config.hm.json";
text = finalConfig;
};
xdg.configFile.hyprpanel-swap = mkIf cfg.config.enable {
target = "hyprpanel/config.hm.json";
text = finalConfig;
};

# NOTE: Deprecated
# systemd.user.services = mkIf cfg.systemd.enable {
# hyprpanel = {
# Unit = {
# Description = "A Bar/Panel for Hyprland with extensive customizability.";
# Documentation = "https://hyprpanel.com";
# PartOf = [ "graphical-session.target" ];
# After = [ "graphical-session-pre.target" ];
# };
# Service = {
# ExecStart = "${package}/bin/hyprpanel";
# ExecReload = "${pkgs.coreutils}/bin/kill -SIGUSR1 $MAINPID";
# Restart = "on-failure";
# KillMode = "mixed";
# };
# Install = { WantedBy = [ "graphical-session.target" ]; };
# };
# };
warnings = if cfg.systemd.enable then [ "The `systemd.enable` option is now obsolete." ] else [];
# NOTE: Deprecated
# systemd.user.services = mkIf cfg.systemd.enable {
# hyprpanel = {
# Unit = {
# Description = "A Bar/Panel for Hyprland with extensive customizability.";
# Documentation = "https://hyprpanel.com";
# PartOf = [ "graphical-session.target" ];
# After = [ "graphical-session-pre.target" ];
# };
# Service = {
# ExecStart = "${package}/bin/hyprpanel";
# ExecReload = "${pkgs.coreutils}/bin/kill -SIGUSR1 $MAINPID";
# Restart = "on-failure";
# KillMode = "mixed";
# };
# Install = { WantedBy = [ "graphical-session.target" ]; };
# };
# };
warnings =
if cfg.systemd.enable
then ["The `systemd.enable` option is now obsolete."]
else [];

wayland.windowManager.hyprland.settings.exec-once = mkIf cfg.hyprland.enable [ "${package}/bin/hyprpanel" ];
};
wayland.windowManager.hyprland.settings.exec-once = mkIf cfg.hyprland.enable ["${package}/bin/hyprpanel"];
};
}