diff --git a/flake.nix b/flake.nix index fbd5176..e948c40 100644 --- a/flake.nix +++ b/flake.nix @@ -218,7 +218,7 @@ echo $DATABASE_URL # Run migrations - ${cfg.phx.package}/bin/${release_name} eval "ZoeysComputer.Release.migrate()" + ${cfg.phx.package}/bin/${release_name} eval "ZoeysComputer.Release.migrate" # Start the application exec ${cfg.phx.package}/bin/${release_name} start diff --git a/lib/zoeyscomputer_web/live/home_live.ex b/lib/zoeyscomputer_web/live/home_live.ex index 4743822..76005ee 100644 --- a/lib/zoeyscomputer_web/live/home_live.ex +++ b/lib/zoeyscomputer_web/live/home_live.ex @@ -1,4 +1,5 @@ defmodule ZoeyscomputerWeb.HomeLive do + alias Hex.API.Key use ZoeyscomputerWeb, :live_view def mount(_params, _session, socket) do @@ -19,19 +20,21 @@ defmodule ZoeyscomputerWeb.HomeLive do cpu_usage = :cpu_sup.util() mem_data = :memsup.get_system_memory_data() - total_memory = Keyword.get(mem_data, :total_memory, 0) + total_memory = Keyword.get(mem_data, :system_total_memory, 0) free_memory = Keyword.get(mem_data, :free_memory, 0) + buff_memory = Keyword.get(mem_data, :buffered_memory, 0) + cached_memory = Keyword.get(mem_data, :cached_memory, 0) memory_usage = if total_memory > 0 do - (total_memory - free_memory) / total_memory * 100 + 100 - (free_memory + buff_memory + cached_memory) * 100 / total_memory else 0 end %{ cpu_usage: Float.round(cpu_usage, 2), - memory_usage: Float.round(100 - memory_usage, 2) + memory_usage: Float.round(memory_usage, 2) } end