diff --git a/desktop/hypr/hyprpanel.nix b/desktop/hypr/hyprpanel.nix
index fd13a21..cc4d03c 100644
--- a/desktop/hypr/hyprpanel.nix
+++ b/desktop/hypr/hyprpanel.nix
@@ -38,124 +38,126 @@ in
 
         # TODO: Right now weather Key doesn't work with sops-nix.
         # Wait for Hyprpanel to provide support i.e. an option that expect a path.
-        file.".cache/ags/hyprpanel/options.json".text = lib.mkIf config.isStylixEnabled ''
-          {
-            "wallpaper.enable": false,
+        file = lib.mkIf config.isStylixEnabled {
+          ".cache/ags/hyprpanel/options.json".text = ''
+            {
+              "wallpaper.enable": false,
 
-            "bar.media.show_active_only": true,
-            "bar.customModules.updates.pollingInterval": 1440000,
-            "bar.windowtitle.label": false,
-            "bar.launcher.icon": "",
-            "bar.layouts": {
-              "*": {
-                "left": [
-                  "dashboard",
-                  "workspaces"
-                ],
-                "middle": [ "media" ],
-                "right": [
-                  "volume",
-                  "bluetooth",
-                  "systray",
-                  "clock",
-                  "notifications"
-                ]
-              }
-            },
+              "bar.media.show_active_only": true,
+              "bar.customModules.updates.pollingInterval": 1440000,
+              "bar.windowtitle.label": false,
+              "bar.launcher.icon": "",
+              "bar.layouts": {
+                "*": {
+                  "left": [
+                    "dashboard",
+                    "workspaces"
+                  ],
+                  "middle": [ "media" ],
+                  "right": [
+                    "volume",
+                    "bluetooth",
+                    "systray",
+                    "clock",
+                    "notifications"
+                  ]
+                }
+              },
 
-            "bar.workspaces.show_numbered": true,
-            "bar.workspaces.workspaces": 9,
-            "bar.workspaces.monitorSpecific": true,
+              "bar.workspaces.show_numbered": true,
+              "bar.workspaces.workspaces": 9,
+              "bar.workspaces.monitorSpecific": true,
 
-            "menus.clock.weather.location": "",
-            "menus.clock.weather.key": "",
-            "menus.clock.weather.unit": "metric",
+              "menus.clock.weather.location": "",
+              "menus.clock.weather.key": "",
+              "menus.clock.weather.unit": "metric",
 
-            "menus.dashboard.shortcuts.left.shortcut1.icon": "",
-            "menus.dashboard.shortcuts.left.shortcut1.command": "firefox",
-            "menus.dashboard.shortcuts.left.shortcut1.tooltip": "Firefox",
-            "menus.dashboard.shortcuts.left.shortcut2.icon": "",
-            "menus.dashboard.shortcuts.left.shortcut2.command": "spotify",
-            "menus.dashboard.shortcuts.left.shortcut2.tooltip": "Spotify",
-            "menus.dashboard.shortcuts.left.shortcut3.icon": "",
-            "menus.dashboard.shortcuts.left.shortcut3.command": "vesktop",
-            "menus.dashboard.shortcuts.left.shortcut3.tooltip": "Vesktop",
+              "menus.dashboard.shortcuts.left.shortcut1.icon": "",
+              "menus.dashboard.shortcuts.left.shortcut1.command": "firefox",
+              "menus.dashboard.shortcuts.left.shortcut1.tooltip": "Firefox",
+              "menus.dashboard.shortcuts.left.shortcut2.icon": "",
+              "menus.dashboard.shortcuts.left.shortcut2.command": "spotify",
+              "menus.dashboard.shortcuts.left.shortcut2.tooltip": "Spotify",
+              "menus.dashboard.shortcuts.left.shortcut3.icon": "",
+              "menus.dashboard.shortcuts.left.shortcut3.command": "vesktop",
+              "menus.dashboard.shortcuts.left.shortcut3.tooltip": "Vesktop",
 
-            "menus.dashboard.shortcuts.right.shortcut1.icon": "",
-            "menus.dashboard.shortcuts.right.shortcut1.command": "hyprpicker -a",
-            "menus.dashboard.shortcuts.right.shortcut1.tooltip": "Color Picker",
-            "menus.dashboard.shortcuts.right.shortcut3.icon": "󰄀",
-            "menus.dashboard.shortcuts.right.shortcut3.command": "grimblast --freeze --notify copysave area",
-            "menus.dashboard.shortcuts.right.shortcut3.tooltip": "Screenshot",
+              "menus.dashboard.shortcuts.right.shortcut1.icon": "",
+              "menus.dashboard.shortcuts.right.shortcut1.command": "hyprpicker -a",
+              "menus.dashboard.shortcuts.right.shortcut1.tooltip": "Color Picker",
+              "menus.dashboard.shortcuts.right.shortcut3.icon": "󰄀",
+              "menus.dashboard.shortcuts.right.shortcut3.command": "grimblast --freeze --notify copysave area",
+              "menus.dashboard.shortcuts.right.shortcut3.tooltip": "Screenshot",
 
-            "menus.dashboard.directories.left.directory1.label": "󰉍 Downloads",
-            "menus.dashboard.directories.left.directory1.command": "bash -c \"thunar $HOME/Downloads/\"",
-            "menus.dashboard.directories.left.directory2.label": "󰉏 Pictures",
-            "menus.dashboard.directories.left.directory2.command": "bash -c \"thunar $HOME/Pictures/\"",
-            "menus.dashboard.directories.left.directory3.label": "󱧶 Documents",
-            "menus.dashboard.directories.left.directory3.command": "bash -c \"thunar $HOME/Documents/\"",
-            "menus.dashboard.directories.right.directory1.label": "󱂵 Home",
-            "menus.dashboard.directories.right.directory1.command": "bash -c \"thunar $HOME/\"",
-            "menus.dashboard.directories.right.directory2.label": "󰚝 Projects",
-            "menus.dashboard.directories.right.directory2.command": "bash -c \"thunar $HOME/dev/\"",
-            "menus.dashboard.directories.right.directory3.label": " Config",
-            "menus.dashboard.directories.right.directory3.command": "bash -c \"thunar $HOME/.config/\"",
+              "menus.dashboard.directories.left.directory1.label": "󰉍 Downloads",
+              "menus.dashboard.directories.left.directory1.command": "bash -c \"thunar $HOME/Downloads/\"",
+              "menus.dashboard.directories.left.directory2.label": "󰉏 Pictures",
+              "menus.dashboard.directories.left.directory2.command": "bash -c \"thunar $HOME/Pictures/\"",
+              "menus.dashboard.directories.left.directory3.label": "󱧶 Documents",
+              "menus.dashboard.directories.left.directory3.command": "bash -c \"thunar $HOME/Documents/\"",
+              "menus.dashboard.directories.right.directory1.label": "󱂵 Home",
+              "menus.dashboard.directories.right.directory1.command": "bash -c \"thunar $HOME/\"",
+              "menus.dashboard.directories.right.directory2.label": "󰚝 Projects",
+              "menus.dashboard.directories.right.directory2.command": "bash -c \"thunar $HOME/dev/\"",
+              "menus.dashboard.directories.right.directory3.label": " Config",
+              "menus.dashboard.directories.right.directory3.command": "bash -c \"thunar $HOME/.config/\"",
 
-            "theme.bar.transparent": true,
+              "theme.bar.transparent": true,
 
-            "theme.bar.buttons.workspaces.hover": "${accent-alt}",
-            "theme.bar.buttons.workspaces.active": "${accent}",
-            "theme.bar.buttons.workspaces.available": "${accent-alt}",
-            "theme.bar.buttons.workspaces.occupied": "${accent}",
+              "theme.bar.buttons.workspaces.hover": "${accent-alt}",
+              "theme.bar.buttons.workspaces.active": "${accent}",
+              "theme.bar.buttons.workspaces.available": "${accent-alt}",
+              "theme.bar.buttons.workspaces.occupied": "${accent}",
 
-            "theme.bar.menus.monochrome": true,
-            "theme.bar.menus.background": "${background}",
-            "theme.bar.menus.cards": "${background-alt}",
-            "theme.bar.menus.label": "${foreground}",
-            "theme.bar.menus.text": "${foreground}",
-            "theme.bar.menus.border.color": "${accent}",
-            "theme.bar.menus.popover.text": "${foreground}",
-            "theme.bar.menus.popover.background": "${background-alt}",
-            "theme.bar.menus.listitems.active": "${accent}",
-            "theme.bar.menus.icons.active": "${accent}",
-            "theme.bar.menus.switch.enabled":"${accent}",
-            "theme.bar.menus.check_radio_button.active": "${accent}",
-            "theme.bar.menus.buttons.default": "${accent}",
-            "theme.bar.menus.buttons.active": "${accent}",
-            "theme.bar.menus.iconbuttons.active": "${accent}",
-            "theme.bar.menus.progressbar.foreground": "${accent}",
-            "theme.bar.menus.slider.primary": "${accent}",
-            "theme.bar.menus.tooltip.background": "${background-alt}",
-            "theme.bar.menus.tooltip.text": "${foreground}",
-            "theme.bar.menus.dropdownmenu.background":"${background-alt}",
-            "theme.bar.menus.dropdownmenu.text": "${foreground}",
-            "theme.bar.buttons.style": "default",
-            "theme.bar.buttons.monochrome": true,
-            "theme.bar.buttons.text": "${foreground}",
-            "theme.bar.buttons.icon": "${accent}",
-            "theme.bar.buttons.notifications.background": "${background-alt}",
-            "theme.bar.buttons.hover": "${background}",
-            "theme.bar.buttons.notifications.hover": "${background}",
-            "theme.bar.buttons.notifications.total": "${accent}",
-            "theme.bar.buttons.notifications.icon": "${accent}",
-            "theme.notification.background": "${background-alt}",
-            "theme.notification.actions.background": "${accent}",
-            "theme.notification.actions.text": "${foreground}",
-            "theme.notification.label": "${accent}",
-            "theme.notification.border": "${background-alt}",
-            "theme.notification.text": "${foreground}",
-            "theme.notification.labelicon": "${accent}",
-            "theme.osd.bar_color": "${accent}",
-            "theme.osd.bar_overflow_color": "${accent-alt}",
-            "theme.osd.icon": "${background}",
-            "theme.osd.icon_container": "${accent}",
-            "theme.osd.label": "${accent}",
-            "theme.osd.bar_container": "${background-alt}",
-            "theme.bar.menus.menu.media.background.color": "${background-alt}",
-            "theme.bar.menus.menu.media.card.color": "${background-alt}",
-            "theme.bar.menus.menu.media.card.tint": 90
-          }
-        '';
+              "theme.bar.menus.monochrome": true,
+              "theme.bar.menus.background": "${background}",
+              "theme.bar.menus.cards": "${background-alt}",
+              "theme.bar.menus.label": "${foreground}",
+              "theme.bar.menus.text": "${foreground}",
+              "theme.bar.menus.border.color": "${accent}",
+              "theme.bar.menus.popover.text": "${foreground}",
+              "theme.bar.menus.popover.background": "${background-alt}",
+              "theme.bar.menus.listitems.active": "${accent}",
+              "theme.bar.menus.icons.active": "${accent}",
+              "theme.bar.menus.switch.enabled":"${accent}",
+              "theme.bar.menus.check_radio_button.active": "${accent}",
+              "theme.bar.menus.buttons.default": "${accent}",
+              "theme.bar.menus.buttons.active": "${accent}",
+              "theme.bar.menus.iconbuttons.active": "${accent}",
+              "theme.bar.menus.progressbar.foreground": "${accent}",
+              "theme.bar.menus.slider.primary": "${accent}",
+              "theme.bar.menus.tooltip.background": "${background-alt}",
+              "theme.bar.menus.tooltip.text": "${foreground}",
+              "theme.bar.menus.dropdownmenu.background":"${background-alt}",
+              "theme.bar.menus.dropdownmenu.text": "${foreground}",
+              "theme.bar.buttons.style": "default",
+              "theme.bar.buttons.monochrome": true,
+              "theme.bar.buttons.text": "${foreground}",
+              "theme.bar.buttons.icon": "${accent}",
+              "theme.bar.buttons.notifications.background": "${background-alt}",
+              "theme.bar.buttons.hover": "${background}",
+              "theme.bar.buttons.notifications.hover": "${background}",
+              "theme.bar.buttons.notifications.total": "${accent}",
+              "theme.bar.buttons.notifications.icon": "${accent}",
+              "theme.notification.background": "${background-alt}",
+              "theme.notification.actions.background": "${accent}",
+              "theme.notification.actions.text": "${foreground}",
+              "theme.notification.label": "${accent}",
+              "theme.notification.border": "${background-alt}",
+              "theme.notification.text": "${foreground}",
+              "theme.notification.labelicon": "${accent}",
+              "theme.osd.bar_color": "${accent}",
+              "theme.osd.bar_overflow_color": "${accent-alt}",
+              "theme.osd.icon": "${background}",
+              "theme.osd.icon_container": "${accent}",
+              "theme.osd.label": "${accent}",
+              "theme.osd.bar_container": "${background-alt}",
+              "theme.bar.menus.menu.media.background.color": "${background-alt}",
+              "theme.bar.menus.menu.media.card.color": "${background-alt}",
+              "theme.bar.menus.menu.media.card.tint": 90
+            }
+          '';
+        };
       };
     };
   };
