diff --git a/flake.lock b/flake.lock
index 6f3a7a6..37354f9 100644
--- a/flake.lock
+++ b/flake.lock
@@ -57,30 +57,6 @@
"type": "github"
}
},
- "attic_2": {
- "inputs": {
- "crane": "crane_3",
- "flake-compat": "flake-compat_3",
- "flake-parts": "flake-parts_2",
- "nix-github-actions": "nix-github-actions_2",
- "nixpkgs": "nixpkgs_4",
- "nixpkgs-stable": "nixpkgs-stable_2"
- },
- "locked": {
- "lastModified": 1758711588,
- "narHash": "sha256-0nZlCCDC5PfndsQJXXtcyrtrfW49I3KadGMDlutzaGU=",
- "owner": "zhaofengli",
- "repo": "attic",
- "rev": "12cbeca141f46e1ade76728bce8adc447f2166c6",
- "type": "github"
- },
- "original": {
- "owner": "zhaofengli",
- "ref": "main",
- "repo": "attic",
- "type": "github"
- }
- },
"botcore-v4": {
"inputs": {
"nixpkgs": "nixpkgs"
@@ -184,37 +160,6 @@
"type": "github"
}
},
- "crane_3": {
- "locked": {
- "lastModified": 1751562746,
- "narHash": "sha256-smpugNIkmDeicNz301Ll1bD7nFOty97T79m4GUMUczA=",
- "owner": "ipetkov",
- "repo": "crane",
- "rev": "aed2020fd3dc26e1e857d4107a5a67a33ab6c1fd",
- "type": "github"
- },
- "original": {
- "owner": "ipetkov",
- "repo": "crane",
- "type": "github"
- }
- },
- "crane_4": {
- "locked": {
- "lastModified": 1772080396,
- "narHash": "sha256-84W9UNtSk9DNMh43WBkOjpkbfODlmg+RDi854PnNgLE=",
- "owner": "ipetkov",
- "repo": "crane",
- "rev": "8525580bc0316c39dbfa18bd09a1331e98c9e463",
- "type": "github"
- },
- "original": {
- "owner": "ipetkov",
- "ref": "master",
- "repo": "crane",
- "type": "github"
- }
- },
"draupnirSrc": {
"flake": false,
"locked": {
@@ -254,29 +199,6 @@
"type": "github"
}
},
- "fenix_2": {
- "inputs": {
- "nixpkgs": [
- "grapevine",
- "nixpkgs"
- ],
- "rust-analyzer-src": "rust-analyzer-src_2"
- },
- "locked": {
- "lastModified": 1772261909,
- "narHash": "sha256-8XbJXrhMFhLgoBrjFIJx5XJi+SD+7/gbvaIXCuqy9Z0=",
- "owner": "nix-community",
- "repo": "fenix",
- "rev": "e4c413b9546d6c9e6426b33b4d6de1a49a375024",
- "type": "github"
- },
- "original": {
- "owner": "nix-community",
- "ref": "main",
- "repo": "fenix",
- "type": "github"
- }
- },
"flake-compat": {
"flake": false,
"locked": {
@@ -312,39 +234,6 @@
"flake-compat_3": {
"flake": false,
"locked": {
- "lastModified": 1747046372,
- "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
- "owner": "edolstra",
- "repo": "flake-compat",
- "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
- "type": "github"
- },
- "original": {
- "owner": "edolstra",
- "repo": "flake-compat",
- "type": "github"
- }
- },
- "flake-compat_4": {
- "flake": false,
- "locked": {
- "lastModified": 1767039857,
- "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
- "owner": "edolstra",
- "repo": "flake-compat",
- "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
- "type": "github"
- },
- "original": {
- "owner": "edolstra",
- "ref": "master",
- "repo": "flake-compat",
- "type": "github"
- }
- },
- "flake-compat_5": {
- "flake": false,
- "locked": {
"lastModified": 1767039857,
"narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
"owner": "NixOS",
@@ -358,7 +247,7 @@
"type": "github"
}
},
- "flake-compat_6": {
+ "flake-compat_4": {
"flake": false,
"locked": {
"lastModified": 1767039857,
@@ -374,7 +263,7 @@
"type": "github"
}
},
- "flake-compat_7": {
+ "flake-compat_5": {
"flake": false,
"locked": {
"lastModified": 1767039857,
@@ -412,28 +301,6 @@
"type": "github"
}
},
- "flake-parts_2": {
- "inputs": {
- "nixpkgs-lib": [
- "grapevine",
- "attic",
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1751413152,
- "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=",
- "owner": "hercules-ci",
- "repo": "flake-parts",
- "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5",
- "type": "github"
- },
- "original": {
- "owner": "hercules-ci",
- "repo": "flake-parts",
- "type": "github"
- }
- },
"flake-utils": {
"inputs": {
"systems": "systems"
@@ -490,7 +357,7 @@
},
"flake-utils_4": {
"inputs": {
- "systems": "systems_4"
+ "systems": "systems_5"
},
"locked": {
"lastModified": 1731533236,
@@ -502,32 +369,13 @@
},
"original": {
"owner": "numtide",
- "ref": "main",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_5": {
"inputs": {
- "systems": "systems_6"
- },
- "locked": {
- "lastModified": 1731533236,
- "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
- "owner": "numtide",
- "repo": "flake-utils",
- "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
- "type": "github"
- },
- "original": {
- "owner": "numtide",
- "repo": "flake-utils",
- "type": "github"
- }
- },
- "flake-utils_6": {
- "inputs": {
- "systems": "systems_8"
+ "systems": "systems_7"
},
"locked": {
"lastModified": 1731533236,
@@ -542,9 +390,9 @@
"type": "indirect"
}
},
- "flake-utils_7": {
+ "flake-utils_6": {
"inputs": {
- "systems": "systems_9"
+ "systems": "systems_8"
},
"locked": {
"lastModified": 1731533236,
@@ -577,7 +425,7 @@
},
"git-hooks": {
"inputs": {
- "flake-compat": "flake-compat_7",
+ "flake-compat": "flake-compat_5",
"gitignore": "gitignore_2",
"nixpkgs": [
"nom",
@@ -642,35 +490,9 @@
"type": "github"
}
},
- "grapevine": {
- "inputs": {
- "attic": "attic_2",
- "crane": "crane_4",
- "fenix": "fenix_2",
- "flake-compat": "flake-compat_4",
- "flake-utils": "flake-utils_4",
- "nixpkgs": "nixpkgs_5",
- "rocksdb": "rocksdb"
- },
- "locked": {
- "host": "gitlab.computer.surgery",
- "lastModified": 1772652123,
- "narHash": "sha256-0Rxw9gO/yX8Z+/oggglo6G64b03jyYStrsrrAJsU2NE=",
- "owner": "matrix",
- "repo": "grapevine-fork",
- "rev": "f82328dcf20e4f4a03e7fce11cb66bb8660e1c80",
- "type": "gitlab"
- },
- "original": {
- "host": "gitlab.computer.surgery",
- "owner": "matrix",
- "repo": "grapevine-fork",
- "type": "gitlab"
- }
- },
"home-manager": {
"inputs": {
- "nixpkgs": "nixpkgs_6"
+ "nixpkgs": "nixpkgs_4"
},
"locked": {
"lastModified": 1779027260,
@@ -760,7 +582,7 @@
"nixpkgs"
],
"pre-commit-hooks": "pre-commit-hooks",
- "systems": "systems_5",
+ "systems": "systems_4",
"xdph": "xdph"
},
"locked": {
@@ -1027,7 +849,7 @@
},
"lix-module": {
"inputs": {
- "flake-utils": "flake-utils_5",
+ "flake-utils": "flake-utils_4",
"flakey-profile": "flakey-profile",
"lix": [
"lix"
@@ -1136,33 +958,11 @@
"type": "github"
}
},
- "nix-github-actions_2": {
- "inputs": {
- "nixpkgs": [
- "grapevine",
- "attic",
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1737420293,
- "narHash": "sha256-F1G5ifvqTpJq7fdkT34e/Jy9VCyzd5XfJ9TO8fHhJWE=",
- "owner": "nix-community",
- "repo": "nix-github-actions",
- "rev": "f4158fa080ef4503c8f4c820967d946c2af31ec9",
- "type": "github"
- },
- "original": {
- "owner": "nix-community",
- "repo": "nix-github-actions",
- "type": "github"
- }
- },
"nix-jetbrains-plugins": {
"inputs": {
- "flake-compat": "flake-compat_6",
- "nixpkgs": "nixpkgs_7",
- "systems": "systems_7"
+ "flake-compat": "flake-compat_4",
+ "nixpkgs": "nixpkgs_5",
+ "systems": "systems_6"
},
"locked": {
"lastModified": 1778951860,
@@ -1226,39 +1026,39 @@
"type": "github"
}
},
- "nixpkgs-stable": {
+ "nixpkgs-override-draupnir": {
"locked": {
- "lastModified": 1724316499,
- "narHash": "sha256-Qb9MhKBUTCfWg/wqqaxt89Xfi6qTD3XpTzQ9eXi3JmE=",
+ "lastModified": 1779707573,
+ "narHash": "sha256-wHca//T/RJVV/1S5ceiC16f/Rk0XU0aCGesWoXeiRjI=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "797f7dc49e0bc7fab4b57c021cdf68f595e47841",
+ "rev": "7e18ec57066eedfca6259e4d7717eae8eb619b67",
"type": "github"
},
"original": {
"owner": "NixOS",
- "ref": "nixos-24.05",
+ "ref": "master",
"repo": "nixpkgs",
"type": "github"
}
},
- "nixpkgs-stable_2": {
+ "nixpkgs-stable": {
"locked": {
- "lastModified": 1751741127,
- "narHash": "sha256-t75Shs76NgxjZSgvvZZ9qOmz5zuBE8buUaYD28BMTxg=",
+ "lastModified": 1724316499,
+ "narHash": "sha256-Qb9MhKBUTCfWg/wqqaxt89Xfi6qTD3XpTzQ9eXi3JmE=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "29e290002bfff26af1db6f64d070698019460302",
+ "rev": "797f7dc49e0bc7fab4b57c021cdf68f595e47841",
"type": "github"
},
"original": {
"owner": "NixOS",
- "ref": "nixos-25.05",
+ "ref": "nixos-24.05",
"repo": "nixpkgs",
"type": "github"
}
},
- "nixpkgs-stable_3": {
+ "nixpkgs-stable_2": {
"locked": {
"lastModified": 1767313136,
"narHash": "sha256-16KkgfdYqjaeRGBaYsNrhPRRENs0qzkQVUooNHtoy2w=",
@@ -1274,38 +1074,6 @@
"type": "github"
}
},
- "nixpkgs_10": {
- "locked": {
- "lastModified": 1775888245,
- "narHash": "sha256-nwASzrRDD1JBEu/o8ekKYEXm/oJW6EMCzCRdrwcLe90=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "13043924aaa7375ce482ebe2494338e058282925",
- "type": "github"
- },
- "original": {
- "owner": "NixOS",
- "ref": "nixpkgs-unstable",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
- "nixpkgs_11": {
- "locked": {
- "lastModified": 1776079297,
- "narHash": "sha256-kUKhT6+oxoiohdhyBfxvDOjRZiEnLCkdFXyoXSD14CU=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "716b412aad3f828ffa0634e392e3edf9b36a070f",
- "type": "github"
- },
- "original": {
- "owner": "NixOS",
- "ref": "master",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
"nixpkgs_2": {
"locked": {
"lastModified": 1726042813,
@@ -1340,27 +1108,27 @@
},
"nixpkgs_4": {
"locked": {
- "lastModified": 1751949589,
- "narHash": "sha256-mgFxAPLWw0Kq+C8P3dRrZrOYEQXOtKuYVlo9xvPntt8=",
+ "lastModified": 1778443072,
+ "narHash": "sha256-zi7/fsqM/kFdNuED//4WOCUtezGtKKqRNORjMvfwjnA=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "9b008d60392981ad674e04016d25619281550a9d",
+ "rev": "da5ad661ba4e5ef59ba743f0d112cbc30e474f32",
"type": "github"
},
"original": {
"owner": "NixOS",
- "ref": "nixpkgs-unstable",
+ "ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_5": {
"locked": {
- "lastModified": 1772198003,
- "narHash": "sha256-I45esRSssFtJ8p/gLHUZ1OUaaTaVLluNkABkk6arQwE=",
+ "lastModified": 1778443072,
+ "narHash": "sha256-zi7/fsqM/kFdNuED//4WOCUtezGtKKqRNORjMvfwjnA=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "dd9b079222d43e1943b6ebd802f04fd959dc8e61",
+ "rev": "da5ad661ba4e5ef59ba743f0d112cbc30e474f32",
"type": "github"
},
"original": {
@@ -1372,11 +1140,11 @@
},
"nixpkgs_6": {
"locked": {
- "lastModified": 1778443072,
- "narHash": "sha256-zi7/fsqM/kFdNuED//4WOCUtezGtKKqRNORjMvfwjnA=",
+ "lastModified": 1778869304,
+ "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "da5ad661ba4e5ef59ba743f0d112cbc30e474f32",
+ "rev": "d233902339c02a9c334e7e593de68855ad26c4cb",
"type": "github"
},
"original": {
@@ -1388,11 +1156,11 @@
},
"nixpkgs_7": {
"locked": {
- "lastModified": 1778443072,
- "narHash": "sha256-zi7/fsqM/kFdNuED//4WOCUtezGtKKqRNORjMvfwjnA=",
+ "lastModified": 1777578337,
+ "narHash": "sha256-Ad49moKWeXtKBJNy2ebiTQUEgdLyvGmTeykAQ9xM+Z4=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "da5ad661ba4e5ef59ba743f0d112cbc30e474f32",
+ "rev": "15f4ee454b1dce334612fa6843b3e05cf546efab",
"type": "github"
},
"original": {
@@ -1404,39 +1172,39 @@
},
"nixpkgs_8": {
"locked": {
- "lastModified": 1778869304,
- "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=",
+ "lastModified": 1775888245,
+ "narHash": "sha256-nwASzrRDD1JBEu/o8ekKYEXm/oJW6EMCzCRdrwcLe90=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "d233902339c02a9c334e7e593de68855ad26c4cb",
+ "rev": "13043924aaa7375ce482ebe2494338e058282925",
"type": "github"
},
"original": {
"owner": "NixOS",
- "ref": "nixos-unstable",
+ "ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_9": {
"locked": {
- "lastModified": 1777578337,
- "narHash": "sha256-Ad49moKWeXtKBJNy2ebiTQUEgdLyvGmTeykAQ9xM+Z4=",
+ "lastModified": 1778979197,
+ "narHash": "sha256-d83oRDbsJ+XrYqxqe/z5CIGRrY2B5xYC308UsQXdmus=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "15f4ee454b1dce334612fa6843b3e05cf546efab",
+ "rev": "233ebfd96819ab13eff099ded59063c8bfb80d63",
"type": "github"
},
"original": {
"owner": "NixOS",
- "ref": "nixos-unstable",
+ "ref": "master",
"repo": "nixpkgs",
"type": "github"
}
},
"nom": {
"inputs": {
- "flake-utils": "flake-utils_6",
+ "flake-utils": "flake-utils_5",
"git-hooks": "git-hooks",
"nixpkgs": [
"nixpkgs"
@@ -1458,7 +1226,7 @@
},
"ooye": {
"inputs": {
- "nixpkgs": "nixpkgs_9"
+ "nixpkgs": "nixpkgs_7"
},
"locked": {
"lastModified": 1777734248,
@@ -1501,7 +1269,7 @@
},
"pre-commit-hooks": {
"inputs": {
- "flake-compat": "flake-compat_5",
+ "flake-compat": "flake-compat_3",
"gitignore": "gitignore",
"nixpkgs": [
"hyprland",
@@ -1522,23 +1290,6 @@
"type": "github"
}
},
- "rocksdb": {
- "flake": false,
- "locked": {
- "lastModified": 1752084860,
- "narHash": "sha256-mKh6zsmxsiUix4LX+npiytmKvLbo6WNA9y4Ns/EY+bE=",
- "owner": "facebook",
- "repo": "rocksdb",
- "rev": "410c5623195ecbe4699b9b5a5f622c7325cec6fe",
- "type": "github"
- },
- "original": {
- "owner": "facebook",
- "ref": "v10.4.2",
- "repo": "rocksdb",
- "type": "github"
- }
- },
"root": {
"inputs": {
"botcore-v4": "botcore-v4",
@@ -1546,7 +1297,6 @@
"conduit": "conduit",
"draupnirSrc": "draupnirSrc",
"flake-utils": "flake-utils_3",
- "grapevine": "grapevine",
"home-manager": "home-manager",
"hyprland": "hyprland",
"lix": "lix",
@@ -1555,10 +1305,11 @@
"mtxclientSrc": "mtxclientSrc",
"nhekoSrc": "nhekoSrc",
"nix-jetbrains-plugins": "nix-jetbrains-plugins",
- "nixpkgs": "nixpkgs_8",
+ "nixpkgs": "nixpkgs_6",
"nixpkgs-RoryNix": "nixpkgs-RoryNix",
"nixpkgs-master": "nixpkgs-master",
- "nixpkgs-stable": "nixpkgs-stable_3",
+ "nixpkgs-override-draupnir": "nixpkgs-override-draupnir",
+ "nixpkgs-stable": "nixpkgs-stable_2",
"nom": "nom",
"ooye": "ooye",
"sops-nix": "sops-nix",
@@ -1583,26 +1334,9 @@
"type": "github"
}
},
- "rust-analyzer-src_2": {
- "flake": false,
- "locked": {
- "lastModified": 1772178959,
- "narHash": "sha256-DkjUvrEnnhHjOcjMx6aXfYGIZ0PWmcYzvVayhRj1r4M=",
- "owner": "rust-lang",
- "repo": "rust-analyzer",
- "rev": "8494a8b3b769c17e8594d811012cc1b0fab090c7",
- "type": "github"
- },
- "original": {
- "owner": "rust-lang",
- "ref": "nightly",
- "repo": "rust-analyzer",
- "type": "github"
- }
- },
"sops-nix": {
"inputs": {
- "nixpkgs": "nixpkgs_10"
+ "nixpkgs": "nixpkgs_8"
},
"locked": {
"lastModified": 1777944972,
@@ -1620,16 +1354,16 @@
},
"spacebar": {
"inputs": {
- "flake-utils": "flake-utils_7",
- "nixpkgs": "nixpkgs_11",
+ "flake-utils": "flake-utils_6",
+ "nixpkgs": "nixpkgs_9",
"pion-webrtc": "pion-webrtc"
},
"locked": {
- "lastModified": 1778271869,
- "narHash": "sha256-y7hBiaMoEbXkLNSdOcS0u9oChNYRjS3ppZ8J9X91gaM=",
+ "lastModified": 1781766293,
+ "narHash": "sha256-IkZQ7q6sFATMxF7jDE4Zm0TJ7oLQnsGWKqMMUARjpxI=",
"owner": "spacebarchat",
"repo": "server",
- "rev": "9a0c7419239a8807e180d89ff4c15d5e7bc87c0b",
+ "rev": "18dd02f151512a723918c400a2402a993e2ec10e",
"type": "github"
},
"original": {
@@ -1701,21 +1435,6 @@
},
"systems_4": {
"locked": {
- "lastModified": 1681028828,
- "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
- "owner": "nix-systems",
- "repo": "default",
- "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
- "type": "github"
- },
- "original": {
- "owner": "nix-systems",
- "repo": "default",
- "type": "github"
- }
- },
- "systems_5": {
- "locked": {
"lastModified": 1689347949,
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
"owner": "nix-systems",
@@ -1729,7 +1448,7 @@
"type": "github"
}
},
- "systems_6": {
+ "systems_5": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@@ -1744,7 +1463,7 @@
"type": "github"
}
},
- "systems_7": {
+ "systems_6": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@@ -1759,7 +1478,7 @@
"type": "github"
}
},
- "systems_8": {
+ "systems_7": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@@ -1774,7 +1493,7 @@
"type": "github"
}
},
- "systems_9": {
+ "systems_8": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
diff --git a/flake.nix b/flake.nix
index e2fdeaa..d82486e 100755
--- a/flake.nix
+++ b/flake.nix
@@ -7,13 +7,13 @@
"http://nix-bincache.rory-desktop.local"
"http://nix-bincache.rory-laptop.local"
# public
- "https://attic.computer.surgery/grapevine"
+ #"https://attic.computer.surgery/grapevine"
"https://hyprland.cachix.org"
"https://nix-bincache.rory.gay"
];
extra-trusted-public-keys = [
"nix-bincache.rory-desktop.local:LDcVGNQoaprWeggWcRE1N0jjEqdjOR1D0kOI3fZne24="
- "grapevine:nYiZ0Qz9nT7Y7kNC/2NdoS3+J9gwTyWxOvlwZnFgceA="
+ #"grapevine:nYiZ0Qz9nT7Y7kNC/2NdoS3+J9gwTyWxOvlwZnFgceA="
"hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
"nix-bincache.rory.gay:663PIW8xxgIImxLcsokODWI2PHFWXvzJEfjX6TaIjxQ="
"nix-bincache.rory-laptop.local:IbXbNC8ok5YYj9HKYU/5GCec5HE/aixgW/+3sRHP2nE="
@@ -33,7 +33,7 @@
# Draupnir module/package
# nixpkgs-override-synapse.url = "github:teutat3s/nixpkgs/matrix-synapse-1.136.0";
- # nixpkgs-override-draupnir.url = "github:NixOS/nixpkgs/master";
+ nixpkgs-override-draupnir.url = "github:NixOS/nixpkgs/master";
# nixpkgs-override-draupnir.url = "github:r-ryantm/nixpkgs/auto-update/draupnir";
# nixpkgs-override-jetbrains.url = "github:theCapypara/nixpkgs/jetbrains/update-26.1-ssl";
@@ -44,7 +44,7 @@
nix-jetbrains-plugins.url = "github:nix-community/nix-jetbrains-plugins";
# Packages
- grapevine.url = "gitlab:matrix/grapevine-fork?host=gitlab.computer.surgery";
+ #grapevine.url = "gitlab:matrix/grapevine-fork?host=gitlab.computer.surgery";
conduit.url = "gitlab:famedly/conduit/next";
#drasl = {
# url = "github:unmojang/drasl";
@@ -155,7 +155,7 @@
home-manager.nixosModules.home-manager
lix-module.nixosModules.default
- grapevine.nixosModules.default
+ #grapevine.nixosModules.default
#drasl.nixosModules.drasl
ooye.modules.default
@@ -183,7 +183,7 @@
specialArgs = {
inherit botcore-v4;
inherit home-manager;
- inherit grapevine;
+ #inherit grapevine;
inherit conduit;
#inherit nixpkgs-Draupnir;
#inherit nixpkgs-DraupnirPkg;
diff --git a/host/Rory-ovh/services/containers/draupnir-belibre/container.nix b/host/Rory-ovh/services/containers/draupnir-belibre/container.nix
index e19fb68..09f5606 100644
--- a/host/Rory-ovh/services/containers/draupnir-belibre/container.nix
+++ b/host/Rory-ovh/services/containers/draupnir-belibre/container.nix
@@ -19,10 +19,10 @@
];
};
hostAddress = "192.168.100.1";
- localAddress = "192.168.100.18";
+ localAddress = "192.168.100.23";
bindMounts."draupnir-access-token" = {
- hostPath = "/data/secrets/draupnir-fedora-access-token";
+ hostPath = "/data/secrets/draupnir-belibre-access-token";
mountPoint = "/etc/draupnir-access-token";
isReadOnly = true;
};
diff --git a/host/Rory-ovh/services/containers/draupnir-belibre/services/draupnir.nix b/host/Rory-ovh/services/containers/draupnir-belibre/services/draupnir.nix
index bacc9f3..917958c 100644
--- a/host/Rory-ovh/services/containers/draupnir-belibre/services/draupnir.nix
+++ b/host/Rory-ovh/services/containers/draupnir-belibre/services/draupnir.nix
@@ -8,7 +8,7 @@
settings = {
homeserverUrl = "https://matrix.rory.gay";
- managementRoom = "#draupnir-fedora-mgmt:rory.gay";
+ managementRoom = "#draupnir-belibre-mgmt:rory.gay";
recordIgnoredInvites = true; # We want to be aware of invites
autojoinOnlyIfManager = true; # ... but we don't want the bot to be invited to eg. Matrix HQ...
automaticallyRedactForReasons = [ "*" ]; # Always autoredact
@@ -22,8 +22,38 @@
protections = {
wordlist = {
- words = [
+ words = [
+ # The Obvious
+ "tranny"
+ "faggot"
+ "ywnbaw"
+ "nigger"
+ # abuse domains
"https://postimg.cc/"
+ "https://s.binance.com"
+ # Dec 2025 IRC spam
+ "irc.hardchats.com"
+ "white power"
+ "white pride"
+ "trannies"
+ "jews did 9/11"
+ "zigger"
+ "|| || <==="
+ "usurping jews"
+ "fag hoe"
+ "neo-freenode"
+ "thegreatbritishbookshop.co.uk"
+ "\"israel\""
+ "die alone"
+ "kike"
+ "irc.tr0ll.us"
+ "irc.gangste.rs"
+ "irc.wepump.in"
+ "death to"
+ "irc.hackclub.com"
+ "irc.supernets.org"
+ "[supernets]"
+ # Known abuse
"lolitaheaven.onrender.com"
"heavenlychat-px42.onrender.com"
"heavenlydev.onrender.com"
diff --git a/host/Rory-ovh/services/containers/spacebar/services/spacebar.nix b/host/Rory-ovh/services/containers/spacebar/services/spacebar.nix
index 228bf69..7b8321b 100644
--- a/host/Rory-ovh/services/containers/spacebar/services/spacebar.nix
+++ b/host/Rory-ovh/services/containers/spacebar/services/spacebar.nix
@@ -190,6 +190,7 @@ in
#LOG_REQUESTS = "-200,204,304";
LOG_REQUESTS = "-";
LOG_VALIDATION_ERRORS = true;
+ LOG_API_ERRORS = true;
#DB_LOGGING=true;
#LOG_GATEWAY_TRACES=true;
#LOG_PROTO_UPDATES=true;
diff --git a/host/Rory-ovh/services/matrix/draupnir.nix b/host/Rory-ovh/services/matrix/draupnir.nix
index f754809..9a7c292 100755
--- a/host/Rory-ovh/services/matrix/draupnir.nix
+++ b/host/Rory-ovh/services/matrix/draupnir.nix
@@ -1,4 +1,4 @@
-{ pkgs, draupnir, ... }:
+{ config, lib, pkgs, draupnir, ... }:
{
services.draupnir = {
@@ -70,4 +70,39 @@
};
};
};
+
+ systemd.services."draupnir" = {
+ serviceConfig = let
+ cfg = config.services.draupnir;
+ format = pkgs.formats.yaml { };
+ configFile = format.generate "draupnir.yaml" cfg.settings;
+ in {
+ ExecStart = lib.mkForce (
+ toString (
+ [
+ (lib.getExe cfg.package)
+ "--draupnir-config"
+ configFile
+ ]
+ ++ lib.optionals (cfg.secrets.accessToken != null) [
+ "--access-token-path"
+ "%d/access_token"
+ ]
+ ++ lib.optionals (cfg.secrets.pantalaimon.password != null) [
+ "--pantalaimon-password-path"
+ "%d/pantalaimon_password"
+ ]
+ ++ lib.optionals (cfg.secrets.web.synapseHTTPAntispam.authorization != null) [
+ "--http-antispam-authorization-path"
+ "%d/http_antispam_authorization"
+ ]
+ ++ [
+ "--max-old-space-size=32768"
+ "--max-semi-space-size=256"
+ "--prof"
+ ]
+ )
+ );
+ };
+ };
}
|
