diff --git a/flake.lock b/flake.lock index fd699c6..7d30588 100644 --- a/flake.lock +++ b/flake.lock @@ -1,45 +1,5 @@ { "nodes": { - "flake-parts": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib" - }, - "locked": { - "lastModified": 1701473968, - "narHash": "sha256-YcVE5emp1qQ8ieHUnxt1wCZCC3ZfAS+SRRWZ2TMda7E=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "lexical": { - "inputs": { - "flake-parts": "flake-parts", - "nixpkgs": [ - "nixpkgs" - ], - "systems": "systems" - }, - "locked": { - "lastModified": 1705789786, - "narHash": "sha256-6Skj5jTNQQYdowmYtrRAHK4Q2k8LFGOthnIEr9QF3vU=", - "owner": "lexical-lsp", - "repo": "lexical", - "rev": "cba45633bbf8d91e823662bf15c1a45c56b38192", - "type": "github" - }, - "original": { - "owner": "lexical-lsp", - "repo": "lexical", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1705697961, @@ -56,44 +16,10 @@ "type": "github" } }, - "nixpkgs-lib": { - "locked": { - "dir": "lib", - "lastModified": 1701253981, - "narHash": "sha256-ztaDIyZ7HrTAfEEUt9AtTDNoCYxUdSd6NrRHaYOIxtk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "e92039b55bcd58469325ded85d4f58dd5a4eaf58", - "type": "github" - }, - "original": { - "dir": "lib", - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "root": { "inputs": { - "lexical": "lexical", "nixpkgs": "nixpkgs" } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 294e5cd..3649496 100644 --- a/flake.nix +++ b/flake.nix @@ -1,8 +1,6 @@ { inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; - lexical.url = "github:lexical-lsp/lexical"; - lexical.inputs.nixpkgs.follows = "nixpkgs"; }; outputs = { @@ -13,6 +11,7 @@ inherit (self) outputs; systems = [ + "x86_64-linux" "aarch64-linux" "aarch64-darwin" "x86_64-darwin" @@ -39,9 +38,9 @@ in { homeman = mkShell { shellHook = "export LOCALE_ARCHIVE=/usr/lib/locale/locale-archive"; - buildInputs = [elixir pkgs.inotify-tools]; + buildInputs = with pkgs; [elixir elixir-ls inotify-tools]; }; - default = outputs.devShells.homeman; + default = outputs.devShells.${system}.homeman; } ); }; diff --git a/lib/homeman_web/components/layouts/app.html.heex b/lib/homeman_web/components/layouts/app.html.heex index 1eacc96..1cb5adc 100644 --- a/lib/homeman_web/components/layouts/app.html.heex +++ b/lib/homeman_web/components/layouts/app.html.heex @@ -1,5 +1,5 @@ App
- <.flash_group flash={@flash} /> - <%= @inner_content %> + <.flash_group flash={@flash} /> + <%= @inner_content %>
diff --git a/lib/homeman_web/components/layouts/root.html.heex b/lib/homeman_web/components/layouts/root.html.heex index 5b7b6f9..a2d1d2f 100644 --- a/lib/homeman_web/components/layouts/root.html.heex +++ b/lib/homeman_web/components/layouts/root.html.heex @@ -12,6 +12,7 @@ - Root <%= @inner_content %> + Root + <%= @inner_content %>