diff options
| -rw-r--r-- | modules/nixos/services/web/personal/default.nix | 24 | ||||
| -rw-r--r-- | packages/site/default.nix | 28 |
2 files changed, 30 insertions, 22 deletions
diff --git a/modules/nixos/services/web/personal/default.nix b/modules/nixos/services/web/personal/default.nix index 7d9915a..6a86447 100644 --- a/modules/nixos/services/web/personal/default.nix +++ b/modules/nixos/services/web/personal/default.nix @@ -3,26 +3,6 @@ with lib; with lib.${namespace}; let cfg = config.${namespace}.services.web.personal; impermanence = config.${namespace}.system.impermanence; - - package = (pkgs.buildGoModule rec { - pname = "site"; - version = "6612d84c63a7bbc2a5b70607f2ec32ea070c4659"; - - src = pkgs.fetchFromGitHub { - owner = "CartConnoisseur"; - repo = "site"; - rev = "${version}"; - hash = "sha256-n54+LdtMyjoLfaFqd7tcDQqBiYCdUW/Rs67Vc4QwEJ0="; - }; - - # kinda a hack, but whatever - postBuild = '' - mkdir -p $out/share/site - cp -r $src/* $out/share/site/ - ''; - - vendorHash = "sha256-2/4Wv7nsaT0wnUzkRgHKpSswigDj9nOvlmYXK29rvLU="; - }); in { options.${namespace}.services.web.personal = with types; { enable = mkEnableOption "personal site webserver"; @@ -55,8 +35,8 @@ in { wantedBy = [ "multi-user.target" ]; serviceConfig = { - WorkingDirectory = "${package}/share/site"; - ExecStart = "${package}/bin/site"; + WorkingDirectory = "${pkgs.cxl.site}/share/site"; + ExecStart = "${pkgs.cxl.site}/bin/site"; }; }; }; diff --git a/packages/site/default.nix b/packages/site/default.nix new file mode 100644 index 0000000..1766134 --- /dev/null +++ b/packages/site/default.nix @@ -0,0 +1,28 @@ +{ lib, pkgs, ... }: + +pkgs.buildGoModule rec { + pname = "site"; + version = "6612d84c63a7bbc2a5b70607f2ec32ea070c4659"; + + src = pkgs.fetchFromGitHub { + owner = "CartConnoisseur"; + repo = "site"; + rev = "${version}"; + hash = "sha256-n54+LdtMyjoLfaFqd7tcDQqBiYCdUW/Rs67Vc4QwEJ0="; + }; + + vendorHash = "sha256-2/4Wv7nsaT0wnUzkRgHKpSswigDj9nOvlmYXK29rvLU="; + + # kinda a hack, but whatever + postBuild = '' + mkdir -p $out/share/site + cp -r $src/* $out/share/site/ + ''; + + meta = { + description = "personal site"; + homepage = "https://github.com/CartConnoisseur/site"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ CartConnoisseur ]; + }; +}
\ No newline at end of file |