Changed weather module location.

nix/module.nix

@@ -694,4 +694,4 @@ in
 
     wayland.windowManager.hyprland.settings.exec-once = mkIf cfg.hyprland.enable [ "${package}/bin/hyprpanel" ];
   };
-}
+}

scripts/screen_record.sh

@@ -148,4 +148,4 @@ status)
     echo "Usage: $0 {start [screen <monitor_name> | region] <output_directory> | stop | status}"
     exit 1
     ;;
-esac
+esac

src/components/bar/settings/config.tsx

@@ -310,6 +310,24 @@ export const CustomModuleSettings = (): JSX.Element => {
                     title="Button Border"
                     type="boolean"
                 />
+                <Option
+                    opt={options.bar.customModules.weather.location}
+                    title="Location"
+                    subtitle="Zip Code, Postal Code, City, etc."
+                    type="string"
+                />
+                <Option
+                    opt={options.bar.customModules.weather.key}
+                    title="Weather API Key"
+                    subtitle="API Key or path to JSON file containing 'weather_api_key'"
+                    type="string"
+                />
+                <Option
+                    opt={options.bar.customModules.weather.interval}
+                    title="Weather Fetching Interval (ms)"
+                    subtitle="May require AGS restart."
+                    type="number"
+                />
                 <Option opt={options.bar.customModules.weather.label} title="Show Label" type="boolean" />
                 <Option
                     opt={options.bar.customModules.weather.unit}

src/components/menus/calendar/index.tsx

@@ -1,13 +1,11 @@
 import DropdownMenu from '../shared/dropdown/index.js';
 import { TimeWidget } from './time/index';
 import { CalendarWidget } from './CalendarWidget.js';
-import { WeatherWidget } from './weather/index';
 import options from 'src/options';
 import { bind } from 'astal';
 import { RevealerTransitionMap } from 'src/lib/constants/options.js';
 
 const { transition } = options.menus;
-const { enabled: weatherEnabled } = options.menus.clock.weather;
 
 export default (): JSX.Element => {
     return (
@@ -16,19 +14,16 @@ export default (): JSX.Element => {
             transition={bind(transition).as((transition) => RevealerTransitionMap[transition])}
         >
             <box css={'padding: 1px; margin: -1px;'}>
-                {bind(weatherEnabled).as((isWeatherEnabled) => {
-                    return (
-                        <box className={'calendar-menu-content'} vexpand={false}>
-                            <box className={'calendar-content-container'} vertical>
-                                <box className={'calendar-content-items'} vertical>
-                                    <TimeWidget />
-                                    <CalendarWidget />
-                                    <WeatherWidget isEnabled={isWeatherEnabled} />
-                                </box>
-                            </box>
+                return (
+                <box className={'calendar-menu-content'} vexpand={false}>
+                    <box className={'calendar-content-container'} vertical>
+                        <box className={'calendar-content-items'} vertical>
+                            <TimeWidget />
+                            <CalendarWidget />
                         </box>
-                    );
-                })}
+                    </box>
+                </box>
+                ); )
             </box>
         </DropdownMenu>
     );

src/components/menus/exports.ts

@@ -9,6 +9,7 @@ import CalendarMenu from './calendar/index.js';
 import EnergyMenu from './energy/index.js';
 import DashboardMenu from './dashboard/index.js';
 import PowerDropdown from './powerDropdown/index.js';
+import weatherdropdown from './weatherdropdown/index.js';
 
 export const DropdownMenus = [
     AudioMenu,
@@ -20,6 +21,7 @@ export const DropdownMenus = [
     EnergyMenu,
     DashboardMenu,
     PowerDropdown,
+    weatherdropdown,
 ];
 
 export const StandardWindows = [PowerMenu, Verification];

src/components/menus/calendar/weather/hourly/temperature/index.tsx → src/components/menus/weatherdropdown/hourly/temperature/index.tsx

@@ -3,7 +3,7 @@ import { globalWeatherVar } from 'src/globals/weather';
 import { getNextEpoch } from '../helpers';
 import { bind, Variable } from 'astal';
 
-const { unit } = options.menus.clock.weather;
+const { unit } = options.bar.customModules.weather;
 
 export const HourlyTemp = ({ hoursFromNow }: HourlyTempProps): JSX.Element => {
     const weatherBinding = Variable.derive([bind(globalWeatherVar), bind(unit)], (weather, unitType) => {

src/components/menus/weatherdropdown/index.tsx

@@ -0,0 +1,32 @@
+import { TodayIcon } from './icon/index.js';
+import { TodayStats } from './stats/index.js';
+import { TodayTemperature } from './temperature/index.js';
+import { HourlyTemperature } from './hourly/index.js';
+import Separator from 'src/components/shared/Separator.js';
+import { bind } from 'astal';
+import { RevealerTransitionMap } from 'src/lib/constants/options.js';
+import DropdownMenu from '../shared/dropdown/index.js';
+import options from 'src/options.js';
+
+export default (): JSX.Element => {
+    return (
+        <DropdownMenu
+            name="weatherdropdownmenu"
+            transition={bind(options.menus.transition).as((transition) => RevealerTransitionMap[transition])}
+        >
+            <box className={'calendar-menu-item-container weather'}>
+                <box className={'weather-container-box'}>
+                    <box vertical hexpand>
+                        <box className={'calendar-menu-weather today'} hexpand>
+                            <TodayIcon />
+                            <TodayTemperature />
+                            <TodayStats />
+                        </box>
+                        <Separator className={'menu-separator weather'} />
+                        <HourlyTemperature />
+                    </box>
+                </box>
+            </box>
+        </DropdownMenu>
+    );
+};

src/components/menus/calendar/weather/stats/index.tsx → src/components/menus/weatherdropdown/stats/index.tsx

@@ -4,7 +4,7 @@ import { getRainChance } from 'src/globals/weather';
 import { Gtk } from 'astal/gtk3';
 import { bind, Variable } from 'astal';
 
-const { unit } = options.menus.clock.weather;
+const { unit } = options.bar.customModules.weather;
 
 export const TodayStats = (): JSX.Element => {
     const temperatureBinding = Variable.derive([bind(globalWeatherVar), bind(unit)], getTemperature);

src/components/menus/calendar/weather/temperature/index.tsx → src/components/menus/weatherdropdown/temperature/index.tsx

@@ -3,7 +3,7 @@ import { globalWeatherVar } from 'src/globals/weather';
 import { getTemperature, getWeatherIcon } from 'src/globals/weather';
 import { Gtk } from 'astal/gtk3';
 import { bind, Variable } from 'astal';
-const { unit } = options.menus.clock.weather;
+const { unit } = options.bar.customModules.weather;
 
 const WeatherStatus = (): JSX.Element => {
     return (

src/components/settings/pages/config/menus/clock.tsx

@@ -10,33 +10,6 @@ export const ClockMenuSettings = (): JSX.Element => {
                 <Header title="Time" />
                 <Option opt={options.menus.clock.time.military} title="Use 24hr time" type="boolean" />
                 <Option opt={options.menus.clock.time.hideSeconds} title="Hide seconds" type="boolean" />
-
-                <Header title="Weather" />
-                <Option opt={options.menus.clock.weather.enabled} title="Enabled" type="boolean" />
-                <Option
-                    opt={options.menus.clock.weather.location}
-                    title="Location"
-                    subtitle="Zip Code, Postal Code, City, etc."
-                    type="string"
-                />
-                <Option
-                    opt={options.menus.clock.weather.key}
-                    title="Weather API Key"
-                    subtitle="API Key or path to JSON file containing 'weather_api_key'"
-                    type="string"
-                />
-                <Option
-                    opt={options.menus.clock.weather.unit}
-                    title="Units"
-                    type="enum"
-                    enums={['imperial', 'metric']}
-                />
-                <Option
-                    opt={options.menus.clock.weather.interval}
-                    title="Weather Fetching Interval (ms)"
-                    subtitle="May require AGS restart."
-                    type="number"
-                />
             </box>
         </scrollable>
     );

src/globals/weather.ts

@@ -7,7 +7,7 @@ import { AstalIO, bind, execAsync, interval, Variable } from 'astal';
 
 const { EXISTS, IS_REGULAR } = GLib.FileTest;
 
-const { key, interval: weatherInterval, location } = options.menus.clock.weather;
+const { key, interval: weatherInterval, location } = options.bar.customModules.weather;
 
 export const globalWeatherVar = Variable<Weather>(DEFAULT_WEATHER);
 

src/options.ts

@@ -1174,7 +1174,10 @@ const options = mkOptions({
             weather: {
                 label: opt(true),
                 unit: opt<UnitType>('imperial'),
-                leftClick: opt(''),
+                interval: opt(60000),
+                location: opt('Los Angeles'),
+                key: opt<string>(''),
+                leftClick: opt('menu:weatherdropdown'),
                 rightClick: opt(''),
                 middleClick: opt(''),
                 scrollUp: opt(''),
@@ -1362,13 +1365,6 @@ const options = mkOptions({
                 military: opt(false),
                 hideSeconds: opt(false),
             },
-            weather: {
-                enabled: opt(true),
-                interval: opt(60000),
-                unit: opt<UnitType>('imperial'),
-                location: opt('Los Angeles'),
-                key: opt<string>(''),
-            },
         },
     },