aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Audron <audron@cocaine.farm>2024-08-12 16:50:39 +0200
committerMax Audron <audron@cocaine.farm>2024-08-12 16:50:39 +0200
commit4c48c5a1da1bee9a9dfcffe3af4e05d09d1a0607 (patch)
treedb41fab669eebb7a1aae8ff38c1ac8138d9564f6
parentupdate flaresolverr (diff)
add catinator
-rw-r--r--flake.lock279
-rw-r--r--flake.nix4
-rw-r--r--modules/catinator/default.nix21
-rw-r--r--modules/default.nix2
m---------secrets0
5 files changed, 299 insertions, 7 deletions
diff --git a/flake.lock b/flake.lock
index 1bca8ac..9c7d226 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,66 @@
{
"nodes": {
+ "catinator": {
+ "inputs": {
+ "nci": "nci",
+ "nixpkgs": "nixpkgs",
+ "parts": "parts_2"
+ },
+ "locked": {
+ "lastModified": 1723471763,
+ "narHash": "sha256-ecMLAommojGLRp+s0WFfGZyu2+PfxEk83cvs1IIGo9Y=",
+ "owner": "cocainefarm",
+ "repo": "catinator",
+ "rev": "f045a12e0af8432c8c7dc2fb1e32805813467091",
+ "type": "gitlab"
+ },
+ "original": {
+ "owner": "cocainefarm",
+ "repo": "catinator",
+ "type": "gitlab"
+ }
+ },
+ "crane": {
+ "flake": false,
+ "locked": {
+ "lastModified": 1699217310,
+ "narHash": "sha256-xpW3VFUG7yE6UE6Wl0dhqencuENSkV7qpnpe9I8VbPw=",
+ "owner": "ipetkov",
+ "repo": "crane",
+ "rev": "d535642bbe6f377077f7c23f0febb78b1463f449",
+ "type": "github"
+ },
+ "original": {
+ "owner": "ipetkov",
+ "ref": "v0.15.0",
+ "repo": "crane",
+ "type": "github"
+ }
+ },
+ "dream2nix": {
+ "inputs": {
+ "nixpkgs": [
+ "catinator",
+ "nci",
+ "nixpkgs"
+ ],
+ "purescript-overlay": "purescript-overlay",
+ "pyproject-nix": "pyproject-nix"
+ },
+ "locked": {
+ "lastModified": 1722526955,
+ "narHash": "sha256-fFS8aDnfK9Qfm2FLnQ8pqWk8FzvFEv5LvTuZTZLREnc=",
+ "owner": "nix-community",
+ "repo": "dream2nix",
+ "rev": "3fd4c14d3683baac8d1f94286ae14fe160888b51",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nix-community",
+ "repo": "dream2nix",
+ "type": "github"
+ }
+ },
"flake-parts": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib"
@@ -36,10 +97,53 @@
"type": "github"
}
},
+ "mk-naked-shell": {
+ "flake": false,
+ "locked": {
+ "lastModified": 1681286841,
+ "narHash": "sha256-3XlJrwlR0nBiREnuogoa5i1b4+w/XPe0z8bbrJASw0g=",
+ "owner": "yusdacra",
+ "repo": "mk-naked-shell",
+ "rev": "7612f828dd6f22b7fb332cc69440e839d7ffe6bd",
+ "type": "github"
+ },
+ "original": {
+ "owner": "yusdacra",
+ "repo": "mk-naked-shell",
+ "type": "github"
+ }
+ },
+ "nci": {
+ "inputs": {
+ "crane": "crane",
+ "dream2nix": "dream2nix",
+ "mk-naked-shell": "mk-naked-shell",
+ "nixpkgs": [
+ "catinator",
+ "nixpkgs"
+ ],
+ "parts": "parts",
+ "rust-overlay": "rust-overlay",
+ "treefmt": "treefmt"
+ },
+ "locked": {
+ "lastModified": 1723443288,
+ "narHash": "sha256-bP60+yYZsDttnQINxWVJHH3+kS4MkLBbJzwIL61knTY=",
+ "owner": "yusdacra",
+ "repo": "nix-cargo-integration",
+ "rev": "00702704ffd937a3cd2eafb80947a31f2c63cec5",
+ "type": "github"
+ },
+ "original": {
+ "owner": "yusdacra",
+ "repo": "nix-cargo-integration",
+ "type": "github"
+ }
+ },
"nixinate": {
"inputs": {
"flake-parts": "flake-parts_2",
- "nixpkgs": "nixpkgs"
+ "nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1696944707,
@@ -57,16 +161,16 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1691421349,
- "narHash": "sha256-RRJyX0CUrs4uW4gMhd/X4rcDG8PTgaaCQM5rXEJOx6g=",
+ "lastModified": 1723282977,
+ "narHash": "sha256-oTK91aOlA/4IsjNAZGMEBz7Sq1zBS0Ltu4/nIQdYDOg=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "011567f35433879aae5024fc6ec53f2a0568a6c4",
+ "rev": "a781ff33ae258bbcfd4ed6e673860c3e923bf2cc",
"type": "github"
},
"original": {
"owner": "nixos",
- "ref": "nixos-23.05",
+ "ref": "nixos-24.05",
"repo": "nixpkgs",
"type": "github"
}
@@ -119,6 +223,22 @@
},
"nixpkgs_2": {
"locked": {
+ "lastModified": 1691421349,
+ "narHash": "sha256-RRJyX0CUrs4uW4gMhd/X4rcDG8PTgaaCQM5rXEJOx6g=",
+ "owner": "nixos",
+ "repo": "nixpkgs",
+ "rev": "011567f35433879aae5024fc6ec53f2a0568a6c4",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nixos",
+ "ref": "nixos-23.05",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
+ "nixpkgs_3": {
+ "locked": {
"lastModified": 1723282977,
"narHash": "sha256-oTK91aOlA/4IsjNAZGMEBz7Sq1zBS0Ltu4/nIQdYDOg=",
"owner": "nixos",
@@ -133,15 +253,116 @@
"type": "github"
}
},
+ "parts": {
+ "inputs": {
+ "nixpkgs-lib": [
+ "catinator",
+ "nci",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1722555600,
+ "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=",
+ "owner": "hercules-ci",
+ "repo": "flake-parts",
+ "rev": "8471fe90ad337a8074e957b69ca4d0089218391d",
+ "type": "github"
+ },
+ "original": {
+ "owner": "hercules-ci",
+ "repo": "flake-parts",
+ "type": "github"
+ }
+ },
+ "parts_2": {
+ "inputs": {
+ "nixpkgs-lib": [
+ "catinator",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1722555600,
+ "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=",
+ "owner": "hercules-ci",
+ "repo": "flake-parts",
+ "rev": "8471fe90ad337a8074e957b69ca4d0089218391d",
+ "type": "github"
+ },
+ "original": {
+ "owner": "hercules-ci",
+ "repo": "flake-parts",
+ "type": "github"
+ }
+ },
+ "purescript-overlay": {
+ "inputs": {
+ "nixpkgs": [
+ "catinator",
+ "nci",
+ "dream2nix",
+ "nixpkgs"
+ ],
+ "slimlock": "slimlock"
+ },
+ "locked": {
+ "lastModified": 1696022621,
+ "narHash": "sha256-eMjFmsj2G1E0Q5XiibUNgFjTiSz0GxIeSSzzVdoN730=",
+ "owner": "thomashoneyman",
+ "repo": "purescript-overlay",
+ "rev": "047c7933abd6da8aa239904422e22d190ce55ead",
+ "type": "github"
+ },
+ "original": {
+ "owner": "thomashoneyman",
+ "repo": "purescript-overlay",
+ "type": "github"
+ }
+ },
+ "pyproject-nix": {
+ "flake": false,
+ "locked": {
+ "lastModified": 1702448246,
+ "narHash": "sha256-hFg5s/hoJFv7tDpiGvEvXP0UfFvFEDgTdyHIjDVHu1I=",
+ "owner": "davhau",
+ "repo": "pyproject.nix",
+ "rev": "5a06a2697b228c04dd2f35659b4b659ca74f7aeb",
+ "type": "github"
+ },
+ "original": {
+ "owner": "davhau",
+ "ref": "dream2nix",
+ "repo": "pyproject.nix",
+ "type": "github"
+ }
+ },
"root": {
"inputs": {
+ "catinator": "catinator",
"flake-parts": "flake-parts",
"nixinate": "nixinate",
- "nixpkgs": "nixpkgs_2",
+ "nixpkgs": "nixpkgs_3",
"nixpkgs-unstable": "nixpkgs-unstable",
"secrets": "secrets"
}
},
+ "rust-overlay": {
+ "flake": false,
+ "locked": {
+ "lastModified": 1723429325,
+ "narHash": "sha256-4x/32xTCd+xCwFoI/kKSiCr5LQA2ZlyTRYXKEni5HR8=",
+ "owner": "oxalica",
+ "repo": "rust-overlay",
+ "rev": "65e3dc0fe079fe8df087cd38f1fe6836a0373aad",
+ "type": "github"
+ },
+ "original": {
+ "owner": "oxalica",
+ "repo": "rust-overlay",
+ "type": "github"
+ }
+ },
"secrets": {
"flake": false,
"locked": {
@@ -157,6 +378,52 @@
"type": "git",
"url": "ssh://git@gitlab.com/cocainefarm/k8s/secrets"
}
+ },
+ "slimlock": {
+ "inputs": {
+ "nixpkgs": [
+ "catinator",
+ "nci",
+ "dream2nix",
+ "purescript-overlay",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1688610262,
+ "narHash": "sha256-Wg0ViDotFWGWqKIQzyYCgayeH8s4U1OZcTiWTQYdAp4=",
+ "owner": "thomashoneyman",
+ "repo": "slimlock",
+ "rev": "b5c6cdcaf636ebbebd0a1f32520929394493f1a6",
+ "type": "github"
+ },
+ "original": {
+ "owner": "thomashoneyman",
+ "repo": "slimlock",
+ "type": "github"
+ }
+ },
+ "treefmt": {
+ "inputs": {
+ "nixpkgs": [
+ "catinator",
+ "nci",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1723402464,
+ "narHash": "sha256-xjunKUFQs9D7u0TpVoXhrRYb4tbVkutRoFUHj0lEydE=",
+ "owner": "numtide",
+ "repo": "treefmt-nix",
+ "rev": "c9f97032be6816fa234f24803b8ae79dc7753a91",
+ "type": "github"
+ },
+ "original": {
+ "owner": "numtide",
+ "repo": "treefmt-nix",
+ "type": "github"
+ }
}
},
"root": "root",
diff --git a/flake.nix b/flake.nix
index e67610e..9cf3853 100644
--- a/flake.nix
+++ b/flake.nix
@@ -9,6 +9,8 @@
url = "git+ssh://git@gitlab.com/cocainefarm/k8s/secrets";
flake = false;
};
+
+ catinator.url = "gitlab:cocainefarm/catinator";
};
outputs = inputs@{ self, nixpkgs, nixpkgs-unstable, flake-parts, nixinate, ... }:
@@ -50,7 +52,7 @@
nixosConfigurations = with self.nixosModules; {
# vultr-image = mkSystem [ common users image vultr ];
- ettves = mkSystem [ (import ./machines/ettves) kubernetes zfs teamspeak postgresql quassel powerdns acme authentik hydra homeassistant games languagetool git laplace ];
+ ettves = mkSystem [ (import ./machines/ettves) zfs teamspeak postgresql quassel powerdns acme authentik hydra homeassistant games languagetool git laplace catinator ];
phaenn = mkSystem [ (import ./machines/phaenn) zfs acme tlmp ];
fra01 = mkSystem [ (import ./machines/fra01) vultr bgp powerdns acme garage ];
nyc01 = mkSystem [ (import ./machines/nyc01) vultr bgp powerdns acme garage ];
diff --git a/modules/catinator/default.nix b/modules/catinator/default.nix
new file mode 100644
index 0000000..d6224a6
--- /dev/null
+++ b/modules/catinator/default.nix
@@ -0,0 +1,21 @@
+{ config, lib, pkgs, catinator, ... }:
+
+{
+ imports = [ catinator.nixosModules.default ];
+
+ services.catinator = {
+ environmentFile = ../../secrets/catinator;
+
+ settings = {
+ release = {
+ user = {
+ nickname = "\\__{^-_-^}";
+ };
+ server = {
+ hostname = "irc.snoonet.org";
+ channels = ["#redoxmasterrace" "#linuxmasterrace" "#neolag"];
+ };
+ };
+ };
+ };
+}
diff --git a/modules/default.nix b/modules/default.nix
index 8876e15..8bb7960 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -27,4 +27,6 @@
games = import ./games;
rtmp = import ./rtmp;
laplace = import ./laplace;
+
+ catinator = import ./catinator;
}
diff --git a/secrets b/secrets
-Subproject 0303b29d9194d42649dc6206d382d1a93f157af
+Subproject 21f3a5c51dd80a434f43c2e1c960a9f2c88e6a8