feat: using xdg.desktopEntries inplace of lib.makeDesktopItem

13 files changed, 16 insertions, 14 deletions

diff --git a/modules/desktop/waybar/lib.nix b/modules/desktop/waybar/lib.nix
index 9053cd5..3eaaab0 100644
--- a/modules/desktop/waybar/lib.nix
+++ b/modules/desktop/waybar/lib.nix
@@ -1,6 +1,6 @@
-{ lib, ... }:
+{ ... }:
 let
-  mkIcon = color: icon: "<span foreground='${color}' font_size='125%'>${icon}</span>";
+  mkIcon = color: icon: "<span foreground='${color}' font_size='120%'>${icon}</span>";
 in
 {
   inherit mkIcon;
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<aria2-run>" = mkWindowRewrite config.scripts.aria2-run.enable "#8BE9FD" "";
     "class<screen-recording>" = mkWindowRewrite config.scripts.screen-recording.enable "#FF5555" "";
     "class<system-monitor>" = mkWindowRewrite config.scripts.system-monitor.enable "#50FA7B" "󰄨";
+    "class<neovim>" = mkWindowRewrite config.development.nixvim.enable "#005900" "";
   };
 }
diff --git a/modules/desktop/waybar/style.nix b/modules/desktop/waybar/style.nix
index fead24e..0f697c0 100644
--- a/modules/desktop/waybar/style.nix
+++ b/modules/desktop/waybar/style.nix
@@ -34,7 +34,7 @@ with config.scheme.withHashtag;
   }
 
   #workspaces button {
-    padding: 5px;
+    padding: 0px 5px;
     color: ${base07};
     border: 1px solid ${base03};
     border-radius: 0;