diff --git a/hosts/common/configs/system/nix-install/install.sh b/hosts/common/configs/system/nix-install/install.sh index 01e3d09..095cd19 100644 --- a/hosts/common/configs/system/nix-install/install.sh +++ b/hosts/common/configs/system/nix-install/install.sh @@ -82,7 +82,7 @@ set_permissions() { for path in "$flake/hosts/$host/users"/*; do local user user=$(basename "$path") - chown -R "$(cat "$flake/hosts/$host/users/$user/uid"):100" "$root/persist/*/home/$user" + chown -R "$(cat "$flake/hosts/$host/users/$user/uid"):100" "$root/persist/state/home/$user" done } diff --git a/hosts/common/configs/user/gui/astal/config/lib.ts b/hosts/common/configs/user/gui/astal/config/lib.ts index 70035fb..ec7fa77 100644 --- a/hosts/common/configs/user/gui/astal/config/lib.ts +++ b/hosts/common/configs/user/gui/astal/config/lib.ts @@ -6,11 +6,11 @@ export const range = (length: number, start = 1) => { }; export const getHyprlandMonitor = (gdkmonitor: Gdk.Monitor) => { - const hyprland = Hyprland.get_default() + const hyprland = Hyprland.get_default(); const display = Gdk.Display.get_default()!; const screen = display.get_default_screen(); for (let i = 0; i < display.get_n_monitors(); ++i) { if (gdkmonitor === display.get_monitor(i)) return hyprland.get_monitor_by_name(screen.get_monitor_plug_name(i)!); } -} +}; diff --git a/hosts/common/configs/user/gui/astal/config/widget/Left.tsx b/hosts/common/configs/user/gui/astal/config/widget/Left.tsx index fb4039f..2644def 100644 --- a/hosts/common/configs/user/gui/astal/config/widget/Left.tsx +++ b/hosts/common/configs/user/gui/astal/config/widget/Left.tsx @@ -18,5 +18,5 @@ export default (monitor: Gdk.Monitor) => ( - + ); diff --git a/hosts/common/configs/user/gui/astal/config/widget/components/Battery.tsx b/hosts/common/configs/user/gui/astal/config/widget/components/Battery.tsx index c496adf..c67fe7c 100644 --- a/hosts/common/configs/user/gui/astal/config/widget/components/Battery.tsx +++ b/hosts/common/configs/user/gui/astal/config/widget/components/Battery.tsx @@ -3,24 +3,31 @@ import AstalBattery from "gi://AstalBattery"; const battery = AstalBattery.get_default(); -const formatTime = (seconds: number) => seconds > 0 - ? `${String(Math.floor(seconds / 3600)).padStart(2, "0")}:${String(Math.floor((seconds % 3600) / 60)).padStart(2, "0")}` - : "--:--"; +const formatTime = (seconds: number) => + seconds > 0 + ? `${String(Math.floor(seconds / 3600)).padStart(2, "0")}:${String(Math.floor((seconds % 3600) / 60)).padStart(2, "0")}` + : "--:--"; export default () => { - const percentage = bind(battery, "percentage").as((p) => Math.round(p * 100) + "%"); + const percentage = bind(battery, "percentage").as( + (p) => Math.round(p * 100) + "%", + ); const charging = bind(battery, "charging"); const timeToFull = bind(battery, "timeToFull"); const timeToEmpty = bind(battery, "timeToEmpty"); - const time = Variable.derive([charging, timeToFull, timeToEmpty], (charging, full, empty) => - formatTime(charging ? full : empty) + const time = Variable.derive( + [charging, timeToFull, timeToEmpty], + (charging, full, empty) => formatTime(charging ? full : empty), ); - const label = Variable.derive([percentage, charging, time], (percentage, charging, time) => { - const arrow = charging ? "▲" : "▼"; - return `${percentage} (${time}) ${arrow}`; - }); + const label = Variable.derive( + [percentage, charging, time], + (percentage, charging, time) => { + const arrow = charging ? "▲" : "▼"; + return `${percentage} (${time}) ${arrow}`; + }, + ); return ( ); -} +}; diff --git a/hosts/common/configs/user/gui/astal/config/widget/components/Hidden.tsx b/hosts/common/configs/user/gui/astal/config/widget/components/Hidden.tsx index a792c3a..5b9272c 100644 --- a/hosts/common/configs/user/gui/astal/config/widget/components/Hidden.tsx +++ b/hosts/common/configs/user/gui/astal/config/widget/components/Hidden.tsx @@ -21,9 +21,13 @@ export default function Hidden({ onHover={() => show.set(true)} onHoverLost={() => show.set(false)} > - - timeout(2000, () => self.revealChild = false)} revealChild={bind(show)} transitionType={transitionType}> - {Array.isArray(contents) ? (<>{contents}) : (contents)} + + timeout(2000, () => (self.revealChild = false))} + revealChild={bind(show)} + transitionType={transitionType} + > + {Array.isArray(contents) ? <>{contents} : contents} diff --git a/hosts/himalia/hardware/default.nix b/hosts/himalia/hardware/default.nix index f391816..fe579d4 100644 --- a/hosts/himalia/hardware/default.nix +++ b/hosts/himalia/hardware/default.nix @@ -101,9 +101,7 @@ home-manager.sharedModules = [ { - wayland.windowManager.hyprland.settings.env = [ - "AQ_DRM_DEVICES,/dev/dri/card0:/dev/dri/card1" - ]; + wayland.windowManager.hyprland.settings.env = [ "AQ_DRM_DEVICES,/dev/dri/card0:/dev/dri/card1" ]; theme = { template.".config/asusctl/keyboard".source = diff --git a/hosts/himalia/hardware/touchpad-helper.sh b/hosts/himalia/hardware/touchpad-helper.sh index bbd4b12..ad41c27 100644 --- a/hosts/himalia/hardware/touchpad-helper.sh +++ b/hosts/himalia/hardware/touchpad-helper.sh @@ -1,3 +1,5 @@ +# shellcheck shell=bash + HYPRLAND_DEVICE="$1" export STATUS_FILE="$XDG_RUNTIME_DIR/touchpad.status"