diff --git a/README.md b/README.md deleted file mode 100644 index 52d85ff..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -This repository is hosted at https://git.rrv.sh/rrvsh/rrv.sh. - -It's mirrored at https://github.com/rrvsh/rrv.sh. diff --git a/nix/package.nix b/default.nix similarity index 90% rename from nix/package.nix rename to default.nix index 0811d98..ae22cb4 100644 --- a/nix/package.nix +++ b/default.nix @@ -5,7 +5,7 @@ let in stdenv.mkDerivation { inherit name version; - src = ../src; + src = ./src; installPhase = '' cp -r . $out ''; diff --git a/flake.nix b/flake.nix index 2fb6c45..3fc6351 100644 --- a/flake.nix +++ b/flake.nix @@ -1,32 +1,6 @@ { - inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - outputs = - inputs: - let - systems = [ - "x86_64-linux" - "aarch64-linux" - ]; - inherit (builtins) map listToAttrs; - forAllSystems = - f: - listToAttrs ( - map (system: { - name = system; - value = f system; - }) systems - ); - in - { - packages = forAllSystems ( - system: - let - pkgs = inputs.nixpkgs.legacyPackages.${system}; - in - { - default = pkgs.callPackage ./nix/package.nix { }; - } - ); - nixosModules.default = import ./nix/modules/nixos.nix; - }; + inputs.nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; + outputs = inputs: { + packages.x86_64-linux.default = ./default.nix; + }; } diff --git a/nix/modules/nixos.nix b/nix/modules/nixos.nix deleted file mode 100644 index c4e48b5..0000000 --- a/nix/modules/nixos.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: -let - inherit (builtins) toString; - inherit (lib) mkOption mkEnableOption mkIf; - inherit (lib.types) port str; - cfg = config.services.rrv-sh; - package = pkgs.callPackage ../package.nix { }; -in -{ - options.services.rrv-sh = { - enable = mkEnableOption ""; - port = mkOption { - type = port; - default = 2309; - }; - user = mkOption { - type = str; - default = "rrv-sh"; - }; - group = mkOption { - type = str; - default = "rrv-sh"; - }; - }; - config = mkIf cfg.enable { - users.users.rrv-sh = mkIf (cfg.user == "rrv-sh") { - inherit (cfg) group; - isSystemUser = true; - description = "rrv.sh server user"; - }; - users.groups.rrv-sh = mkIf (cfg.user == "rrv-sh") { }; - systemd.services.rrv-sh = { - description = "the rrv.sh website"; - after = [ "network.target" ]; - wantedBy = [ "multi-user.target" ]; - serviceConfig = { - Type = "simple"; - Restart = "on-failure"; - RestartSec = "5s"; - User = cfg.user; - Group = cfg.group; - ExecStart = "${pkgs.live-server}/bin/live-server -p ${toString cfg.port} ${package}"; - }; - }; - }; -} diff --git a/src/blog/index.html b/src/blog/index.html deleted file mode 100644 index baaa954..0000000 --- a/src/blog/index.html +++ /dev/null @@ -1,10 +0,0 @@ - -
- -