diff options
| -rw-r--r-- | flake.nix | 6 | ||||
| -rw-r--r-- | nix/modules/website.nix (renamed from nix/modules/fcuny.net.nix) | 8 | ||||
| -rw-r--r-- | nix/packages/default.nix | 2 | ||||
| -rw-r--r-- | nix/packages/website.nix (renamed from nix/packages/fcuny.net.nix) | 6 |
4 files changed, 11 insertions, 11 deletions
@@ -25,10 +25,10 @@ # Import NixOS modules nixosModules = { - fcuny-net = import ./nix/modules/fcuny.net.nix; + website = import ./nix/modules/website.nix; default = { imports = [ - ./nix/modules/fcuny.net.nix + ./nix/modules/website.nix ]; }; }; @@ -68,7 +68,7 @@ in { packages = packages // { - default = packages.fcuny-net; + default = packages.website; }; formatter = treefmtEval.config.build.wrapper; diff --git a/nix/modules/fcuny.net.nix b/nix/modules/website.nix index eaab7d2..5c82e34 100644 --- a/nix/modules/fcuny.net.nix +++ b/nix/modules/website.nix @@ -8,13 +8,13 @@ with lib; let - cfg = config.services.fcuny-net; + cfg = config.services.website; in { - options.services.fcuny-net = { + options.services.website = { enable = mkEnableOption "fcuny.net service"; - package = mkPackageOption pkgs "fcuny.net" { }; + package = mkPackageOption pkgs "website" { }; port = mkOption { type = types.port; @@ -30,7 +30,7 @@ in }; config = mkIf cfg.enable { - systemd.services.fcuny-net = { + systemd.services.website = { description = "fcuny.net service"; wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; diff --git a/nix/packages/default.nix b/nix/packages/default.nix index 81fb9eb..87c1b99 100644 --- a/nix/packages/default.nix +++ b/nix/packages/default.nix @@ -1,5 +1,5 @@ { pkgs }: { - fcuny.net = pkgs.callPackage ./fcuny.net.nix { }; + website = pkgs.callPackage ./website.nix { }; } diff --git a/nix/packages/fcuny.net.nix b/nix/packages/website.nix index e9ce950..880c93b 100644 --- a/nix/packages/fcuny.net.nix +++ b/nix/packages/website.nix @@ -4,7 +4,7 @@ }: buildGoModule rec { - pname = "fcuny.net"; + pname = "fcuny-net"; version = "0.1.0"; # Consider deriving from git tags: version = builtins.substring 0 8 self.rev; src = ../..; @@ -22,10 +22,10 @@ buildGoModule rec { meta = with lib; { description = "My personal website"; - homepage = "https://code.fcuny.net/fcuny/x/app/fcuny-net"; + homepage = "https://code.fcuny.net/x/tree/app/fcuny-net"; license = licenses.mit; maintainers = with maintainers; [ fcuny ]; platforms = platforms.unix; - mainProgram = "fcuny-net"; + mainProgram = "bin/fcuny-net"; }; } |