From 1e0af9ab676a001d530d5be2418b7b16aa8c9b83 Mon Sep 17 00:00:00 2001 From: "Gustavo L de Mello (Guz)" Date: Tue, 17 Dec 2024 21:04:04 -0300 Subject: [PATCH] feat: add new creator site --- capytal/default.nix | 3 +- capytal/websites/default.nix | 5 + capytal/websites/keikos.work.nix | 16 +++ flake.lock | 211 ++++++++++++++++++++++++++++--- flake.nix | 7 +- secrets/spacestation.lesser.json | 15 ++- 6 files changed, 225 insertions(+), 32 deletions(-) create mode 100644 capytal/websites/default.nix create mode 100644 capytal/websites/keikos.work.nix diff --git a/capytal/default.nix b/capytal/default.nix index a95b233..afa803f 100644 --- a/capytal/default.nix +++ b/capytal/default.nix @@ -6,6 +6,7 @@ ./garage.nix ./music-bot.nix ./sqld.nix - ]; + ./websites + ]; } diff --git a/capytal/websites/default.nix b/capytal/websites/default.nix new file mode 100644 index 0000000..c2cc30f --- /dev/null +++ b/capytal/websites/default.nix @@ -0,0 +1,5 @@ +{...}: { + imports = [ + ./keikos.work.nix + ]; +} diff --git a/capytal/websites/keikos.work.nix b/capytal/websites/keikos.work.nix new file mode 100644 index 0000000..3e034cd --- /dev/null +++ b/capytal/websites/keikos.work.nix @@ -0,0 +1,16 @@ +{ + config, + inputs, + ... +}: let + secrets = config.spacestation-secrets.lesser; +in { + imports = [ + inputs.keikoswork.nixosModules.default + ]; + + services.keikos.web = { + enable = true; + port = secrets.guz.services."keikos.work".port; + }; +} diff --git a/flake.lock b/flake.lock index aed1837..a0c9296 100644 --- a/flake.lock +++ b/flake.lock @@ -38,25 +38,37 @@ "type": "github" } }, - "frappurccino-forgejo": { + "flake-utils": { "inputs": { - "gitignore": "gitignore", - "nixpkgs": [ - "nixpkgs" - ] + "systems": "systems" }, "locked": { - "lastModified": 1726239025, - "narHash": "sha256-9INgfUmWSE4kT/0niKvpqhuesP4FR7lBplaKfHm/q+g=", - "ref": "refs/heads/main", - "rev": "b24a35a56013a760515198fae58ce8711a22d05c", - "revCount": 54, - "type": "git", - "url": "https://forgejo.capytal.company/capytal/frappurccino-forgejo" + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "type": "github" }, "original": { - "type": "git", - "url": "https://forgejo.capytal.company/capytal/frappurccino-forgejo" + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { + "locked": { + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" } }, "fromYaml": { @@ -78,7 +90,7 @@ "gitignore": { "inputs": { "nixpkgs": [ - "frappurccino-forgejo", + "keikoswork", "nixpkgs" ] }, @@ -96,6 +108,51 @@ "type": "github" } }, + "gitignore_2": { + "inputs": { + "nixpkgs": [ + "keikoswork", + "templ", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, + "gomod2nix": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": [ + "keikoswork", + "templ", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1722589758, + "narHash": "sha256-sbbA8b6Q2vB/t/r1znHawoXLysCyD4L/6n6/RykiSnA=", + "owner": "nix-community", + "repo": "gomod2nix", + "rev": "4e08ca09253ef996bd4c03afa383b23e35fe28a1", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "gomod2nix", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -117,6 +174,26 @@ "type": "github" } }, + "keikoswork": { + "inputs": { + "gitignore": "gitignore", + "nixpkgs": "nixpkgs", + "templ": "templ" + }, + "locked": { + "lastModified": 1734479439, + "narHash": "sha256-AwW1oHHUtrzWcQMU7P2UkvDjwXfVX/5F576CaJ4DEv8=", + "ref": "refs/heads/main", + "rev": "cee778160faaf232a7a7d6646b34da6b1bf71700", + "revCount": 53, + "type": "git", + "url": "https://forge.capytal.company/guz013/keikos.work" + }, + "original": { + "type": "git", + "url": "https://forge.capytal.company/guz013/keikos.work" + } + }, "nix-index-database": { "inputs": { "nixpkgs": [ @@ -139,16 +216,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1730327045, - "narHash": "sha256-xKel5kd1AbExymxoIfQ7pgcX6hjw9jCgbiBjiUfSVJ8=", + "lastModified": 1734119587, + "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "080166c15633801df010977d9d7474b4a6c549d7", + "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-24.05", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -185,14 +262,46 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1724322575, + "narHash": "sha256-kRYwAdYsaICNb2WYcWtBFG6caSuT0v/vTAyR8ap0IR0=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "2a02822b466ffb9f1c02d07c5dd6b96d08b56c6b", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "release-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1730327045, + "narHash": "sha256-xKel5kd1AbExymxoIfQ7pgcX6hjw9jCgbiBjiUfSVJ8=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "080166c15633801df010977d9d7474b4a6c549d7", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { "base16": "base16", "dot013-environment": "dot013-environment", - "frappurccino-forgejo": "frappurccino-forgejo", "home-manager": "home-manager", + "keikoswork": "keikoswork", "nix-index-database": "nix-index-database", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_3", "nixpkgs-unstable": "nixpkgs-unstable", "sops-nix": "sops-nix" } @@ -217,6 +326,66 @@ "repo": "sops-nix", "type": "github" } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "templ": { + "inputs": { + "gitignore": "gitignore_2", + "gomod2nix": "gomod2nix", + "nixpkgs": "nixpkgs_2", + "xc": "xc" + }, + "locked": { + "lastModified": 1730278073, + "narHash": "sha256-0KGht5IMbJV8KkXgT5qJxA9bcmWevzXXAVPMQTm0ccw=", + "owner": "a-h", + "repo": "templ", + "rev": "d9eefff2eeea5c78c938baf556d7ded6880e2fca", + "type": "github" + }, + "original": { + "owner": "a-h", + "ref": "v0.2.793", + "repo": "templ", + "type": "github" + } + }, + "xc": { + "inputs": { + "flake-utils": "flake-utils_2", + "nixpkgs": [ + "keikoswork", + "templ", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1724404748, + "narHash": "sha256-p6rXzNiDm2uBvO1MLzC5pJp/0zRNzj/snBzZI0ce62s=", + "owner": "joerdav", + "repo": "xc", + "rev": "960ff9f109d47a19122cfb015721a76e3a0f23a2", + "type": "github" + }, + "original": { + "owner": "joerdav", + "repo": "xc", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index a498f2a..1fed8d3 100644 --- a/flake.nix +++ b/flake.nix @@ -30,10 +30,9 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - frappurccino-forgejo = { - # url = "git+file:///home/guz/.projects/capytal/frappurccino-forgejo"; - url = "git+https://forgejo.capytal.company/capytal/frappurccino-forgejo"; - inputs.nixpkgs.follows = "nixpkgs"; + keikoswork = { + url = "git+https://forge.capytal.company/guz013/keikos.work"; + # inputs.nixpkgs.follows = "nixpkgs"; }; }; outputs = { diff --git a/secrets/spacestation.lesser.json b/secrets/spacestation.lesser.json index 9551909..bc88664 100644 --- a/secrets/spacestation.lesser.json +++ b/secrets/spacestation.lesser.json @@ -3,8 +3,8 @@ "device-ip": "ENC[AES256_GCM,data:Ed6hS/9F52UGVLpAyw==,iv:sg9iVEmZxA2lNJoc0xwLRyDzoF1Cy48wp9CQf3zOOzQ=,tag:77RYGvjgw0QdZUsPcqVTvA==,type:str]", "homelab-domain": "ENC[AES256_GCM,data:XkgOP94q3gBknoGzcA==,iv:pKnrjhi9VnW0xWIEQfnxV+wb/iNxT/TFs07K9/NW8sU=,tag:N2sGj5lTCJHFBpI9baja9Q==,type:str]", "devices": { - "defaultGateway": "ENC[AES256_GCM,data:0/7uxwYJi65l3fw=,iv:LH5/6P8uKphBpiRCTUJuTe99qJuExn0TNOlmEO9CtY0=,tag:4hnscOeIYbH97SGqz/gPGA==,type:str]", - "spacestation": "ENC[AES256_GCM,data:4Sv2ukbvy7R5MZn4,iv:f6I57L1dGHVSIravgpK8Ui4fbw0y60mdjCjAl+L55v4=,tag:qF749Etc7PxK8lG5GfTpyw==,type:str]" + "defaultGateway": "ENC[AES256_GCM,data:QDx9ptJ5zd5hcqc=,iv:6ofaRLYQUO8x3qbwMsSkeFhmAsCYxQRMuxfUGJNpSms=,tag:9l1c8XeA6Qh16+TIAeidYg==,type:str]", + "spacestation": "ENC[AES256_GCM,data:Cx+yn7+/ZP9zoNgLfw==,iv:BeRrS78SHX9QWpqWMidHynor8zlj47GX/2HSrdY41lA=,tag:op20lsjQ38EU98YKP/wLfw==,type:str]" }, "capytal": { "cloudflare-funnel": "ENC[AES256_GCM,data:WPbSA95btherLi0zTfspTfCsWX+5nZLOHnSGCjFtrdPdb7i2x1sv7KZdgtLivlSwXyZKUm7EiaPhQzidfRO2WQrCw3v9nIOHgnZweiVJqAGEWn0Oo1RioaGR8PZRsb46NdPmNAit+cmFPq99Kt5Dhd9fjwrg6INyXl0ulu8j1ByCU7UY2aJP+ccA24EdsIUjA29Nd4OPiIJwswEb5qaQJI4eQMg4scSZJIuynHGnJVD0KjuU8E1Mfw==,iv:2nozvsCqO5xnvJDbWV7jaUIPoCbkWPT5YlFFlNMY7QI=,tag:dwwAUWfDy48EvyLnamvUCg==,type:str]", @@ -13,9 +13,9 @@ "defaultIp": "ENC[AES256_GCM,data:u+sITdDcl9TzabF8Pg==,iv:3GEn3lERvdbyKKf2r7qTxPOjq9/Im6TJraSKnrtOzWA=,tag:7A31e17vqsgI72Aj0kZqjA==,type:str]", "hosts": [ { - "pattern": "ENC[AES256_GCM,data:cj3RCHnPQqnDVrHECNsKcSfrYxCScisSVg==,iv:IzmtlDXQiIEQmCX7Vgf5Q/YWmJAlyqlDCHTyAtuj4Ss=,tag:G4MYjx3p2G1Fzwu5dQVpiw==,type:str]", + "pattern": "ENC[AES256_GCM,data:M8iIEiyC8dp2qFnxP5+7EEd4iAiXnxw=,iv:CyVp710aXqLVZkTNLorOz1BJIAX+LMCLk3yBc/3X69g=,tag:ee5f4niv3/S5k9MlHUErBQ==,type:str]", "config": { - "redir": "ENC[AES256_GCM,data:AiVHPAITKBhu2nMfNGJRqJaqPm04eH1e3KETkjJaHuzI,iv:yo7VnT2IBnIYxEcRsU1Ez04k5Y5k07FK63JNRVYq3ks=,tag:r/zSBU08gUqo1vdIX10kFQ==,type:str]" + "redir": "ENC[AES256_GCM,data:9haYlXbUUkYtfHA+RdMmBgTxcUFtq5QN/2eV3su6ueE=,iv:N2xhz/gMofcxX35w0p+NYNKa2bNsDf173hr/CvOPkV0=,tag:NcHZpdB1zcQOdnhYGuGJuA==,type:str]" } }, { @@ -118,6 +118,9 @@ "services": { "adguard": { "port": "ENC[AES256_GCM,data:g4kgZg==,iv:GR9LMXiAjak8iOREQzqmUU4TTjrVDRlupZfZaS7RQ2Y=,tag:pZXMsxw0BKaGpNklKiCH6w==,type:float]" + }, + "keikos.work": { + "port": "ENC[AES256_GCM,data:2oxzgg==,iv:yVGXfq9d0DtZfm7CwCIq+2xfi+twuwwhxh//9fD7XIc=,tag:b7cApWwibu+YthjyZufuKQ==,type:float]" } } }, @@ -132,8 +135,8 @@ "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBnL3dCY1VLMmoxRFRmS0Ir\nV0ppTnI0RE5ZMjcvRGNPWkNxWFdJYTBDTG00ClRGQkh1UStGTmc0RE5aNy9nL3FI\nbHJIa3hLR0ZkTjd6WkFzOFkzeFdMNUEKLS0tIDBidk93Qy9LenFlSGZ2aEpuTUFt\nWVM2eS9UdXAvbzE4eEdKMjVEM3RLdm8KKeIhk+YOKVL9Y19lLyb6/Pxv8rbewK2e\nLm96jx+LOMOCFcQGxuFKWqQbTB4br/cPvRKSY5jFmFWqVg7pCPTAzQ==\n-----END AGE ENCRYPTED FILE-----\n" } ], - "lastmodified": "2024-11-08T23:18:01Z", - "mac": "ENC[AES256_GCM,data:lsnLJVWJD7RPhnOrlvDTM+LN+/OZU6+5joMzNoecqIi4YZ8rGqiegppvhexHB1VBhDxTvWkhIme2cb/8tcl3mjoUGn4CrYeROs0ao9zM1VuJR/X/NoOAqOkPqu4+msFq7ikije+KJiN6oMKDGo/A8yIAscWeLmB8ImwcD2cA8o0=,iv:kSw4knHyjhJOfs+RBCmVItlFE51mXuMbAK+UUomR3VA=,tag:JOcjdGuHhurOiEksllB1nA==,type:str]", + "lastmodified": "2024-12-17T17:47:21Z", + "mac": "ENC[AES256_GCM,data:8K2C2B57vPKL4QTrqif6rYc9QqjdfgPdjgbm5tz5ALEP/4+xqBzTnfBVYgbh08CgLUQ5nNTEGJtxVU1rwXpWi7VQjOFOrPwRKV8n4eWh9pGO1u/byfVcC52tVsz968OlS5xi4XKcQwtrZVVLbzoqH/Q4oGmg06LO/s2j6Xj0LdQ=,iv:geilhyF8Jy8sHVHZ453q3CY4GDTiw3vhEJtu0F7ZU2Y=,tag:ky8gyY6j+Czp0Q2mteWGWw==,type:str]", "pgp": null, "unencrypted_suffix": "_unencrypted", "version": "3.9.0"