diff --git a/home-manager/commands/commands.nix b/home-manager/commands/commands.nix
index 7776197..fc1da02 100644
--- a/home-manager/commands/commands.nix
+++ b/home-manager/commands/commands.nix
@@ -5,17 +5,7 @@
   hostname,
   hostTypes,
   ...
-}: let
-  list-keybinds = pkgs.writeShellScriptBin "list-keybinds" ''
-    hyprctl binds -j | ${pkgs.jq}/bin/jq -r '.[] |
-      select(.dispatcher != "") |
-      "[\(.modmask_str // "NONE")] + \(.key) → \(.dispatcher) \(.arg // "")"
-    ' | ${pkgs.rofi}/bin/rofi -dmenu \
-        -i \
-        -p "Keybinds" \
-        -theme-str 'window {width: 60%;}'
-  '';
-in {
+}: {
   imports = [
     ./direnv.nix
     # ./custom/custom.nix
@@ -43,8 +33,6 @@ in {
       basalt
       btop
       cpufetch
-      cpuid
-      cpu-x
       curl
       dig
       docker
@@ -67,7 +55,6 @@ in {
       lazyjournal
       manga-tui
       mcat
-      netop
       nettools
       nix-du
       nixfmt
@@ -89,7 +76,6 @@ in {
       yazi
       yt-dlp
       zstd
-      list-keybinds
     ]
     # Desktop-specific packages (Linux desktops and macOS)
     ++ lib.optionals (!(hostTypes.isServer hostname)) (with pkgs; [
@@ -102,21 +88,27 @@ in {
     ])
     # Server-specific packages
     ++ lib.optionals (hostTypes.isServer hostname) (with pkgs; [
+      cpu-x
+      cpuid
+      ffmpeg-full
       gparted
+      netop
       parted
       plocate
       tailscale
       tlp
       traceroute
-      ffmpeg-full
       pkgs-unstable.witr
     ])
     # Linux desktop packages
     ++ lib.optionals (hostTypes.isLinuxDesktop hostname) (with pkgs; [
-      plocate
-      tlp
-      swaynotificationcenter
+      cpu-x
+      cpuid
       gparted
+      netop
+      plocate
+      swaynotificationcenter
+      tlp
       nerd-fonts.jetbrains-mono
       nerd-fonts.hack
       nerd-fonts.fira-code
diff --git a/home-manager/commands/newsboat.nix b/home-manager/commands/newsboat.nix
index 14b0871..fffcd41 100644
--- a/home-manager/commands/newsboat.nix
+++ b/home-manager/commands/newsboat.nix
@@ -1,4 +1,5 @@
-{
+{pkgs, lib, ...}:
+lib.mkIf (!pkgs.stdenv.isDarwin) {
   programs.newsboat = {
     enable = true;
     urls = [
diff --git a/home-manager/programs/programs.nix b/home-manager/programs/programs.nix
index b15212b..f03781e 100644
--- a/home-manager/programs/programs.nix
+++ b/home-manager/programs/programs.nix
@@ -4,7 +4,17 @@
   hostTypes,
   lib,
   ...
-}: {
+}: let
+  list-keybinds = pkgs.writeShellScriptBin "list-keybinds" ''
+    hyprctl binds -j | ${pkgs.jq}/bin/jq -r '.[] |
+      select(.dispatcher != "") |
+      "[\(.modmask_str // "NONE")] + \(.key) → \(.dispatcher) \(.arg // "")"
+    ' | ${pkgs.rofi}/bin/rofi -dmenu \
+        -i \
+        -p "Keybinds" \
+        -theme-str 'window {width: 60%;}'
+  '';
+in {
   imports =
     # Desktop programs (exclude servers)
     lib.optionals (hostTypes.isLinuxDesktop hostname) [
@@ -122,7 +132,10 @@
       openrazer-daemon
       polychromatic
       # vscode
-    ]);
+    ])
+    ++ lib.optionals (hostTypes.isLinuxDesktop hostname) [
+      list-keybinds
+    ];
 
   services.swaync = lib.mkIf (hostTypes.isLinuxDesktop hostname) {
     enable = true;
diff --git a/hosts/eva-02/configuration.nix b/hosts/eva-02/configuration.nix
index 870e035..9411ef0 100644
--- a/hosts/eva-02/configuration.nix
+++ b/hosts/eva-02/configuration.nix
@@ -80,6 +80,7 @@
       "imhex"
       "jellyfin-media-player"
       "jordanbaird-ice"
+      #"lm-studio"
       "localsend"
       "melonds"
       "moonlight"