From d8d4727e9b6417948f21376e8293c755fa10c0f1 Mon Sep 17 00:00:00 2001 From: Arpit Chakladar Date: Sun, 26 Jul 2026 12:25:13 +0530 Subject: feat: using xdg.desktopEntries inplace of lib.makeDesktopItem --- modules/desktop/waybar/module/battery.nix | 6 +++--- modules/desktop/waybar/module/cpu.nix | 2 +- modules/desktop/waybar/module/date.nix | 2 +- modules/desktop/waybar/module/default.nix | 1 + modules/desktop/waybar/module/memory.nix | 2 +- modules/desktop/waybar/module/network.nix | 2 +- modules/desktop/waybar/module/time.nix | 2 +- modules/desktop/waybar/module/volume.nix | 2 +- modules/desktop/waybar/module/vpn.nix | 1 + modules/desktop/waybar/module/window.nix | 3 +-- modules/desktop/waybar/module/workspaces.nix | 1 + 11 files changed, 13 insertions(+), 11 deletions(-) (limited to 'modules/desktop/waybar/module') diff --git a/modules/desktop/waybar/module/battery.nix b/modules/desktop/waybar/module/battery.nix index 05ae449..e17d7ea 100644 --- a/modules/desktop/waybar/module/battery.nix +++ b/modules/desktop/waybar/module/battery.nix @@ -1,4 +1,4 @@ -{ config, mkIcon }: +{ config, mkIcon, ... }: with config.scheme.withHashtag; let iconColor = base09; @@ -6,7 +6,7 @@ in { format = "${mkIcon iconColor "{icon}"} {capacity}%"; format-charging = "${mkIcon iconColor "󰂄"} {capacity}%"; - format-plugged = "${mkIcon iconColor "󰁹"} {capacity}%"; + format-plugged = "${mkIcon iconColor "󰂅"} {capacity}%"; format-alt = "{time} {icon}"; format-icons = [ "󰁺" @@ -16,7 +16,7 @@ in "󰁾" "󰁿" "󰂀" - "󰁂" + "󰂁" "󰂂" "󰁹" ]; diff --git a/modules/desktop/waybar/module/cpu.nix b/modules/desktop/waybar/module/cpu.nix index d366f44..e153b32 100644 --- a/modules/desktop/waybar/module/cpu.nix +++ b/modules/desktop/waybar/module/cpu.nix @@ -1,4 +1,4 @@ -{ config, mkIcon }: +{ config, mkIcon, ... }: with config.scheme.withHashtag; let iconColor = base0D; diff --git a/modules/desktop/waybar/module/date.nix b/modules/desktop/waybar/module/date.nix index 5d21e68..9f54514 100644 --- a/modules/desktop/waybar/module/date.nix +++ b/modules/desktop/waybar/module/date.nix @@ -1,4 +1,4 @@ -{ config, mkIcon }: +{ config, mkIcon, ... }: with config.scheme.withHashtag; let iconColor = base0E; diff --git a/modules/desktop/waybar/module/default.nix b/modules/desktop/waybar/module/default.nix index c1c8048..2f9f83c 100644 --- a/modules/desktop/waybar/module/default.nix +++ b/modules/desktop/waybar/module/default.nix @@ -2,6 +2,7 @@ config, lib, pkgs, + ... }: let inherit (import ../lib.nix { inherit lib; }) mkIcon; diff --git a/modules/desktop/waybar/module/memory.nix b/modules/desktop/waybar/module/memory.nix index 40e313f..53174c2 100644 --- a/modules/desktop/waybar/module/memory.nix +++ b/modules/desktop/waybar/module/memory.nix @@ -1,4 +1,4 @@ -{ config, mkIcon }: +{ config, mkIcon, ... }: with config.scheme.withHashtag; let iconColor = base0F; diff --git a/modules/desktop/waybar/module/network.nix b/modules/desktop/waybar/module/network.nix index f20121f..48cd6f3 100644 --- a/modules/desktop/waybar/module/network.nix +++ b/modules/desktop/waybar/module/network.nix @@ -1,4 +1,4 @@ -{ config, mkIcon }: +{ config, mkIcon, ... }: with config.scheme.withHashtag; let iconColor = base0B; diff --git a/modules/desktop/waybar/module/time.nix b/modules/desktop/waybar/module/time.nix index f877674..adc8632 100644 --- a/modules/desktop/waybar/module/time.nix +++ b/modules/desktop/waybar/module/time.nix @@ -1,4 +1,4 @@ -{ config, mkIcon }: +{ config, mkIcon, ... }: with config.scheme.withHashtag; let iconColor = base08; diff --git a/modules/desktop/waybar/module/volume.nix b/modules/desktop/waybar/module/volume.nix index 0aa2b94..afb8d4e 100644 --- a/modules/desktop/waybar/module/volume.nix +++ b/modules/desktop/waybar/module/volume.nix @@ -1,4 +1,4 @@ -{ config, mkIcon }: +{ config, mkIcon, ... }: with config.scheme.withHashtag; let iconColor = base0A; diff --git a/modules/desktop/waybar/module/vpn.nix b/modules/desktop/waybar/module/vpn.nix index aa74499..7eb8879 100644 --- a/modules/desktop/waybar/module/vpn.nix +++ b/modules/desktop/waybar/module/vpn.nix @@ -3,6 +3,7 @@ lib, pkgs, mkIcon, + ... }: with config.scheme.withHashtag; let diff --git a/modules/desktop/waybar/module/window.nix b/modules/desktop/waybar/module/window.nix index 0e708c2..06f0c5b 100644 --- a/modules/desktop/waybar/module/window.nix +++ b/modules/desktop/waybar/module/window.nix @@ -1,5 +1,4 @@ -{ config }: -with config.scheme.withHashtag; +{ ... }: { expand = true; } diff --git a/modules/desktop/waybar/module/workspaces.nix b/modules/desktop/waybar/module/workspaces.nix index c8a99c2..9f9e3be 100644 --- a/modules/desktop/waybar/module/workspaces.nix +++ b/modules/desktop/waybar/module/workspaces.nix @@ -49,5 +49,6 @@ in "class" = mkWindowRewrite config.scripts.aria2-run.enable "#8BE9FD" ""; "class" = mkWindowRewrite config.scripts.screen-recording.enable "#FF5555" ""; "class" = mkWindowRewrite config.scripts.system-monitor.enable "#50FA7B" "󰄨"; + "class" = mkWindowRewrite config.development.nixvim.enable "#005900" ""; }; } -- cgit v1.2.3