LESA/custum-hyprpanel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nix: Add generate config option to HM module + faze out systemd

Browse Source 
nix: Add generate config option to HM module + faze out systemd
This commit is contained in:
orangc
2025-01-14 08:53:38 +03:00
committed by GitHub
parent 7ef79f7362 2d7f289c96
commit d49ae7d11d
1 changed files with 38 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
nix/module.nix
View File

@@ -10,14 +10,15 @@ let
package = if pkgs ? hyprpanel then pkgs.hyprpanel package = if pkgs ? hyprpanel then pkgs.hyprpanel
else abort '' else abort ''
****************************************** ********************************************************************************
* HyprPanel * * HyprPanel *
****************************************** *------------------------------------------------------------------------------*
* You didn't add the overlay! * * You didn't add the overlay! *
* * * *
* Either set 'overlay.enable = true' or * * Either set 'overlay.enable = true' or manually add it to 'nixpkgs.overlays'. *
* 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 # Shorthand lambda for self-documenting options under settings
@@ -77,6 +78,7 @@ in
{ {
options.programs.hyprpanel = { options.programs.hyprpanel = {
enable = mkEnableOption "HyprPanel"; enable = mkEnableOption "HyprPanel";
config.enable = mkBoolOption true; # Generate config
overlay.enable = mkEnableOption "script overlay"; overlay.enable = mkEnableOption "script overlay";
systemd.enable = mkEnableOption "systemd integration"; systemd.enable = mkEnableOption "systemd integration";
hyprland.enable = mkEnableOption "Hyprland integration"; hyprland.enable = mkEnableOption "Hyprland integration";
@@ -99,7 +101,7 @@ in
''; '';
description = '' description = ''
An arbitrary set to override the final config with. An arbitrary set to override the final config with.
Useful for overriding colors in your selected theme. Useful for overriding colors in your chosen theme.
''; '';
}; };
@@ -354,7 +356,8 @@ in
bar.workspaces.workspaces = mkIntOption 5; bar.workspaces.workspaces = mkIntOption 5;
dummy = mkBoolOption true; dummy = mkBoolOption true;
hyprpanel.restartAgs = mkBoolOption true; hyprpanel.restartAgs = mkBoolOption true;
hyprpanel.restartCommand = mkStrOption "${pkgs.procps}/bin/pkill -u $USER -USR1 hyprpanel; ${package}/bin/hyprpanel"; # hyprpanel.restartCommand = mkStrOption "${pkgs.procps}/bin/pkill -u $USER -USR1 hyprpanel; ${package}/bin/hyprpanel";
hyprpanel.restartCommand = mkStrOption "${package}/bin/hyprpanel q; ${package}/bin/hyprpanel";
menus.clock.time.hideSeconds = mkBoolOption false; menus.clock.time.hideSeconds = mkBoolOption false;
menus.clock.time.military = mkBoolOption false; menus.clock.time.military = mkBoolOption false;
menus.clock.weather.enabled = mkBoolOption true; menus.clock.weather.enabled = mkBoolOption true;
@@ -601,7 +604,6 @@ in
text = '' text = ''
cd cd
echo '------------- HyprPanel -------------' echo '------------- HyprPanel -------------'
echo
echo 'Please ignore the layout diff for now' echo 'Please ignore the layout diff for now'
echo '-------------------------------------' echo '-------------------------------------'
colordiff ${config.xdg.configFile.hyprpanel.target} \ colordiff ${config.xdg.configFile.hyprpanel.target} \
@@ -611,7 +613,8 @@ in
in mkIf cfg.enable { in mkIf cfg.enable {
nixpkgs.overlays = if cfg.overlay.enable then [ self.overlay ] else null; # nixpkgs.overlays = if cfg.overlay.enable then [ self.overlay ] else null;
nixpkgs.overlays = lib.optionals cfg.overlay.enable [ self.overlay ];
home.packages = [ home.packages = [
package package
@@ -632,34 +635,37 @@ in
''; '';
}; };
xdg.configFile.hyprpanel = { xdg.configFile.hyprpanel = mkIf cfg.config.enable {
target = "hyprpanel/config.json"; target = "hyprpanel/config.json";
text = finalConfig; text = finalConfig;
onChange = "${pkgs.procps}/bin/pkill -u $USER -USR1 hyprpanel || true"; # onChange = "${pkgs.procps}/bin/pkill -u $USER -USR1 hyprpanel || true";
onChange = "${package}/bin/hyprpanel r";
}; };
xdg.configFile.hyprpanel-swap = { xdg.configFile.hyprpanel-swap = mkIf cfg.config.enable {
target = "hyprpanel/config.hm.json"; target = "hyprpanel/config.hm.json";
text = finalConfig; text = finalConfig;
}; };
systemd.user.services = mkIf cfg.systemd.enable { # NOTE: Deprecated
hyprpanel = { # systemd.user.services = mkIf cfg.systemd.enable {
Unit = { # hyprpanel = {
Description = "A Bar/Panel for Hyprland with extensive customizability."; # Unit = {
Documentation = "https://hyprpanel.com"; # Description = "A Bar/Panel for Hyprland with extensive customizability.";
PartOf = [ "graphical-session.target" ]; # Documentation = "https://hyprpanel.com";
After = [ "graphical-session-pre.target" ]; # PartOf = [ "graphical-session.target" ];
}; # After = [ "graphical-session-pre.target" ];
Service = { # };
ExecStart = "${package}/bin/hyprpanel"; # Service = {
ExecReload = "${pkgs.coreutils}/bin/kill -SIGUSR1 $MAINPID"; # ExecStart = "${package}/bin/hyprpanel";
Restart = "on-failure"; # ExecReload = "${pkgs.coreutils}/bin/kill -SIGUSR1 $MAINPID";
KillMode = "mixed"; # Restart = "on-failure";
}; # KillMode = "mixed";
Install = { WantedBy = [ "graphical-session.target" ]; }; # };
}; # 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" ];
}; };