diff --git a/programs/cli/default.nix b/programs/cli/default.nix
index b66360f..dc24a87 100644
--- a/programs/cli/default.nix
+++ b/programs/cli/default.nix
@@ -2,6 +2,7 @@
   lib,
   config,
   pkgs,
+  stable-pkgs,
   username,
   ...
 }:
@@ -34,33 +35,34 @@
   options.cli.defaults.enable = lib.mkEnableOption "Default Cli Apps";
 
   config = lib.mkIf config.cli.defaults.enable {
-    home-manager.users.${username}.home.packages = with pkgs; [
-      # ani-cli
-      asciinema
-      binsider
-      dipc
-      dust
-      glow
-      gping
-      grex
-      hexyl
-      hurl
-      hyperfine
-      jnv
-      just
-      kondo
-      lychee
-      ouch
-      procs
-      rustscan
-      sd
-      sshx
-      tokei
-      typst
-      xh
+    home-manager.users.${username}.home.packages =
+      [ stable-pkgs.ani-cli ]
+      ++ (with pkgs; [
+        asciinema
+        binsider
+        dipc
+        dust
+        glow
+        gping
+        grex
+        hexyl
+        hurl
+        hyperfine
+        jnv
+        just
+        kondo
+        lychee
+        ouch
+        procs
+        rustscan
+        sd
+        sshx
+        tokei
+        typst
+        xh
 
-      sherlock
-      maigret
-    ];
+        sherlock
+        maigret
+      ]);
   };
 }