diff --git a/flake.lock b/flake.lock index 9e99cd4..2eaa65b 100755 --- a/flake.lock +++ b/flake.lock @@ -21,6 +21,27 @@ "type": "github" } }, + "cohost-blogger": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1682879948, + "narHash": "sha256-NgBopIk1VmUzanIPSjuxLKE/aypv+c3Un3LXA9Br4R8=", + "ref": "refs/heads/main", + "rev": "f14813c88fcf33258def997d35476be87c89be7f", + "revCount": 4, + "type": "git", + "url": "https://git.oat.zone/oat/cohost-blogger" + }, + "original": { + "type": "git", + "url": "https://git.oat.zone/oat/cohost-blogger" + } + }, "darwin": { "inputs": { "nixpkgs": [ @@ -45,7 +66,7 @@ }, "emacs-overlay": { "inputs": { - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_2", "nixpkgs": [ "nixpkgs" ] @@ -65,6 +86,24 @@ } }, "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { "locked": { "lastModified": 1667395993, "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", @@ -79,7 +118,7 @@ "type": "github" } }, - "flake-utils_2": { + "flake-utils_3": { "locked": { "lastModified": 1659877975, "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", @@ -201,7 +240,7 @@ }, "nix-minecraft": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils_3", "nixpkgs": [ "nixpkgs" ] @@ -282,6 +321,7 @@ "root": { "inputs": { "agenix": "agenix", + "cohost-blogger": "cohost-blogger", "emacs-overlay": "emacs-overlay", "home-manager": "home-manager", "hyprland": "hyprland", @@ -294,6 +334,21 @@ "vscode-server": "vscode-server" } }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "vscode-server": { "inputs": { "nixpkgs": "nixpkgs_2" diff --git a/flake.nix b/flake.nix index b0a2a25..6345f01 100755 --- a/flake.nix +++ b/flake.nix @@ -29,6 +29,11 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + cohost-blogger = { + url = "git+https://git.oat.zone/oat/cohost-blogger"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + emacs-overlay = { url = "github:nix-community/emacs-overlay"; inputs.nixpkgs.follows = "nixpkgs"; @@ -52,7 +57,7 @@ vscode-server.url = "github:msteen/nixos-vscode-server"; }; - outputs = inputs @ { self, nixpkgs, nixpkgs-unstable, vscode-server, nix-minecraft, /* hyprland, hyprpaper, hyprpicker, */ ... }: + outputs = inputs @ { self, nixpkgs, nixpkgs-unstable, vscode-server, nix-minecraft, cohost-blogger, /* hyprland, hyprpaper, hyprpicker, */ ... }: let system = "x86_64-linux"; diff --git a/hosts/lucent-firepit/webapps/default.nix b/hosts/lucent-firepit/webapps/default.nix index 814f446..a47f55d 100644 --- a/hosts/lucent-firepit/webapps/default.nix +++ b/hosts/lucent-firepit/webapps/default.nix @@ -4,6 +4,12 @@ with lib; let in { config = { + services.cohost-blogger = { + enable = true; + domain = "blog.oat.zone"; + port = 3500; + }; + modules = { services = { #nextcloud = { @@ -54,6 +60,7 @@ in { "tesco-underground-dev.oat.zone".auth = { tesco = builtins.readFile /etc/tesco; }; "oat.zone".dataDir = "/var/www/oat.zone"; "oat.zone".php = true; + #"beta-blog.oat.zone".dataDir = "/var/www/beta.blog.oat.zone"; "yugoslavia.fishing".dataDir = "/var/www/yugoslavia.fishing"; "yugoslavia.fishing".php = true; "educationmath.oat.zone".dataDir = "/var/www/proxy.oat.zone"; @@ -101,11 +108,13 @@ in { port = 4444; }; + /* ghost = { enable = true; domain = "blog.oat.zone"; port = 1357; }; + */ isso = { enable = true;